diff --git a/API/Services/ArchiveService.cs b/API/Services/ArchiveService.cs index f33091d76..1262c2cc8 100644 --- a/API/Services/ArchiveService.cs +++ b/API/Services/ArchiveService.cs @@ -335,7 +335,7 @@ public class ArchiveService : IArchiveService { var dateString = DateTime.UtcNow.ToShortDateString().Replace("/", "_"); - var potentialExistingFile = _directoryService.FileSystem.FileInfo.New(Path.Join(_directoryService.TempDirectory, $"kavita_{tempFolder}_{dateString}.zip")); + var potentialExistingFile = _directoryService.FileSystem.FileInfo.New(Path.Join(_directoryService.TempDirectory, $"kavita_{tempFolder}_{dateString}.cbz")); if (potentialExistingFile.Exists) { // A previous download exists, just return it immediately @@ -352,7 +352,6 @@ public class ArchiveService : IArchiveService foreach (var path in files) { var tempPath = Path.Join(tempLocation, _directoryService.FileSystem.Path.GetFileNameWithoutExtension(_directoryService.FileSystem.FileInfo.New(path).Name)); - _directoryService.ExistOrCreate(tempPath); progressCallback(Tuple.Create(_directoryService.FileSystem.FileInfo.New(path).Name, (1.0f * totalFiles) / count)); ExtractArchive(path, tempPath); count++; @@ -363,7 +362,7 @@ public class ArchiveService : IArchiveService throw new KavitaException("bad-copy-files-for-download"); } - var zipPath = Path.Join(_directoryService.TempDirectory, $"kavita_{tempFolder}_{dateString}.zip"); + var zipPath = Path.Join(_directoryService.TempDirectory, $"kavita_{tempFolder}_{dateString}.cbz"); try { ZipFile.CreateFromDirectory(tempLocation, zipPath); diff --git a/UI/Web/package-lock.json b/UI/Web/package-lock.json index 072a7e128..eb956e53f 100644 --- a/UI/Web/package-lock.json +++ b/UI/Web/package-lock.json @@ -1,12 +1,12 @@ { "name": "kavita-webui", - "version": "0.4.2", + "version": "0.7.12.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "kavita-webui", - "version": "0.4.2", + "version": "0.7.12.1", "dependencies": { "@angular/animations": "^17.0.8", "@angular/cdk": "^17.0.4", diff --git a/UI/Web/src/app/registration/user-login/user-login.component.html b/UI/Web/src/app/registration/user-login/user-login.component.html index 47c20efd4..bc4964bfd 100644 --- a/UI/Web/src/app/registration/user-login/user-login.component.html +++ b/UI/Web/src/app/registration/user-login/user-login.component.html @@ -14,12 +14,7 @@