Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(PoExtractor): add single file output #94

Merged
merged 10 commits into from
Aug 15, 2024
Merged

feat(PoExtractor): add single file output #94

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
0b9e426
feat(PoExtractor): add single file output
VincenzoCarlino Jun 17, 2024
7dcb6a6
Update src/OrchardCoreContrib.PoExtractor.Abstractions/LocalizableStr…
VincenzoCarlino Jun 17, 2024
1ce630b
Update src/OrchardCoreContrib.PoExtractor/Program.cs
VincenzoCarlino Jun 17, 2024
606c1f5
Update src/OrchardCoreContrib.PoExtractor/Program.cs
VincenzoCarlino Jun 17, 2024
b27746e
Update src/OrchardCoreContrib.PoExtractor/Program.cs
VincenzoCarlino Jun 17, 2024
58402f4
Update src/OrchardCoreContrib.PoExtractor/Program.cs
VincenzoCarlino Jun 17, 2024
479751a
tests
VincenzoCarlino Jun 17, 2024
b22ab3b
Formatting
hishamco Aug 12, 2024
e18c768
Delete ExecutionTests
hishamco Aug 15, 2024
0784a8d
Remove NSubstitute dependency
hishamco Aug 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/OrchardCoreContrib.PoExtractor.Abstractions/LocalizableStringCollection.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,9 @@ public void Add(LocalizableStringOccurence item)
_values.Add(key, new LocalizableString(item));
}
}

/// <summary>
/// Clear collection
/// </summary>
public void Clear() => _values.Clear();
}
46 changes: 38 additions & 8 deletions src/OrchardCoreContrib.PoExtractor/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public static void Main(string[] args)
return;
}

(string language, string templateEngine) = GetCliOptions(args);
(string language, string templateEngine, string singleOutputFile) = GetCliOptions(args);

if (language == null || templateEngine == null)
{
Expand Down Expand Up @@ -77,6 +77,8 @@ public static void Main(string[] args)
projectProcessors.Add(new LiquidProjectProcessor());
}

var isSingleFileOutput = !string.IsNullOrEmpty(singleOutputFile);
var localizableStrings = new LocalizableStringCollection();
foreach (var projectFile in projectFiles)
{
var projectPath = Path.GetDirectoryName(projectFile);
Expand All @@ -88,30 +90,49 @@ public static void Main(string[] args)
continue;
}

var localizableStrings = new LocalizableStringCollection();
foreach (var projectProcessor in projectProcessors)
{
projectProcessor.Process(projectPath, projectBasePath, localizableStrings);
}

if (!isSingleFileOutput)
{
if (localizableStrings.Values.Any())
{
var potPath = Path.Combine(outputPath, Path.GetFileNameWithoutExtension(projectFile) + PoWriter.PortaleObjectTemplateExtension);

Directory.CreateDirectory(Path.GetDirectoryName(potPath));

using var potFile = new PoWriter(potPath);
potFile.WriteRecord(localizableStrings.Values);
localizableStrings.Clear();
}

Console.WriteLine($"{Path.GetFileName(projectPath)}: Found {localizableStrings.Values.Count()} strings.");
}
}

if (isSingleFileOutput)
{
if (localizableStrings.Values.Any())
{
var potPath = Path.Combine(outputPath, Path.GetFileNameWithoutExtension(projectFile) + PoWriter.PortaleObjectTemplateExtension);
var potPath = Path.Combine(outputPath, singleOutputFile);

Directory.CreateDirectory(Path.GetDirectoryName(potPath));

using var potFile = new PoWriter(potPath);
potFile.WriteRecord(localizableStrings.Values);
}

Console.WriteLine($"{Path.GetFileName(projectPath)}: Found {localizableStrings.Values.Count()} strings.");
Console.WriteLine($"Found {localizableStrings.Values.Count()} strings.");
}
}

private static (string language, string templateEngine) GetCliOptions(string[] args)
private static (string language, string templateEngine, string singleOutputFile) GetCliOptions(string[] args)
{
var language = _defaultLanguage;
var templateEngine = _defaultTemplateEngine;
string singleOutputFile = null;
for (int i = 4; i <= args.Length; i += 2)
{
switch (args[i - 2])
Expand Down Expand Up @@ -153,7 +174,7 @@ private static (string language, string templateEngine) GetCliOptions(string[] a
if (!string.IsNullOrEmpty(args[i - 1]))
{
var ignoredProjects = args[i - 1].Split(',', StringSplitOptions.RemoveEmptyEntries);

foreach (var ignoredProject in ignoredProjects)
{
IgnoredProject.Add(ignoredProject);
Expand All @@ -169,6 +190,14 @@ private static (string language, string templateEngine) GetCliOptions(string[] a
LocalizerAccessors.LocalizerIdentifiers = localizerIdentifiers;
}

break;
case "-s":
case "--single":
if (!string.IsNullOrEmpty(args[i - 1]))
{
singleOutputFile = args[i - 1];
}

break;
default:
language = null;
Expand All @@ -177,7 +206,7 @@ private static (string language, string templateEngine) GetCliOptions(string[] a
}
}

return (language, templateEngine);
return (language, templateEngine, singleOutputFile);
}

private static void ShowHelp()
Expand All @@ -195,6 +224,7 @@ private static void ShowHelp()
Console.WriteLine(" -t, --template <Razor|Liquid> Specifies the template engine to extract the translatable strings from.");
Console.WriteLine(" Default: Razor & Liquid templates");
Console.WriteLine(" -i, --ignore project1,project2 Ignores extracting PO filed from a given project(s).");
Console.WriteLine(" --localizer localizer1,localizer2 Specifies the name of the localizer(s) that will be used suring the extraction process.");
Console.WriteLine(" --localizer localizer1,localizer2 Specifies the name of the localizer(s) that will be used during the extraction process.");
Console.WriteLine(" -s, --single <FILE_NAME> Specifies the single output file.");
}
}
Loading