Various bug fixes (#3667)

2026-05-21 15:16:33 -04:00 · 2025-03-23 21:10:50 +01:00
parent a1d3aef39b
commit 1ad8a360cb
17 changed files with 73 additions and 32 deletions
@@ -363,16 +363,15 @@ public class ArchiveService : IArchiveService
                    tempPath = Path.Join(tempLocation, parentDirectory ?? _directoryService.FileSystem.FileInfo.New(path).Name);
                }

-                progressCallback(Tuple.Create(_directoryService.FileSystem.FileInfo.New(path).Name, (1.0f * totalFiles) / count));
                if (Tasks.Scanner.Parser.Parser.IsArchive(path))
                {
-                    ExtractArchive(path, tempPath);
-                }
-                else
-                {
-                    _directoryService.CopyFileToDirectory(path, tempPath);
+                    // Archives don't need to be put into a subdirectory of the same name
+                    tempPath = _directoryService.GetParentDirectoryName(tempPath);
                }

+                progressCallback(Tuple.Create(_directoryService.FileSystem.FileInfo.New(path).Name, (1.0f * totalFiles) / count));
+
+                _directoryService.CopyFileToDirectory(path, tempPath);
                count++;
            }
        }