Merge pull request #34 from Neinndall/dev

HotFix Update v2.4.2.6

Author: Neinndall

AssetsManager/App.xaml.cs

@@ -117,6 +117,7 @@ private void ConfigureServices(IServiceCollection services)
 
             // Windows, Views, and Dialogs
             services.AddTransient<MainWindow>();
+            services.AddTransient<DownloaderWindow>();
             services.AddTransient<HomeWindow>();
             services.AddTransient<ExplorerWindow>();
             services.AddTransient<ComparatorWindow>();

AssetsManager/AssetsManager.csproj

@@ -3,7 +3,7 @@
     <OutputType>WinExe</OutputType>
     <TargetFramework>net8.0-windows10.0.26100.0</TargetFramework>
     <ApplicationIcon>Resources\Img\logo.ico</ApplicationIcon>
-    <Version>2.4.2.5</Version>
+    <Version>2.4.2.6</Version>
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>
     <UseWPF>true</UseWPF>
   </PropertyGroup>

AssetsManager/Services/Core/UpdateCheckService.cs

@@ -154,12 +154,12 @@ await _monitorService.CheckAllAssetCategoriesAsync(true, (categoryName) =>
                 {
                     if (updatedCategoryNames.Count == 1)
                     {
-                        UpdatesFound?.Invoke($"New assets have been found in {updatedCategoryNames[0]} category!", null);
+                        UpdatesFound?.Invoke($"New assets have been found in {updatedCategoryNames[0]} category", null);
                     }
                     else
                     {
                         string categories = string.Join(", ", updatedCategoryNames);
-                        UpdatesFound?.Invoke($"New assets found in categories: {categories}!", null);
+                        UpdatesFound?.Invoke($"New assets found in categories: {categories}", null);
                     }
                 }
             }
@@ -194,7 +194,7 @@ public async Task CheckForGeneralUpdatesAsync(bool silent = false)
 
             if (appUpdateAvailable)
             {
-                UpdatesFound?.Invoke($"Version {newVersion} is available!", newVersion);
+                UpdatesFound?.Invoke($"Version {newVersion} is available", newVersion);
             }
 
             if (_appSettings.SyncHashesWithCDTB)
@@ -203,14 +203,14 @@ await _status.SyncHashesIfNeeds(_appSettings.SyncHashesWithCDTB, silent, () =>
                 {
                     if (silent)
                     {
-                        UpdatesFound?.Invoke("New hashes are available!", null);
+                        UpdatesFound?.Invoke("New hashes are available", null);
                     }
                 });
             }
 
             if (_appSettings.CheckJsonDataUpdates)
             {
-                await _jsonDataService.CheckJsonDataUpdatesAsync(silent, () => { UpdatesFound?.Invoke("JSON files have been updated!", null); });
+                await _jsonDataService.CheckJsonDataUpdatesAsync(silent, () => { UpdatesFound?.Invoke("Monitored files have been updated", null); });
             }
         }
 

AssetsManager/Services/Downloads/Status.cs

@@ -69,15 +69,15 @@ public async Task<bool> SyncHashesIfNeeds(bool syncHashesWithCDTB, bool silent =
 
                     // Comprobamos si es una sincronización inicial.
                     // Una forma de detectarlo es si la carpeta 'olds' está vacía.
-                    bool isInitialSync = !Directory.EnumerateFileSystemEntries(_directoriesCreator.HashesOldsPath).Any();
+                    bool isInitialSync = !Directory.EnumerateFileSystemEntries(_directoriesCreator.HashesOldPath).Any();
 
                     if (isInitialSync)
                     {
                         var filesToCopyToOld = new[] { GAME_HASHES_FILENAME, LCU_HASHES_FILENAME };
                         foreach (var fileName in filesToCopyToOld)
                         {
                             var sourceFile = Path.Combine(_directoriesCreator.HashesNewPath, fileName);
-                            var destFile = Path.Combine(_directoriesCreator.HashesOldsPath, fileName);
+                            var destFile = Path.Combine(_directoriesCreator.HashesOldPath, fileName);
                             if (File.Exists(sourceFile))
                             {
                                 File.Copy(sourceFile, destFile, true);

AssetsManager/Services/Explorer/WadNodeLoaderService.cs

@@ -255,9 +255,7 @@ private FileSystemNodeModel AddNodeToVirtualTree(FileSystemNodeModel root, strin
                 SourceChunkPathHash = chunkHash,
                 Status = status
             };
-
-
-
+            
             currentNode.Children.Add(fileNode);
             return fileNode;
         }
@@ -333,5 +331,4 @@ public async Task<FileSystemNodeModel> FindNodeByVirtualPathAsync(string virtual
             });
         }
     }
-}
-
+}

AssetsManager/Services/Explorer/WadSavingService.cs

@@ -237,4 +237,4 @@ private async Task HandleDataFile(FileSystemNodeModel node, string destinationPa
             await File.WriteAllTextAsync(filePath, formattedContent);
         }
     }
-}
+}

AssetsManager/Services/Monitor/MonitorService.cs

@@ -51,7 +51,7 @@ public void LoadMonitoredUrls()
             {
                 _appSettings.JsonDataModificationDates.TryGetValue(url, out DateTime lastUpdated);
 
-                string statusText = "Pending check...";
+                string statusText = "Pending check";
                 string lastChecked = "N/A";
                 Brush statusColor = new SolidColorBrush(Colors.Gray);
 

AssetsManager/Utils/DirectoriesCreator.cs

@@ -12,15 +12,15 @@ public class DirectoriesCreator
 
         public string ResourcesPath { get; private set; }
         public string HashesNewPath { get; private set; }
-        public string HashesOldsPath { get; private set; }
+        public string HashesOldPath { get; private set; }
         public string JsonCacheNewPath { get; private set; }
         public string JsonCacheOldPath { get; private set; }
         public string JsonCacheHistoryPath { get; private set; }
         public string AssetsDownloadedPath { get; private set; }
         public string SubAssetsDownloadedPath { get; private set; }
         public string BackUpOldHashesPath { get; private set; }
         public string WadComparisonSavePath { get; private set; }
-        public string VersionsPath { get; private set; } // Add this
+        public string VersionsPath { get; private set; }
         public string AppDirectory { get; private set; }
 
         public string UpdateCachePath { get; private set; }
@@ -45,8 +45,10 @@ public DirectoriesCreator(LogService logService)
         {
             _logService = logService;
 
-            HashesNewPath = Path.Combine("hashes", "new");
-            HashesOldsPath = Path.Combine("hashes", "olds");
+            AppDirectory = AppDomain.CurrentDomain.BaseDirectory;
+
+            HashesNewPath = Path.Combine(AppDirectory, "hashes", "new");
+            HashesOldPath = Path.Combine(AppDirectory, "hashes", "olds");
 
             string appDataPath = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData);
             string appFolderPath = Path.Combine(appDataPath, "AssetsManager");
@@ -57,8 +59,6 @@ public DirectoriesCreator(LogService logService)
             JsonCacheOldPath = Path.Combine(appFolderPath, "json_cache", "old");
             JsonCacheHistoryPath = Path.Combine(appFolderPath, "json_cache", "history");
 
-            AppDirectory = AppDomain.CurrentDomain.BaseDirectory;
-
             UpdateCachePath = Path.Combine(appFolderPath, "update_cache");
             UpdateLogFilePath = Path.Combine(UpdateCachePath, "update_log.log");
 
@@ -118,7 +118,7 @@ public void GenerateUpdateFilePaths()
         public Task CreateHashesDirectories()
         {
             CreateDirectoryInternal(HashesNewPath, false);
-            CreateDirectoryInternal(HashesOldsPath, false);
+            CreateDirectoryInternal(HashesOldPath, false);
             return Task.CompletedTask;
         }                                                                                 
 

AssetsManager/Utils/FileTypeDetector.cs

@@ -12,12 +12,21 @@ public static class FileTypeDetector
         private static readonly byte[] WEBP_SIGNATURE = { 0x52, 0x49, 0x46, 0x46 }; // RIFF
         private static readonly byte[] WEBP_VP8X_SIGNATURE = { 0x57, 0x45, 0x42, 0x50 }; // WEBP
         private static readonly byte[] OGG_SIGNATURE = { 0x4F, 0x67, 0x67, 0x53 }; // "OggS"
+        private static readonly byte[] WEBM_SIGNATURE = { 0x1A, 0x45, 0xDF, 0xA3 }; // EBML header
         private static readonly byte[] WEM_SIGNATURE = { 0x52, 0x49, 0x46, 0x46 }; // RIFF
         private static readonly byte[] WEM_WAVE_SIGNATURE = { 0x57, 0x41, 0x56, 0x45 }; // WAVE
         private static readonly byte[] BNK_SIGNATURE = { 0x42, 0x4B, 0x48, 0x44 }; // "BKHD"
-        private static readonly byte[] SKL_SIGNATURE = { 0x53, 0x4B, 0x4C, 0x5F }; // "SKL_"
+        private static readonly byte[] SKL_SIGNATURE = { 0x72, 0x33, 0x64, 0x32, 0x73, 0x6B, 0x6C, 0x74 }; // "r3d2sklt"
         private static readonly byte[] SKN_SIGNATURE = { 0x33, 0x22, 0x11, 0x00 };
-        private static readonly byte[] ANM_SIGNATURE = { 0x72, 0x41, 0x6E, 0x6D }; // "rAnm"
+        private static readonly byte[] R3D2MESH_SIGNATURE = { 0x72, 0x33, 0x64, 0x32, 0x4D, 0x65, 0x73, 0x68 }; // "r3d2Mesh"
+        private static readonly byte[] ANM_R3D2ANMD_SIGNATURE = { 0x72, 0x33, 0x64, 0x32, 0x61, 0x6E, 0x6D, 0x64 }; // "r3d2anmd"
+        private static readonly byte[] ANM_R3D2CANM_SIGNATURE = { 0x72, 0x33, 0x64, 0x32, 0x63, 0x61, 0x6E, 0x6D }; // "r3d2canm"
+        private static readonly byte[] MAPGEO_SIGNATURE = { 0x4F, 0x45, 0x47, 0x4D }; // "OEGM"
+        
+        private static readonly byte[] SCO_SIGNATURE = { 0x5B, 0x4F, 0x62, 0x6A }; // "[Obj"
+        private static readonly byte[] LUAQ_SIGNATURE = { 0x4C, 0x75, 0x61, 0x51 }; // "LuaQ"
+        private static readonly byte[] PRELOAD_SIGNATURE = { 0x50, 0x72, 0x65, 0x4C, 0x6F, 0x61, 0x64 }; // "PreLoad"
+        private static readonly byte[] RST_SIGNATURE = { 0x52, 0x53, 0x54 }; // "RST"
         private static readonly byte[] BIN_PROP_SIGNATURE = { 0x50, 0x52, 0x4F, 0x50 }; // "PROP"
         private static readonly byte[] BIN_PTCH_SIGNATURE = { 0x50, 0x54, 0x43, 0x48 }; // "PTCH"
         private static readonly byte[] ICO_SIGNATURE = { 0x00, 0x00, 0x01, 0x00 };
@@ -33,10 +42,18 @@ public static string GuessExtension(Span<byte> data)
             if (StartsWith(data, PNG_SIGNATURE)) return "png";
             if (StartsWith(data, JPG_SIGNATURE)) return "jpg";
             if (StartsWith(data, OGG_SIGNATURE)) return "ogg";
+            if (StartsWith(data, WEBM_SIGNATURE)) return "webm";
             if (StartsWith(data, BNK_SIGNATURE)) return "bnk";
             if (StartsWith(data, SKL_SIGNATURE)) return "skl";
             if (StartsWith(data, SKN_SIGNATURE)) return "skn";
-            if (StartsWith(data, ANM_SIGNATURE)) return "anm";
+            if (StartsWith(data, R3D2MESH_SIGNATURE)) return "scb";
+            if (StartsWith(data, ANM_R3D2ANMD_SIGNATURE) || StartsWith(data, ANM_R3D2CANM_SIGNATURE)) return "anm";
+            if (StartsWith(data, MAPGEO_SIGNATURE)) return "mapgeo";
+            if (StartsWith(data, SCO_SIGNATURE)) return "sco";
+            if (Contains(data, LUAQ_SIGNATURE, 1)) return "luaobj";
+            if (StartsWith(data, PRELOAD_SIGNATURE)) return "preload";
+            if (StartsWith(data, RST_SIGNATURE)) return "stringtable";
+            
             if (StartsWith(data, BIN_PROP_SIGNATURE) || StartsWith(data, BIN_PTCH_SIGNATURE)) return "bin";
             if (StartsWith(data, ICO_SIGNATURE)) return "ico";
 

AssetsManager/Utils/HashCopier.cs

@@ -28,7 +28,7 @@ public async Task HandleCopyAsync(bool autoCopyHashes)
         private async Task CopyNewHashesToOlds()
         {
             string sourcePath = _directoriesCreator.HashesNewPath;
-            string destinationPath = _directoriesCreator.HashesOldsPath;
+            string destinationPath = _directoriesCreator.HashesOldPath;
             var filesToCopy = new[] { "hashes.game.txt", "hashes.lcu.txt" };
 
             try