Changes for v2.4

amrshaheen61 · Sep 21, 2023 · b33e2be · b33e2be
1 parent ab03000
commit b33e2be
Show file tree

Hide file tree

Showing 35 changed files with 9,719 additions and 1,144 deletions.
diff --git a/UE4localizationsTool/Commands.cs b/UE4localizationsTool/Commands.cs
@@ -4,6 +4,8 @@
 using System.IO;
 using System.Linq;
 using System.Text.RegularExpressions;
+using UE4localizationsTool.Core.locres;
+using UE4localizationsTool.Helper;
 
 namespace UE4localizationsTool
 {
@@ -12,15 +14,16 @@ public enum Args
     {
         filter = 1 << 0,
         noname = 1 << 1,
-        method2 = 1 << 2
+        method2 = 1 << 2,
+        CSV = 1 << 3,
     }
 
 
 
     public class Commands
     {
         private List<List<string>> Strings;
-
+        private string TextFileExtension = ".txt";
         public Args Flags;
 
         private bool UseMatching = false;
@@ -35,7 +38,10 @@ public Commands(string Options, string SourcePath, Args args)
                 GetFilterValues();
             }
 
+            if (Flags.HasFlag(Args.CSV)){
 
+                TextFileExtension = ".csv";
+            }
             string[] Paths;
             string ConsoleText;
             switch (Options.ToLower())
@@ -58,7 +64,7 @@ public Commands(string Options, string SourcePath, Args args)
                     Console.Write("Done\n");
                     Console.ForegroundColor = ConsoleColor.White;
 
-                    SaveTextFile(SourcePath + ".txt");
+                    SaveTextFile(SourcePath + TextFileExtension);
 
 
                     break;
@@ -76,7 +82,7 @@ public Commands(string Options, string SourcePath, Args args)
                     Console.Write(ConsoleText);
                     Console.ForegroundColor = ConsoleColor.White;
 
-                    if (!SourcePath.EndsWith(".txt", StringComparison.OrdinalIgnoreCase))
+                    if (!SourcePath.EndsWith(TextFileExtension, StringComparison.OrdinalIgnoreCase))
                     {
                         throw new Exception("Invalid text file type: " + Path.GetFileName(SourcePath));
                     }
@@ -93,7 +99,7 @@ public Commands(string Options, string SourcePath, Args args)
                 case "-importall"://Folders Without rename Files
                     Paths = SourcePath.Split(new char[] { '*' }, 2);
 
-                    if (!Paths[1].EndsWith(".txt", StringComparison.OrdinalIgnoreCase))
+                    if (!Paths[1].EndsWith(TextFileExtension, StringComparison.OrdinalIgnoreCase))
                     {
                         throw new Exception("Invalid text file type: " + Path.GetFileName(SourcePath));
                     }
@@ -114,6 +120,14 @@ private void SaveTextFile(string FilePath)
             Console.Write(ConsoleText);
             Console.ForegroundColor = ConsoleColor.White;
 
+
+            if (Flags.HasFlag(Args.CSV))
+            {
+                CSVFile.Instance.Save(Strings, FilePath);
+
+                goto End;
+            }
+
             string[] stringsArray = new string[Strings.Count];
             int i = 0;
 
@@ -137,7 +151,7 @@ private void SaveTextFile(string FilePath)
                 i++;
             }
             File.WriteAllLines(FilePath, stringsArray);
-
+            End:
             Console.ForegroundColor = ConsoleColor.Green;
             Console.Write("Done\n");
             Console.ForegroundColor = ConsoleColor.White;
@@ -154,8 +168,8 @@ private List<List<string>> Export(string FilePath)
 
             if (FilePath.EndsWith(".locres", StringComparison.OrdinalIgnoreCase))
             {
-                locres locres = new locres(FilePath);
-                return locres.Strings;
+                IAsset locres = new LocresFile(FilePath);
+                return locres.ExtractTexts();
                 //  SizeOfRecord = locres.Strings.Count;
             }
             else if (FilePath.EndsWith(".uasset", StringComparison.OrdinalIgnoreCase) || FilePath.EndsWith(".umap", StringComparison.OrdinalIgnoreCase))
@@ -285,8 +299,11 @@ private void Import(string FilePath, string[] Values, string Option)
 
             if (FilePath.EndsWith(".locres", StringComparison.OrdinalIgnoreCase))
             {
-                locres locres = new locres(FilePath);
-                EditList(locres.Strings, Values);
+                var locres = new LocresFile(FilePath);
+                var strings = locres.ExtractTexts();
+                EditList(locres.ExtractTexts(), Values);
+                locres.ImportTexts(strings);
+
                 if (Option == "-import")
                 {
                     locres.SaveFile(FilePath);