Add support for old modpacks

Wrote custom function to read json data from .ttmp's (function in xivModdingFramework was not sufficient in this project, #11)
fosspill · May 9, 2019 · c5cd446 · c5cd446
1 parent a24c27d
commit c5cd446
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 13 deletions.
diff --git a/FFXIV_TexTools_CLI/FFXIV_TexTools_CLI.csproj b/FFXIV_TexTools_CLI/FFXIV_TexTools_CLI.csproj
@@ -46,6 +46,9 @@
     <Reference Include="xivModdingFramework">
       <HintPath>..\references\xivModdingFramework.dll</HintPath>
     </Reference>
+    <Reference Include="ICSharpCode.SharpZipLib">
+      <HintPath>..\packages\SharpZipLib.1.1.0\lib\net45\ICSharpCode.SharpZipLib.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Program.cs" />

diff --git a/FFXIV_TexTools_CLI/Program.cs b/FFXIV_TexTools_CLI/Program.cs
@@ -25,8 +25,8 @@
 using xivModdingFramework.Mods.FileTypes;
 using xivModdingFramework.SqPack.FileTypes;
 using xivModdingFramework.Textures.Enums;
-using xivModdingFramework.Helpers;
-using xivModdingFramework.Items.Interfaces;
+using ICSharpCode.SharpZipLib.Zip;
+using Newtonsoft.Json;
 using CommandLine;
 
 namespace FFXIV_TexTools_CLI
@@ -37,8 +37,6 @@ public class importoptions
     {
         [Option('g', "gamedirectory", Required = true, HelpText = "Full path including \"Final Fantasy XIV - A Realm Reborn\"")]
         public string Directory { get; set; }
-        //[Option('m', "modpackdirectory", Required = true, HelpText = "Path to modpackdirectory")]
-        //public string ModPackDirectory { get; set; }
         [Option('t', "ttmp", Required = true, HelpText = "Path to .ttmp(2) file")]
         public string ttmpPath { get; set; }
     }
@@ -129,14 +127,20 @@ void ImportModpackHandler(DirectoryInfo ttmpPath)
             {
                 PrintMessage($"Problem reading index files:\n{ex.Message}", 2);
             }
-            PrintMessage("Checking if modpack is .ttmp or .ttmp2...");
+            PrintMessage("Starting import...");
             try
             {
                 var ttmp = new TTMP(ttmpPath, "TexTools");
-                var ttmpData = ttmp.GetModPackJsonData(ttmpPath);
+
                 try
                 {
-                    GetModpackData(ttmpPath, ttmpData.ModPackJson);
+                    if (ttmpPath.Extension == ".ttmp2")
+                    {
+                        var ttmpData = ttmp.GetModPackJsonData(ttmpPath);
+                        GetModpackData(ttmpPath, ttmpData.ModPackJson);
+                    }
+                    else
+                        GetModpackData(ttmpPath, null);
                 }
                 catch
                 {
@@ -148,7 +152,7 @@ void ImportModpackHandler(DirectoryInfo ttmpPath)
             {
                 if (!importError)
                 {
-                    PrintMessage($"Exception was thrown:\n{ex.Message}\nRetrying...", 3);
+                    PrintMessage($"Exception was thrown:\n{ex.Message}\nRetrying import...", 3);
                     GetModpackData(ttmpPath, null);
                 }
                 else
@@ -166,9 +170,9 @@ void GetModpackData(DirectoryInfo ttmpPath, ModPackJson ttmpData)
             var modding = new Modding(_gameDirectory);
             List<SimpleModPackEntries> ttmpDataList = new List<SimpleModPackEntries>();
             TTMP _textoolsModpack = new TTMP(ttmpPath, "TexTools");
+            PrintMessage($"Extracting data from {ttmpPath.Name}...");
             if (ttmpData != null)
             {
-                PrintMessage("New modpack detected. Extracting data from the modpack...");
                 foreach (var modsJson in ttmpData.SimpleModsList)
                 {
                     var race = GetRace(modsJson.FullPath);
@@ -200,8 +204,21 @@ void GetModpackData(DirectoryInfo ttmpPath, ModPackJson ttmpData)
             }
             else
             {
-                PrintMessage("Old modpack detected. Extracting data from the modpack...");
-                var originalModPackData = _textoolsModpack.GetOriginalModPackJsonData(ttmpPath);
+                var originalModPackData = new List<OriginalModPackJson>();
+                var fs = new FileStream(ttmpPath.FullName, FileMode.Open, FileAccess.Read);
+                ZipFile archive = new ZipFile(fs);
+                ZipEntry mplFile = archive.GetEntry("TTMPL.mpl");
+                {
+                    using (var streamReader = new StreamReader(archive.GetInputStream(mplFile)))
+                    {
+                        string line;
+                        while ((line = streamReader.ReadLine()) != null)
+                        {
+                            if (!line.ToLower().Contains("version"))
+                                originalModPackData.Add(JsonConvert.DeserializeObject<OriginalModPackJson>(line));
+                        }
+                    }
+                }
 
                 foreach (var modsJson in originalModPackData)
                 {
@@ -262,7 +279,7 @@ void ImportModpack(List<SimpleModPackEntries> ttmpDataList, TTMP _textoolsModpac
                 else
                 {
                     totalModsImported = ttmpDataList.Count();
-                    PrintMessage($"{totalModsImported} mod(s) successfully imported.", 1);
+                    PrintMessage($"\n{totalModsImported} mod(s) successfully imported.", 1);
                 }
 
             }
@@ -275,7 +292,7 @@ void ImportModpack(List<SimpleModPackEntries> ttmpDataList, TTMP _textoolsModpac
         void ReportProgress(double value)
         {
             float progress = (float)value * 100;
-            Console.Write($"{(int)progress}%... ");
+            Console.Write($"\r{(int)progress}%...  ");
         }
 
         XivRace GetRace(string modPath)

diff --git a/FFXIV_TexTools_CLI/packages.config b/FFXIV_TexTools_CLI/packages.config
@@ -3,4 +3,5 @@
   <package id="CommandLineParser" version="2.5.0" targetFramework="net47" />
   <package id="Magick.NET-Q8-AnyCPU" version="7.12.0" targetFramework="net47" />
   <package id="Newtonsoft.Json" version="12.0.2" targetFramework="net47" />
+  <package id="SharpZipLib" version="1.1.0" targetFramework="net47" />
 </packages>