AZEN-SGG/Kavita
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Various bug fixes (#3667)

Browse source
This commit is contained in:
Fesaa 2025-03-23 21:10:50 +01:00 • committed by GitHub
parent a1d3aef39b
commit 1ad8a360cb
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
17 changed files with 73 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

4
API/Services/AccountService.cs
View file

@ -8,6 +8,7 @@ using API.Data;
using API.DTOs.Account;
using API.Entities;
using API.Errors;
using API.Extensions;
using Kavita.Common;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Identity;
@ -78,8 +79,9 @@ public class AccountService : IAccountService
}
public async Task<IEnumerable<ApiException>> ValidateUsername(string username)
{
// Reverted because of https://go.microsoft.com/fwlink/?linkid=2129535
if (await _userManager.Users.AnyAsync(x => x.NormalizedUserName != null
&& x.NormalizedUserName.Equals(username, StringComparison.CurrentCultureIgnoreCase)))
&& x.NormalizedUserName == username.ToUpper()))
{
return
[

11
API/Services/ArchiveService.cs
View file

@ -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++;
}
}