Fixed Daz archive loader to properly build the filepath for subarchives.

Author: TheSeventhCode

DazContentInstaller/Services/DazArchiveLoder.cs

@@ -55,19 +55,22 @@ public class DazArchiveLoader : IDisposable
 
     private readonly string _archivePath;
     private readonly DirectoryInfo _workingPath;
+    private readonly string _baseTemporaryWorkingDirectory;
     private readonly LoadedArchive? _parentArchive;
 
     public DazArchiveLoader(string archivePath)
     {
         _archivePath = archivePath;
         _workingPath = Directory.CreateTempSubdirectory("DazLoader-" + Path.GetFileNameWithoutExtension(archivePath));
+        _baseTemporaryWorkingDirectory = _workingPath.FullName;
     }
 
-    public DazArchiveLoader(string archivePath, string workingPathOverride, LoadedArchive parentArchive)
+    private DazArchiveLoader(string archivePath, string workingPathOverride, LoadedArchive parentArchive, string baseTemporaryWorkingDirectory)
     {
         _archivePath = archivePath;
         _workingPath = new DirectoryInfo(workingPathOverride);
         _parentArchive = parentArchive;
+        _baseTemporaryWorkingDirectory = baseTemporaryWorkingDirectory;
     }
 
     public async Task<IEnumerable<LoadedArchive>> LoadArchiveAsync(IProgress<string>? messageProgress = null,
@@ -121,7 +124,7 @@ _parentArchive.ParentArchive is null
             Directory.CreateDirectory(subArchiveWorkingDirectory);
 
             using var subArchiveLoader =
-                new DazArchiveLoader(subArchiveFile.FullName, subArchiveWorkingDirectory, loadedArchive);
+                new DazArchiveLoader(subArchiveFile.FullName, subArchiveWorkingDirectory, loadedArchive, _baseTemporaryWorkingDirectory);
             archives.AddRange(await subArchiveLoader.LoadArchiveAsync(messageProgress));
             progress += (int)increment;
             percentProgress?.Report(progress);
@@ -137,15 +140,18 @@ public void Dispose()
         _workingPath.Delete(true);
     }
 
-    private static string GetSubArchivePath(string archivePath, LoadedArchive parentArchive)
+    private string GetSubArchivePath(string archivePath, LoadedArchive parentArchive)
     {
-        var fullPath = GetFullParentArchivePath(parentArchive);
+        var cut = archivePath[_baseTemporaryWorkingDirectory.Length..].TrimStart(Path.DirectorySeparatorChar);
+        if (parentArchive.ParentArchive is null)
+            return cut;
 
-        var splitter = archivePath.Split(Path.DirectorySeparatorChar)
-            .First(p => p.Contains(Path.GetFileNameWithoutExtension(parentArchive.FilePath)));
+        var parentName = Path.GetFileNameWithoutExtension(parentArchive.FilePath);
+        var parentIndex = cut.IndexOf(parentName, StringComparison.OrdinalIgnoreCase);
+        if(parentIndex > -1)
+            cut = cut.Substring(parentIndex + parentName.Length).TrimStart(Path.DirectorySeparatorChar);
 
-        var index = archivePath.IndexOf(splitter, StringComparison.Ordinal) + splitter.Length;
-        return archivePath[index..].Trim(Path.DirectorySeparatorChar);
+        return cut;
     }
 
     private static string GetFullParentArchivePath(LoadedArchive parentArchive)

DazContentInstaller/ViewModels/MainWindowViewModel.cs

@@ -207,8 +207,12 @@ private async Task InstallArchives()
         var archivesToInstallNames = archivesToInstall.Select(GetLoadedArchiveName).ToArray();
         var existingArchives = await dbContext.Archives
             .Where(a => archivesToInstallNames.Contains(a.ArchiveName))
+            .Include(a => a.AssetFiles)
             .ToListAsync();
 
+        existingArchives = existingArchives.Where(e => archivesToInstall.Any(a =>
+            a.ContainedFiles.Count == e.AssetFiles.Count && GetLoadedArchiveName(a).Equals(e.ArchiveName))).ToList();
+
         var loadedArchivesToSkip = archivesToInstall
             .IntersectBy(existingArchives.Select(d => d.ArchiveName), GetLoadedArchiveName).ToList();
         loadedArchivesToSkip.ForEach(d => d.ArchiveStatus = ArchiveStatus.Duplicate);
@@ -288,7 +292,7 @@ private async Task UninstallArchiveAsync()
 
             dbContext.Archives.Remove(archive);
             await dbContext.SaveChangesAsync();
-            
+
             messageProgress.Report($"Uninstalled {archive.ArchiveName}");
             percentageProgress.Report(index * increment);
             await Task.Yield();