mirror of
https://github.com/Kareadita/Kavita.git
synced 2025-07-09 03:04:19 -04:00
Download Bugfix (#2601)
This commit is contained in:
parent
e215305700
commit
51e169ed82
@ -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);
|
||||
|
4
UI/Web/package-lock.json
generated
4
UI/Web/package-lock.json
generated
@ -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",
|
||||
|
@ -14,12 +14,7 @@
|
||||
<div class="mb-2">
|
||||
<label for="password" class="form-label visually-hidden">{{t('password')}}</label>
|
||||
<input class="form-control custom-input" formControlName="password" name="password"
|
||||
id="password" type="password" pattern="^.{6,32}$" [placeholder]="t('password')">
|
||||
<div id="inviteForm-validations" class="invalid-feedback" *ngIf="loginForm.get('password')?.errors?.pattern" >
|
||||
<div class="" *ngIf="loginForm.get('password')?.errors?.pattern">
|
||||
{{t('password-validation')}}
|
||||
</div>
|
||||
</div>
|
||||
id="password" type="password" [placeholder]="t('password')">
|
||||
</div>
|
||||
|
||||
<div class="mb-3">
|
||||
|
@ -7,7 +7,7 @@
|
||||
"name": "GPL-3.0",
|
||||
"url": "https://github.com/Kareadita/Kavita/blob/develop/LICENSE"
|
||||
},
|
||||
"version": "0.7.12.1"
|
||||
"version": "0.7.12.2"
|
||||
},
|
||||
"servers": [
|
||||
{
|
||||
|
Loading…
x
Reference in New Issue
Block a user