v0.8.3.2 - A Small Hotfix (#3194)

Co-authored-by: Robbie Davis <[email protected]> Co-authored-by: Weblate (bot) <[email protected]> Co-authored-by: Havokdan <[email protected]> Co-authored-by: daydreamrabbit <[email protected]> Co-authored-by: 無情天 <[email protected]>
Kareadita · Sep 20, 2024 · 894b49b · 894b49b
1 parent 77de5cc
commit 894b49b
Show file tree

Hide file tree

Showing 43 changed files with 307 additions and 241 deletions.
diff --git a/API/Controllers/OPDSController.cs b/API/Controllers/OPDSController.cs
@@ -549,12 +549,15 @@ public async Task<IActionResult> GetReadingLists(string apiKey, [FromQuery] int
                 Id = readingListDto.Id.ToString(),
                 Title = readingListDto.Title,
                 Summary = readingListDto.Summary,
-                Links = new List<FeedLink>()
-                {
-                    CreateLink(FeedLinkRelation.SubSection, FeedLinkType.AtomNavigation, $"{prefix}{apiKey}/reading-list/{readingListDto.Id}"),
-                    CreateLink(FeedLinkRelation.Image, FeedLinkType.Image, $"{baseUrl}api/image/readinglist-cover?readingListId={readingListDto.Id}&apiKey={apiKey}"),
-                    CreateLink(FeedLinkRelation.Thumbnail, FeedLinkType.Image, $"{baseUrl}api/image/readinglist-cover?readingListId={readingListDto.Id}&apiKey={apiKey}")
-                }
+                Links =
+                [
+                    CreateLink(FeedLinkRelation.SubSection, FeedLinkType.AtomNavigation,
+                        $"{prefix}{apiKey}/reading-list/{readingListDto.Id}"),
+                    CreateLink(FeedLinkRelation.Image, FeedLinkType.Image,
+                        $"{baseUrl}api/image/readinglist-cover?readingListId={readingListDto.Id}&apiKey={apiKey}"),
+                    CreateLink(FeedLinkRelation.Thumbnail, FeedLinkType.Image,
+                        $"{baseUrl}api/image/readinglist-cover?readingListId={readingListDto.Id}&apiKey={apiKey}")
+                ]
             });
         }
 
@@ -573,7 +576,7 @@ private static UserParams GetUserParams(int pageNumber)
 
     [HttpGet("{apiKey}/reading-list/{readingListId}")]
     [Produces("application/xml")]
-    public async Task<IActionResult> GetReadingListItems(int readingListId, string apiKey)
+    public async Task<IActionResult> GetReadingListItems(int readingListId, string apiKey, [FromQuery] int pageNumber = 0)
     {
         var userId = await GetUser(apiKey);
         if (!(await _unitOfWork.SettingsRepository.GetSettingsDtoAsync()).EnableOpds)
@@ -592,7 +595,7 @@ public async Task<IActionResult> GetReadingListItems(int readingListId, string a
         var feed = CreateFeed(readingList.Title + " " + await _localizationService.Translate(userId, "reading-list"), $"{apiKey}/reading-list/{readingListId}", apiKey, prefix);
         SetFeedId(feed, $"reading-list-{readingListId}");
 
-        var items = (await _unitOfWork.ReadingListRepository.GetReadingListItemDtosByIdAsync(readingListId, userId)).ToList();
+        var items = await _unitOfWork.ReadingListRepository.GetReadingListItemDtosByIdAsync(readingListId, userId);
         foreach (var item in items)
         {
             var chapterDto = await _unitOfWork.ChapterRepository.GetChapterDtoAsync(item.ChapterId);

diff --git a/API/Controllers/SettingsController.cs b/API/Controllers/SettingsController.cs
@@ -345,7 +345,7 @@ public async Task<ActionResult<ServerSettingDto>> UpdateSettings(ServerSettingDt
 
             if (updateBookmarks)
             {
-                BackgroundJob.Enqueue(() => UpdateBookmarkDirectory(originalBookmarkDirectory, bookmarkDirectory));
+                UpdateBookmarkDirectory(originalBookmarkDirectory, bookmarkDirectory);
             }
 
             if (updateSettingsDto.EnableFolderWatching)
@@ -371,6 +371,7 @@ public async Task<ActionResult<ServerSettingDto>> UpdateSettings(ServerSettingDt
         return Ok(updateSettingsDto);
     }
 
+
     private void UpdateBookmarkDirectory(string originalBookmarkDirectory, string bookmarkDirectory)
     {
         _directoryService.ExistOrCreate(bookmarkDirectory);

diff --git a/API/DTOs/Account/ConfirmEmailDto.cs b/API/DTOs/Account/ConfirmEmailDto.cs
@@ -9,7 +9,7 @@ public class ConfirmEmailDto
     [Required]
     public string Token { get; set; } = default!;
     [Required]
-    [StringLength(32, MinimumLength = 6)]
+    [StringLength(256, MinimumLength = 6)]
     public string Password { get; set; } = default!;
     [Required]
     public string Username { get; set; } = default!;

diff --git a/API/DTOs/Account/ConfirmPasswordResetDto.cs b/API/DTOs/Account/ConfirmPasswordResetDto.cs
@@ -9,6 +9,6 @@ public class ConfirmPasswordResetDto
     [Required]
     public string Token { get; set; } = default!;
     [Required]
-    [StringLength(32, MinimumLength = 6)]
+    [StringLength(256, MinimumLength = 6)]
     public string Password { get; set; } = default!;
 }
diff --git a/API/DTOs/Account/ResetPasswordDto.cs b/API/DTOs/Account/ResetPasswordDto.cs
@@ -13,7 +13,7 @@ public class ResetPasswordDto
     /// The new password
     /// </summary>
     [Required]
-    [StringLength(32, MinimumLength = 6)]
+    [StringLength(256, MinimumLength = 6)]
     public string Password { get; init; } = default!;
     /// <summary>
     /// The old, existing password. If an admin is performing the change, this is not required. Otherwise, it is.

diff --git a/API/DTOs/RegisterDto.cs b/API/DTOs/RegisterDto.cs
@@ -11,6 +11,6 @@ public class RegisterDto
     /// </summary>
     public string Email { get; init; } = default!;
     [Required]
-    [StringLength(32, MinimumLength = 6)]
+    [StringLength(256, MinimumLength = 6)]
     public string Password { get; set; } = default!;
 }
diff --git a/API/Services/CacheService.cs b/API/Services/CacheService.cs
@@ -119,6 +119,7 @@ public IEnumerable<FileDimensionDto> GetCachedFileDimensions(string cachePath)
         }
 
         _logger.LogDebug("File Dimensions call for {Length} images took {Time}ms", dimensions.Count, sw.ElapsedMilliseconds);
+
         return dimensions;
     }
 

diff --git a/Kavita.Common/Kavita.Common.csproj b/Kavita.Common/Kavita.Common.csproj
@@ -3,7 +3,7 @@
         <TargetFramework>net8.0</TargetFramework>
         <Company>kavitareader.com</Company>
         <Product>Kavita</Product>
-        <AssemblyVersion>0.8.3.1</AssemblyVersion>
+        <AssemblyVersion>0.8.3.2</AssemblyVersion>
         <NeutralLanguage>en</NeutralLanguage>
         <TieredPGO>true</TieredPGO>
     </PropertyGroup>
@@ -20,4 +20,4 @@
       </PackageReference>
       <PackageReference Include="xunit.assert" Version="2.9.0" />
     </ItemGroup>
-</Project>
+</Project>
diff --git a/UI/Web/src/_card-item-common.scss b/UI/Web/src/_card-item-common.scss
@@ -168,7 +168,7 @@ $image-width: 160px;
       font-size: 0.8rem;
       margin: 0;
       text-align: center;
-      max-width: 110px;
+      max-width: 98px;
 
       a {
         overflow: hidden;

diff --git a/UI/Web/src/app/_single-module/card-actionables/card-actionables.component.scss b/UI/Web/src/app/_single-module/card-actionables/card-actionables.component.scss
@@ -27,6 +27,10 @@
     padding: var(--bs-dropdown-item-padding-y) 0;
 }
 
+.btn {
+    padding: 5px;
+}
+
 // Robbie added this but it broke most of the uses
 //.dropdown-toggle {
 //    padding-top: 0;

diff --git a/UI/Web/src/app/_single-module/details-tab/details-tab.component.html b/UI/Web/src/app/_single-module/details-tab/details-tab.component.html
@@ -1,21 +1,25 @@
 <ng-container *transloco="let t; read: 'details-tab'">
 <div class="details pb-3">
-  <div class="mb-3">
+  <div class="mb-3 ms-1">
     <h4 class="header">{{t('genres-title')}}</h4>
-    <app-badge-expander [includeComma]="true" [items]="genres" [itemsTillExpander]="3">
-      <ng-template #badgeExpanderItem let-item let-position="idx" let-last="last">
-        <a href="javascript:void(0)" class="dark-exempt btn-icon" (click)="openGeneric(FilterField.Genres, item.id)">{{item.title}}</a>
-      </ng-template>
-    </app-badge-expander>
+    <div class="ms-3">
+      <app-badge-expander [includeComma]="true" [items]="genres" [itemsTillExpander]="3">
+        <ng-template #badgeExpanderItem let-item let-position="idx" let-last="last">
+          <a href="javascript:void(0)" class="dark-exempt btn-icon" (click)="openGeneric(FilterField.Genres, item.id)">{{item.title}}</a>
+        </ng-template>
+      </app-badge-expander>
+    </div>
   </div>
 
-  <div class="mb-3">
+  <div class="mb-3 ms-1">
     <h4 class="header">{{t('tags-title')}}</h4>
-    <app-badge-expander [includeComma]="true" [items]="tags" [itemsTillExpander]="3">
-      <ng-template #badgeExpanderItem let-item let-position="idx" let-last="last">
-        <a href="javascript:void(0)" class="dark-exempt btn-icon" (click)="openGeneric(FilterField.Tags, item.id)">{{item.title}}</a>
-      </ng-template>
-    </app-badge-expander>
+    <div class="ms-3">
+      <app-badge-expander [includeComma]="true" [items]="tags" [itemsTillExpander]="3">
+        <ng-template #badgeExpanderItem let-item let-position="idx" let-last="last">
+          <a href="javascript:void(0)" class="dark-exempt btn-icon" (click)="openGeneric(FilterField.Tags, item.id)">{{item.title}}</a>
+        </ng-template>
+      </app-badge-expander>
+    </div>
   </div>
 
   <div class="mb-3">
@@ -29,7 +33,7 @@ <h4 class="header">{{t('tags-title')}}</h4>
     </app-carousel-reel>
   </div>
 
-  @if (genres.length > 0 || tags.length > 0) {
+  @if (genres.length > 0 || tags.length > 0 || webLinks.length > 0) {
     <div class="setting-section-break" aria-hidden="true"></div>
   }
 

diff --git a/UI/Web/src/app/admin/manage-email-settings/manage-email-settings.component.html b/UI/Web/src/app/admin/manage-email-settings/manage-email-settings.component.html
@@ -2,11 +2,7 @@
   <p>{{t('description')}}</p>
 
   <form [formGroup]="settingsForm">
-    <p class="alert alert-warning">{{t('setting-description')}}</p>
-
-    @if (settingsForm.dirty) {
-      <div class="alert alert-warning">{{t('test-warning')}}</div>
-    }
+    <p class="alert alert-warning">{{t('setting-description')}} {{t('test-warning')}}</p>
 
     <div class="row g-0 mt-2">
       @if (settingsForm.get('hostName'); as formControl) {

diff --git a/UI/Web/src/app/admin/manage-email-settings/manage-email-settings.component.ts b/UI/Web/src/app/admin/manage-email-settings/manage-email-settings.component.ts
@@ -1,14 +1,14 @@
 import {ChangeDetectionStrategy, ChangeDetectorRef, Component, DestroyRef, inject, OnInit} from '@angular/core';
 import {FormControl, FormGroup, ReactiveFormsModule, Validators} from '@angular/forms';
 import {ToastrService} from 'ngx-toastr';
-import {debounceTime, distinctUntilChanged, filter, switchMap, take, tap} from 'rxjs';
+import {debounceTime, distinctUntilChanged, filter, map, switchMap, take, tap} from 'rxjs';
 import {SettingsService} from '../settings.service';
 import {ServerSettings} from '../_models/server-settings';
 import {
   NgbAlert,
   NgbTooltip
 } from '@ng-bootstrap/ng-bootstrap';
-import {NgIf, NgTemplateOutlet, TitleCasePipe} from '@angular/common';
+import {AsyncPipe, NgIf, NgTemplateOutlet, TitleCasePipe} from '@angular/common';
 import {translate, TranslocoModule} from "@jsverse/transloco";
 import {SafeHtmlPipe} from "../../_pipes/safe-html.pipe";
 import {ManageMediaIssuesComponent} from "../manage-media-issues/manage-media-issues.component";
@@ -25,7 +25,7 @@ import {takeUntilDestroyed} from "@angular/core/rxjs-interop";
     standalone: true,
   changeDetection: ChangeDetectionStrategy.OnPush,
   imports: [NgIf, ReactiveFormsModule, NgbTooltip, NgTemplateOutlet, TranslocoModule, SafeHtmlPipe,
-    ManageMediaIssuesComponent, TitleCasePipe, NgbAlert, SettingItemComponent, SettingSwitchComponent, DefaultValuePipe, BytesPipe]
+    ManageMediaIssuesComponent, TitleCasePipe, NgbAlert, SettingItemComponent, SettingSwitchComponent, DefaultValuePipe, BytesPipe, AsyncPipe]
 })
 export class ManageEmailSettingsComponent implements OnInit {
 

diff --git a/UI/Web/src/app/admin/manage-media-settings/manage-media-settings.component.ts b/UI/Web/src/app/admin/manage-media-settings/manage-media-settings.component.ts
@@ -21,7 +21,7 @@ import {allEncodeFormats} from '../_models/encode-format';
 import {ManageMediaIssuesComponent} from '../manage-media-issues/manage-media-issues.component';
 import {NgFor, NgIf, NgTemplateOutlet} from '@angular/common';
 import {translate, TranslocoDirective, TranslocoService} from "@jsverse/transloco";
-import {allCoverImageSizes} from '../_models/cover-image-size';
+import {allCoverImageSizes, CoverImageSize} from '../_models/cover-image-size';
 import {pageLayoutModes} from "../../_models/preferences/preferences";
 import {PageLayoutModePipe} from "../../_pipes/page-layout-mode.pipe";
 import {SettingItemComponent} from "../../settings/_components/setting-item/setting-item.component";
@@ -62,7 +62,7 @@ export class ManageMediaSettingsComponent implements OnInit {
       this.serverSettings = settings;
       this.settingsForm.addControl('encodeMediaAs', new FormControl(this.serverSettings.encodeMediaAs, [Validators.required]));
       this.settingsForm.addControl('bookmarksDirectory', new FormControl(this.serverSettings.bookmarksDirectory, [Validators.required]));
-      this.settingsForm.addControl('coverImageSize', new FormControl(this.serverSettings.coverImageSize, [Validators.required]));
+      this.settingsForm.addControl('coverImageSize', new FormControl(this.serverSettings.coverImageSize || CoverImageSize.Default, [Validators.required]));
 
       // Automatically save settings as we edit them
       this.settingsForm.valueChanges.pipe(

diff --git a/UI/Web/src/app/admin/manage-tasks-settings/manage-tasks-settings.component.ts b/UI/Web/src/app/admin/manage-tasks-settings/manage-tasks-settings.component.ts
@@ -107,7 +107,7 @@ export class ManageTasksSettingsComponent implements OnInit {
     },
     {
       name: 'sync-themes-task',
-      description: 'sync-themes-desc',
+      description: 'sync-themes-task-desc',
       api: this.serverService.syncThemes(),
       successMessage: 'sync-themes-success'
     },
@@ -143,72 +143,20 @@ export class ManageTasksSettingsComponent implements OnInit {
       this.logLevels = result.levels;
       this.serverSettings = result.settings;
 
+      // Create base controls for taskScan, taskBackup, taskCleanup
       this.settingsForm.addControl('taskScan', new FormControl(this.serverSettings.taskScan, [Validators.required]));
       this.settingsForm.addControl('taskBackup', new FormControl(this.serverSettings.taskBackup, [Validators.required]));
       this.settingsForm.addControl('taskCleanup', new FormControl(this.serverSettings.taskCleanup, [Validators.required]));
 
-      if (!this.taskFrequencies.includes(this.serverSettings.taskScan)) {
-        this.settingsForm.get('taskScan')?.setValue(this.customOption);
-        this.settingsForm.addControl('taskScanCustom', new FormControl(this.serverSettings.taskScan, [Validators.required]));
-      } else {
-        this.settingsForm.addControl('taskScanCustom', new FormControl('', [Validators.required]));
-      }
-
-      if (!this.taskFrequencies.includes(this.serverSettings.taskBackup)) {
-        this.settingsForm.get('taskBackup')?.setValue(this.customOption);
-        this.settingsForm.addControl('taskBackupCustom', new FormControl(this.serverSettings.taskBackup, [Validators.required]));
-      } else {
-        this.settingsForm.addControl('taskBackupCustom', new FormControl('', [Validators.required]));
-      }
 
-      if (!this.taskFrequenciesForCleanup.includes(this.serverSettings.taskCleanup)) {
-        this.settingsForm.get('taskCleanup')?.setValue(this.customOption);
-        this.settingsForm.addControl('taskCleanupCustom', new FormControl(this.serverSettings.taskCleanup, [Validators.required]));
-      } else {
-        this.settingsForm.addControl('taskCleanupCustom', new FormControl('', [Validators.required]));
-      }
-
-      this.settingsForm.get('taskScanCustom')?.valueChanges.pipe(
-        debounceTime(100),
-        switchMap(val => this.settingsService.isValidCronExpression(val)),
-        tap(isValid => {
-          if (isValid) {
-            this.settingsForm.get('taskScanCustom')?.setErrors(null);
-          } else {
-            this.settingsForm.get('taskScanCustom')?.setErrors({invalidCron: true})
-          }
-          this.cdRef.markForCheck();
-        }),
-        takeUntilDestroyed(this.destroyRef)
-      ).subscribe();
-
-      this.settingsForm.get('taskBackupCustom')?.valueChanges.pipe(
-        debounceTime(100),
-        switchMap(val => this.settingsService.isValidCronExpression(val)),
-        tap(isValid => {
-          if (isValid) {
-            this.settingsForm.get('taskBackupCustom')?.setErrors(null);
-          } else {
-            this.settingsForm.get('taskBackupCustom')?.setErrors({invalidCron: true})
-          }
-          this.cdRef.markForCheck();
-        }),
-        takeUntilDestroyed(this.destroyRef)
-      ).subscribe();
+      this.updateCustomFields('taskScan', 'taskScanCustom', this.taskFrequencies, this.serverSettings.taskScan);
+      this.updateCustomFields('taskBackup', 'taskBackupCustom', this.taskFrequencies, this.serverSettings.taskBackup);
+      this.updateCustomFields('taskCleanup', 'taskCleanupCustom', this.taskFrequenciesForCleanup, this.serverSettings.taskCleanup);
 
-      this.settingsForm.get('taskCleanupCustom')?.valueChanges.pipe(
-        debounceTime(100),
-        switchMap(val => this.settingsService.isValidCronExpression(val)),
-        tap(isValid => {
-          if (isValid) {
-            this.settingsForm.get('taskCleanupCustom')?.setErrors(null);
-          } else {
-            this.settingsForm.get('taskCleanupCustom')?.setErrors({invalidCron: true})
-          }
-          this.cdRef.markForCheck();
-        }),
-        takeUntilDestroyed(this.destroyRef)
-      ).subscribe();
+      // Call the validation method for each custom control
+      this.validateCronExpression('taskScanCustom');
+      this.validateCronExpression('taskBackupCustom');
+      this.validateCronExpression('taskCleanupCustom');
 
       // Automatically save settings as we edit them
       this.settingsForm.valueChanges.pipe(
@@ -235,6 +183,35 @@ export class ManageTasksSettingsComponent implements OnInit {
     this.cdRef.markForCheck();
   }
 
+  // Custom logic to dynamically handle custom fields and validators
+  updateCustomFields(controlName: string, customControlName: string, frequencyList: string[], currentSetting: string) {
+    if (!frequencyList.includes(currentSetting)) {
+      // If the setting is not in the predefined list, it's a custom value
+      this.settingsForm.get(controlName)?.setValue(this.customOption);
+      this.settingsForm.addControl(customControlName, new FormControl(currentSetting, [Validators.required]));
+    } else {
+      // Otherwise, reset the custom control (no need for Validators.required here)
+      this.settingsForm.addControl(customControlName, new FormControl(''));
+    }
+  }
+
+  // Validate the custom fields for cron expressions
+  validateCronExpression(controlName: string) {
+    this.settingsForm.get(controlName)?.valueChanges.pipe(
+      debounceTime(100),
+      switchMap(val => this.settingsService.isValidCronExpression(val)),
+      tap(isValid => {
+        if (isValid) {
+          this.settingsForm.get(controlName)?.setErrors(null);
+        } else {
+          this.settingsForm.get(controlName)?.setErrors({ invalidCron: true });
+        }
+        this.cdRef.markForCheck();
+      }),
+      takeUntilDestroyed(this.destroyRef)
+    ).subscribe();
+  }
+
 
   resetForm() {
     this.settingsForm.get('taskScan')?.setValue(this.serverSettings.taskScan, {onlySelf: true, emitEvent: false});

diff --git a/UI/Web/src/app/all-series/_components/all-series/all-series.component.ts b/UI/Web/src/app/all-series/_components/all-series/all-series.component.ts
@@ -112,6 +112,7 @@ export class AllSeriesComponent implements OnInit {
     private readonly cdRef: ChangeDetectorRef) {
 
     this.router.routeReuseStrategy.shouldReuseRoute = () => false;
+    console.log('url: ', this.route.snapshot);
 
     this.filterUtilityService.filterPresetsFromUrl(this.route.snapshot).subscribe(filter => {
       this.filter = filter;

diff --git a/UI/Web/src/app/app.component.ts b/UI/Web/src/app/app.component.ts
@@ -22,7 +22,7 @@ import {ServerService} from "./_services/server.service";
 import {OutOfDateModalComponent} from "./announcements/_components/out-of-date-modal/out-of-date-modal.component";
 import {PreferenceNavComponent} from "./sidenav/preference-nav/preference-nav.component";
 import {Breakpoint, UtilityService} from "./shared/_services/utility.service";
-import {translate} from "@jsverse/transloco";
+import {TranslocoService} from "@jsverse/transloco";
 
 @Component({
     selector: 'app-root',
@@ -47,6 +47,7 @@ export class AppComponent implements OnInit {
   private readonly router = inject(Router);
   private readonly themeService = inject(ThemeService);
   private readonly document = inject(DOCUMENT);
+  private readonly translocoService = inject(TranslocoService);
 
   protected readonly Breakpoint = Breakpoint;
 
@@ -126,6 +127,9 @@ export class AppComponent implements OnInit {
         // Bust locale cache
         localStorage.removeItem('@transloco/translations/timestamp');
         localStorage.removeItem('@transloco/translations');
+        (this.translocoService as any).cache.delete(localStorage.getItem('kavita-locale') || 'en');
+        (this.translocoService as any).cache.clear();
+        localStorage.setItem('kavita--version', version);
         location.reload();
       }
       localStorage.setItem('kavita--version', version);