Fix ignoring projects (#91)

OrchardCoreContrib · May 2, 2024 · ff2d977 · ff2d977
1 parent 4487906
commit ff2d977
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 19 deletions.
diff --git a/src/OrchardCoreContrib.PoExtractor/IgnoredProject.cs b/src/OrchardCoreContrib.PoExtractor/IgnoredProject.cs
@@ -4,7 +4,7 @@ namespace OrchardCoreContrib.PoExtractor;
 
 public class IgnoredProject
 {
-    public static readonly string Docs = "src\\dos";
+    public static readonly string Docs = "src\\docs";
 
     public static readonly string Cms = "src\\OrchardCore.Cms.Web";
 
@@ -14,12 +14,9 @@ public class IgnoredProject
 
     public static readonly string Test = "test";
 
-    public static IEnumerable<string> ToList()
-    {
-        yield return Docs;
-        yield return Cms;
-        yield return Mvc;
-        yield return Templates;
-        yield return Test;
-    }
+    private static readonly List<string> _ignoredProjects = [ Docs, Cms, Mvc, Templates ];
+
+    public static void Add(string project) => _ignoredProjects.Add(project);
+
+    public static IEnumerable<string> ToList() => _ignoredProjects;
 }
diff --git a/src/OrchardCoreContrib.PoExtractor/Program.cs b/src/OrchardCoreContrib.PoExtractor/Program.cs
@@ -14,14 +14,6 @@ public class Program
 {
     private static readonly string _defaultLanguage = Language.CSharp;
     private static readonly string _defaultTemplateEngine = TemplateEngine.Both;
-    private static readonly string[] _ignoredProjects =
-    [
-        "docs",
-        "src\\OrchardCore.Cms.Web",
-        "src\\OrchardCore.Mvc.Web",
-        "src\\Templates",
-        "test"
-    ];
 
     public static void Main(string[] args)
     {
@@ -90,8 +82,8 @@ public static void Main(string[] args)
             var projectPath = Path.GetDirectoryName(projectFile);
             var projectBasePath = Path.GetDirectoryName(projectPath) + Path.DirectorySeparatorChar;
             var projectRelativePath = projectPath[projectBasePath.Length..];
-
-            if (IgnoredProject.ToList().Any(p => projectRelativePath.StartsWith(p)))
+            var rootedProject = projectPath[(projectPath.IndexOf(inputPath) + inputPath.Length + 1)..];
+            if (IgnoredProject.ToList().Any(p => rootedProject.StartsWith(p)))
             {
                 continue;
             }
@@ -155,6 +147,19 @@ private static (string language, string templateEngine) GetCliOptions(string[] a
                         templateEngine = null;
                     }
 
+                    break;
+                case "-i":
+                case "--ignore":
+                    if (!string.IsNullOrEmpty(args[i - 1]))
+                    {
+                        var ignoredProjects = args[i - 1].Split(',', StringSplitOptions.RemoveEmptyEntries);
+
+                        foreach (var ignoredProject in ignoredProjects)
+                        {
+                            IgnoredProject.Add(ignoredProject);
+                        }
+                    }
+
                     break;
                 default:
                     language = null;
@@ -180,5 +185,6 @@ private static void ShowHelp()
         Console.WriteLine("                                     Default: C# language");
         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).");
     }
 }