Cutlery/Kavita
1
0
Fork 0
mirror of https://github.com/Kareadita/Kavita.git synced 2025-05-24 00:52:23 -04:00
Code Issues Packages Projects Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
API/Controllers/DownloadController.cs
View File

@ -158,6 +158,7 @@ public class DownloadController : BaseApiController
await _eventHub.SendMessageAsync(MessageFactory.NotificationProgress,
MessageFactory.DownloadProgressEvent(username,
filename, $"Downloading {filename}", 0F, "started"));
if (files.Count == 1 && files.First().Format != MangaFormat.Image)
{
await _eventHub.SendMessageAsync(MessageFactory.NotificationProgress,
@ -167,15 +168,17 @@ public class DownloadController : BaseApiController
}
var filePath = _archiveService.CreateZipFromFoldersForDownload(files.Select(c => c.FilePath).ToList(), tempFolder, ProgressCallback);
await _eventHub.SendMessageAsync(MessageFactory.NotificationProgress,
MessageFactory.DownloadProgressEvent(username,
filename, "Download Complete", 1F, "ended"));
return PhysicalFile(filePath, DefaultContentType, Uri.EscapeDataString(downloadName), true);
async Task ProgressCallback(Tuple<string, float> progressInfo)
{
await _eventHub.SendMessageAsync(MessageFactory.NotificationProgress,
MessageFactory.DownloadProgressEvent(username, filename, $"Extracting {Path.GetFileNameWithoutExtension(progressInfo.Item1)}",
MessageFactory.DownloadProgressEvent(username, filename, $"Processing {Path.GetFileNameWithoutExtension(progressInfo.Item1)}",
Math.Clamp(progressInfo.Item2, 0F, 1F)));
}
}
@ -193,8 +196,10 @@ public class DownloadController : BaseApiController
public async Task<ActionResult> DownloadSeries(int seriesId)
{
if (!await HasDownloadPermission()) return BadRequest(await _localizationService.Translate(User.GetUserId(), "permission-denied"));
var series = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(seriesId);
if (series == null) return BadRequest("Invalid Series");
var files = await _unitOfWork.SeriesRepository.GetFilesForSeries(seriesId);
try
{

8
API/Controllers/OPDSController.cs
View File

@ -595,13 +595,7 @@ public class OpdsController : BaseApiController
return Unauthorized();
}
var readingLists = await _unitOfWork.ReadingListRepository.GetReadingListDtosForUserAsync(user.Id, true, GetUserParams(pageNumber), false);
if (readingLists == null)
{
return Unauthorized();
}
var readingList = readingLists.FirstOrDefault(rl => rl.Id == readingListId);
var readingList = await _unitOfWork.ReadingListRepository.GetReadingListDtoByIdAsync(readingListId, user.Id);
if (readingList == null)
{
return BadRequest(await _localizationService.Translate(userId, "reading-list-restricted"));

10
API/Controllers/ReadingListController.cs
View File

@ -39,9 +39,15 @@ public class ReadingListController : BaseApiController
/// <param name="readingListId"></param>
/// <returns></returns>
[HttpGet]
public async Task<ActionResult<IEnumerable<ReadingListDto>>> GetList(int readingListId)
public async Task<ActionResult<ReadingListDto?>> GetList(int readingListId)
{
return Ok(await _unitOfWork.ReadingListRepository.GetReadingListDtoByIdAsync(readingListId, User.GetUserId()));
var readingList = await _unitOfWork.ReadingListRepository.GetReadingListDtoByIdAsync(readingListId, User.GetUserId());
if (readingList == null)
{
return BadRequest(await _localizationService.Translate(User.GetUserId(), "reading-list-restricted"));
}
return Ok(readingList);
}
/// <summary>

2
API/Data/Repositories/ReadingListRepository.cs
View File

@ -351,8 +351,10 @@ public class ReadingListRepository : IReadingListRepository
public async Task<ReadingListDto?> GetReadingListDtoByIdAsync(int readingListId, int userId)
{
var user = await _context.AppUser.FirstAsync(u => u.Id == userId);
return await _context.ReadingList
.Where(r => r.Id == readingListId && (r.AppUserId == userId || r.Promoted))
.RestrictAgainstAgeRestriction(user.GetAgeRestriction())
.ProjectTo<ReadingListDto>(_mapper.ConfigurationProvider)
.SingleOrDefaultAsync();
}

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

5
UI/Web/src/app/_pipes/time-ago.pipe.ts
View File

@ -39,9 +39,8 @@ export class TimeAgoPipe implements PipeTransform, OnDestroy {
constructor(private readonly changeDetectorRef: ChangeDetectorRef, private ngZone: NgZone,
private translocoService: TranslocoService) {}
transform(value: string) {
if (value === '' || value === null || value === undefined || value.split('T')[0] === '0001-01-01') {
transform(value: string | Date | null) {
if (value === '' || value === null || value === undefined || (value instanceof String && value.split('T')[0] === '0001-01-01')) {
return this.translocoService.translate('time-ago-pipe.never');
}

24
UI/Web/src/app/_pipes/utc-to-locale-date.pipe.ts Normal file
View File

@ -0,0 +1,24 @@
import { Pipe, PipeTransform } from '@angular/core';
import {DateTime} from "luxon";
@Pipe({
name: 'utcToLocaleDate',
standalone: true
})
/**
* This is the same as the UtcToLocalTimePipe but returning a timezone aware DateTime object rather than a string.
* Use this when the next operation needs a Date object (like the TimeAgoPipe)
*/
export class UtcToLocaleDatePipe implements PipeTransform {
transform(utcDate: string | undefined | null): Date | null {
if (utcDate === '' || utcDate === null || utcDate === undefined || utcDate.split('T')[0] === '0001-01-01') {
return null;
}
const browserLanguage = navigator.language;
const dateTime = DateTime.fromISO(utcDate, { zone: 'utc' }).toLocal().setLocale(browserLanguage);
return dateTime.toJSDate()
}
}

2
UI/Web/src/app/_single-module/edit-chapter-modal/edit-chapter-modal.component.html
View File

@ -535,7 +535,7 @@
<div class="mb-3">
<app-setting-item [title]="t('date-added-label')" [toggleOnViewClick]="false" [showEdit]="false">
<ng-template #view>
{{chapter.createdUtc | utcToLocalTime | translocoDate: {dateStyle: 'short', timeStyle: 'short' } | defaultDate}}
{{chapter.createdUtc | utcToLocalTime:'short' | defaultDate}}
</ng-template>
</app-setting-item>
</div>

13
UI/Web/src/app/_single-module/edit-chapter-modal/edit-chapter-modal.component.ts
View File

@ -197,7 +197,12 @@ export class EditChapterModalComponent implements OnInit {
this.editForm.addControl('language', new FormControl(this.chapter.language, []));
this.editForm.addControl('isbn', new FormControl(this.chapter.isbn, []));
this.editForm.addControl('ageRating', new FormControl(this.chapter.ageRating, []));
this.editForm.addControl('releaseDate', new FormControl(this.chapter.releaseDate, []));
if (this.chapter.releaseDate !== '0001-01-01T00:00:00') {
this.editForm.addControl('releaseDate', new FormControl(this.chapter.releaseDate.substring(0, 10), []));
} else {
this.editForm.addControl('releaseDate', new FormControl('', []));
}
this.editForm.addControl('genres', new FormControl(this.chapter.genres, []));
@ -261,7 +266,11 @@ export class EditChapterModalComponent implements OnInit {
const model = this.editForm.value;
const selectedIndex = this.editForm.get('coverImageIndex')?.value || 0;
this.chapter.releaseDate = model.releaseDate;
if (model.releaseDate === '') {
this.chapter.releaseDate = '0001-01-01T00:00:00';
} else {
this.chapter.releaseDate = model.releaseDate + 'T00:00:00';
}
this.chapter.ageRating = parseInt(model.ageRating + '', 10) as AgeRating;
this.chapter.genres = model.genres;
this.chapter.tags = model.tags;

2
UI/Web/src/app/_single-module/edit-volume-modal/edit-volume-modal.component.html
View File

@ -60,7 +60,7 @@
<div class="mb-3">
<app-setting-item [title]="t('date-added-label')" [toggleOnViewClick]="false" [showEdit]="false">
<ng-template #view>
{{volume.createdUtc | utcToLocalTime | translocoDate: {dateStyle: 'short', timeStyle: 'short' } | defaultDate}}
{{volume.createdUtc | utcToLocalTime:'short' | defaultDate}}
</ng-template>
</app-setting-item>
</div>

2
UI/Web/src/app/_single-module/smart-collection-drawer/smart-collection-drawer.component.html
View File

@ -12,7 +12,7 @@
<app-setting-item [title]="t('edit-collection-tags.last-sync-title')" [showEdit]="false" [canEdit]="false"
[subtitle]="t('edit-collection-tags.last-sync-tooltip')">
<ng-template #view>
{{collection.lastSyncUtc | utcToLocalTime | date:'shortDate' | defaultDate}}
{{collection.lastSyncUtc | utcToLocalTime:'shortDate' | defaultDate}}
</ng-template>
</app-setting-item>
</div>

2
UI/Web/src/app/admin/manage-users/manage-users.component.html
View File

@ -31,7 +31,7 @@
@if ((messageHub.onlineUsers$ | async)?.includes(member.username)) {
{{t('online-now-tooltip')}}
} @else {
{{member.lastActiveUtc | utcToLocalTime | timeAgo | sentenceCase | defaultDate}}
{{member.lastActiveUtc | utcToLocaleDate | timeAgo | sentenceCase | defaultDate}}
}
</span>
</td>

3
UI/Web/src/app/admin/manage-users/manage-users.component.ts
View File

@ -23,6 +23,7 @@ import {LoadingComponent} from "../../shared/loading/loading.component";
import {TimeAgoPipe} from "../../_pipes/time-ago.pipe";
import {SentenceCasePipe} from "../../_pipes/sentence-case.pipe";
import {DefaultModalOptions} from "../../_models/default-modal-options";
import {UtcToLocaleDatePipe} from "../../_pipes/utc-to-locale-date.pipe";
@Component({
selector: 'app-manage-users',
@ -30,7 +31,7 @@ import {DefaultModalOptions} from "../../_models/default-modal-options";
styleUrls: ['./manage-users.component.scss'],
standalone: true,
changeDetection: ChangeDetectionStrategy.OnPush,
imports: [NgbTooltip, TagBadgeComponent, AsyncPipe, TitleCasePipe, DatePipe, TranslocoModule, DefaultDatePipe, NgClass, DefaultValuePipe, ReadMoreComponent, UtcToLocalTimePipe, LoadingComponent, NgIf, TimeAgoPipe, SentenceCasePipe]
imports: [NgbTooltip, TagBadgeComponent, AsyncPipe, TitleCasePipe, DatePipe, TranslocoModule, DefaultDatePipe, NgClass, DefaultValuePipe, ReadMoreComponent, UtcToLocalTimePipe, LoadingComponent, NgIf, TimeAgoPipe, SentenceCasePipe, UtcToLocaleDatePipe]
})
export class ManageUsersComponent implements OnInit {

2
UI/Web/src/app/cards/_modals/edit-collection-tags/edit-collection-tags.component.html
View File

@ -112,7 +112,7 @@
<div class="row g-0 mb-2">
<div class="col-md-6">
<div>{{t('last-sync-title')}}</div>
<div>{{tag.lastSyncUtc | utcToLocalTime | date:'shortDate' | defaultDate}}</div>
<div>{{tag.lastSyncUtc | utcToLocalTime:'shortDate' | defaultDate}}</div>
</div>
<div class="col-md-6">
<div>{{t('source-url-title')}}</div>

4
UI/Web/src/app/cards/_modals/edit-series-modal/edit-series-modal.component.html
View File

@ -589,7 +589,7 @@
<div class="mb-3">
<app-setting-item [title]="t('created-title')" [toggleOnViewClick]="false" [showEdit]="false">
<ng-template #view>
{{series.created | date:'shortDate'}}
{{series.created | utcToLocalTime:'shortDate'}}
</ng-template>
</app-setting-item>
</div>
@ -665,7 +665,7 @@
{{t('added-title')}} {{volume.createdUtc | utcToLocalTime | defaultDate}}
</div>
<div class="col">
{{t('last-modified-title')}} {{volume.lastModifiedUtc | utcToLocalTime | translocoDate: {dateStyle: 'short' } | defaultDate}}
{{t('last-modified-title')}} {{volume.lastModifiedUtc | utcToLocalTime:'short' | defaultDate}}
</div>
</div>
<div class="row">

4
UI/Web/src/app/cards/edit-chapter-progress/edit-chapter-progress.component.html
View File

@ -74,10 +74,10 @@
}
</td>
<td>
{{progressEvents[idx].createdUtc | utcToLocalTime | date:'shortDate' | defaultDate}}
{{progressEvents[idx].createdUtc | utcToLocalTime:'shortDate' | defaultDate}}
</td>
<td>
{{progressEvents[idx].lastModifiedUtc | utcToLocalTime | date:'shortDate' | defaultDate}}
{{progressEvents[idx].lastModifiedUtc | utcToLocalTime:'shortDate' | defaultDate}}
</td>
<!-- <td>-->
<!-- @if(editMode[idx]) {-->