diff --git a/API/.dockerignore b/API/.dockerignore deleted file mode 100644 index cd967fc3a..000000000 --- a/API/.dockerignore +++ /dev/null @@ -1,25 +0,0 @@ -**/.dockerignore -**/.env -**/.git -**/.gitignore -**/.project -**/.settings -**/.toolstarget -**/.vs -**/.vscode -**/.idea -**/*.*proj.user -**/*.dbmdl -**/*.jfm -**/azds.yaml -**/bin -**/charts -**/docker-compose* -**/Dockerfile* -**/node_modules -**/npm-debug.log -**/obj -**/secrets.dev.yaml -**/values.dev.yaml -LICENSE -README.md \ No newline at end of file diff --git a/API/Controllers/ReaderController.cs b/API/Controllers/ReaderController.cs index 78663ca16..7ced84d6a 100644 --- a/API/Controllers/ReaderController.cs +++ b/API/Controllers/ReaderController.cs @@ -150,8 +150,7 @@ namespace API.Controllers { var user = await _unitOfWork.UserRepository.GetUserByUsernameAsync(User.GetUsername()); var totalPages = await _cacheService.CacheBookmarkForSeries(user.Id, seriesId); - // TODO: Change Includes to None from LinkedSeries branch - var series = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(seriesId); + var series = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(seriesId, SeriesIncludes.None); return Ok(new BookmarkInfoDto() { @@ -172,11 +171,6 @@ namespace API.Controllers if (!await _unitOfWork.CommitAsync()) return BadRequest("There was an issue saving progress"); - // var series = new List() - // {await _unitOfWork.SeriesRepository.GetSeriesDtoByIdAsync(markReadDto.SeriesId, user.Id)}; - // await _unitOfWork.SeriesRepository.AddSeriesModifiers(user.Id, series); - // await _eventHub.SendMessageAsync(MessageFactory.UserProgressUpdate, - // MessageFactory.UserProgressUpdateEvent(user.Id, user.UserName, markReadDto.SeriesId, series[0], series[0].Pages)); return Ok(); } @@ -194,16 +188,6 @@ namespace API.Controllers if (!await _unitOfWork.CommitAsync()) return BadRequest("There was an issue saving progress"); - // Should I do this for every chapter? Maybe in a background task? - // foreach (var chapterId in await - // _unitOfWork.SeriesRepository.GetChapterIdsForSeriesAsync(new List() {markReadDto.SeriesId})) - // { - // await _eventHub.SendMessageAsync(MessageFactory.UserProgressUpdate, - // MessageFactory.UserProgressUpdateEvent(user.Id, user.UserName, chapterId, MessageFactoryEntityTypes.Chapter, 0)); - // } - // - // await _eventHub.SendMessageAsync(MessageFactory.UserProgressUpdate, - // MessageFactory.UserProgressUpdateEvent(user.Id, user.UserName, markReadDto.SeriesId, MessageFactoryEntityTypes.Series, 0)); return Ok(); } @@ -580,6 +564,7 @@ namespace API.Controllers if (await _bookmarkService.BookmarkPage(user, bookmarkDto, path)) { + BackgroundJob.Enqueue(() => _cacheService.CleanupBookmarkCache(bookmarkDto.SeriesId)); return Ok(); } @@ -599,6 +584,7 @@ namespace API.Controllers if (await _bookmarkService.RemoveBookmarkPage(user, bookmarkDto)) { + BackgroundJob.Enqueue(() => _cacheService.CleanupBookmarkCache(bookmarkDto.SeriesId)); return Ok(); } diff --git a/API/Controllers/UploadController.cs b/API/Controllers/UploadController.cs index 98005e091..ca84acc8b 100644 --- a/API/Controllers/UploadController.cs +++ b/API/Controllers/UploadController.cs @@ -102,6 +102,8 @@ namespace API.Controllers if (_unitOfWork.HasChanges()) { + await _eventHub.SendMessageAsync(MessageFactory.CoverUpdate, + MessageFactory.CoverUpdateEvent(series.Id, MessageFactoryEntityTypes.Series), false); await _unitOfWork.CommitAsync(); return Ok(); } @@ -245,6 +247,10 @@ namespace API.Controllers if (_unitOfWork.HasChanges()) { await _unitOfWork.CommitAsync(); + await _eventHub.SendMessageAsync(MessageFactory.CoverUpdate, + MessageFactory.CoverUpdateEvent(chapter.VolumeId, MessageFactoryEntityTypes.Volume), false); + await _eventHub.SendMessageAsync(MessageFactory.CoverUpdate, + MessageFactory.CoverUpdateEvent(chapter.Id, MessageFactoryEntityTypes.Chapter), false); return Ok(); } diff --git a/API/Dockerfile b/API/Dockerfile deleted file mode 100644 index ce607a02f..000000000 --- a/API/Dockerfile +++ /dev/null @@ -1,40 +0,0 @@ -#This Dockerfile pulls the latest git commit and builds Kavita from source -FROM mcr.microsoft.com/dotnet/sdk:6.0-focal AS builder - -ENV DEBIAN_FRONTEND=noninteractive -ARG TARGETPLATFORM - -#Installs nodejs and npm -RUN curl -fsSL https://deb.nodesource.com/setup_14.x | bash - \ - && apt-get install -y nodejs \ - && rm -rf /var/lib/apt/lists/* - -#Builds app based on platform -COPY build_target.sh /build_target.sh -RUN /build_target.sh - -#Production image -FROM ubuntu:focal - -#Move the output files to where they need to be -COPY --from=builder /Projects/Kavita/_output/build/Kavita /kavita - -#Installs program dependencies -RUN apt-get update \ - && apt-get install -y libicu-dev libssl1.1 pwgen \ - && rm -rf /var/lib/apt/lists/* - -#Creates the manga storage directory -RUN mkdir /manga /kavita/data - -RUN cp /kavita/appsettings.Development.json /kavita/appsettings.json \ - && sed -i 's/Data source=kavita.db/Data source=data\/kavita.db/g' /kavita/appsettings.json - -COPY entrypoint.sh /entrypoint.sh - -EXPOSE 5000 - -WORKDIR /kavita - -ENTRYPOINT ["/bin/bash"] -CMD ["/entrypoint.sh"] diff --git a/API/Services/CacheService.cs b/API/Services/CacheService.cs index 4dba47fc9..f55d74734 100644 --- a/API/Services/CacheService.cs +++ b/API/Services/CacheService.cs @@ -32,6 +32,7 @@ namespace API.Services string GetCachedEpubFile(int chapterId, Chapter chapter); public void ExtractChapterFiles(string extractPath, IReadOnlyList files); Task CacheBookmarkForSeries(int userId, int seriesId); + void CleanupBookmarkCache(int bookmarkDtoSeriesId); } public class CacheService : ICacheService { @@ -240,5 +241,17 @@ namespace API.Services _directoryService.Flatten(destDirectory); return files.Count; } + + /// + /// Clears a cached bookmarks for a series id folder + /// + /// + public void CleanupBookmarkCache(int seriesId) + { + var destDirectory = _directoryService.FileSystem.Path.Join(_directoryService.CacheDirectory, seriesId + "_bookmarks"); + if (!_directoryService.Exists(destDirectory)) return; + + _directoryService.ClearAndDeleteDirectory(destDirectory); + } } } diff --git a/API/Services/Tasks/CleanupService.cs b/API/Services/Tasks/CleanupService.cs index bbf81c9eb..647c0a066 100644 --- a/API/Services/Tasks/CleanupService.cs +++ b/API/Services/Tasks/CleanupService.cs @@ -182,7 +182,7 @@ namespace API.Services.Tasks /// public Task CleanupBookmarks() { - // This is disabled for now while we test and validate a new method of deleting bookmarks + // TODO: This is disabled for now while we test and validate a new method of deleting bookmarks return Task.CompletedTask; // Search all files in bookmarks/ except bookmark files and delete those // var bookmarkDirectory = diff --git a/API/Services/Tasks/ScannerService.cs b/API/Services/Tasks/ScannerService.cs index 0bd8b458b..4bd37d009 100644 --- a/API/Services/Tasks/ScannerService.cs +++ b/API/Services/Tasks/ScannerService.cs @@ -215,12 +215,12 @@ public class ScannerService : IScannerService // That way logging and UI informing is all in one place with full context _logger.LogError("Some of the root folders for the library are empty. " + "Either your mount has been disconnected or you are trying to delete all series in the library. " + - "Scan will be aborted. " + + "Scan has be aborted. " + "Check that your mount is connected or change the library's root folder and rescan"); await _eventHub.SendMessageAsync(MessageFactory.Error, MessageFactory.ErrorEvent( $"Some of the root folders for the library, {libraryName}, are empty.", "Either your mount has been disconnected or you are trying to delete all series in the library. " + - "Scan will be aborted. " + + "Scan has be aborted. " + "Check that your mount is connected or change the library's root folder and rescan")); return false; diff --git a/Dockerfile b/Dockerfile index 11db76ef8..7233214f6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -29,7 +29,7 @@ EXPOSE 5000 WORKDIR /kavita -HEALTHCHECK --interval=300s --timeout=15s --start-period=30s --retries=3 CMD curl --fail http://localhost:5000 || exit 1 +HEALTHCHECK --interval=30s --timeout=15s --start-period=30s --retries=3 CMD curl --fail http://localhost:5000 || exit 1 ENTRYPOINT [ "/bin/bash" ] CMD ["/entrypoint.sh"] diff --git a/UI/Web/src/app/_services/reading-list.service.ts b/UI/Web/src/app/_services/reading-list.service.ts index e2c5c6104..dae0708b6 100644 --- a/UI/Web/src/app/_services/reading-list.service.ts +++ b/UI/Web/src/app/_services/reading-list.service.ts @@ -2,6 +2,7 @@ import { HttpClient, HttpParams } from '@angular/common/http'; import { Injectable } from '@angular/core'; import { map } from 'rxjs/operators'; import { environment } from 'src/environments/environment'; +import { UtilityService } from '../shared/_services/utility.service'; import { PaginatedResult } from '../_models/pagination'; import { ReadingList, ReadingListItem } from '../_models/reading-list'; import { ActionItem } from './action-factory.service'; @@ -13,7 +14,7 @@ export class ReadingListService { baseUrl = environment.apiUrl; - constructor(private httpClient: HttpClient) { } + constructor(private httpClient: HttpClient, private utilityService: UtilityService) { } getReadingList(readingListId: number) { return this.httpClient.get(this.baseUrl + 'readinglist?readingListId=' + readingListId); @@ -21,11 +22,11 @@ export class ReadingListService { getReadingLists(includePromoted: boolean = true, pageNum?: number, itemsPerPage?: number) { let params = new HttpParams(); - params = this._addPaginationIfExists(params, pageNum, itemsPerPage); + params = this.utilityService.addPaginationIfExists(params, pageNum, itemsPerPage); return this.httpClient.post>(this.baseUrl + 'readinglist/lists?includePromoted=' + includePromoted, {}, {observe: 'response', params}).pipe( map((response: any) => { - return this._cachePaginatedResults(response, new PaginatedResult()); + return this.utilityService.createPaginatedResult(response, new PaginatedResult()); }) ); } @@ -86,29 +87,4 @@ export class ReadingListService { if (readingList?.promoted && !isAdmin) return false; return true; } - - _addPaginationIfExists(params: HttpParams, pageNum?: number, itemsPerPage?: number) { - // TODO: Move to utility service - if (pageNum !== null && pageNum !== undefined && itemsPerPage !== null && itemsPerPage !== undefined) { - params = params.append('pageNumber', pageNum + ''); - params = params.append('pageSize', itemsPerPage + ''); - } - return params; - } - - _cachePaginatedResults(response: any, paginatedVariable: PaginatedResult) { - // TODO: Move to utility service - if (response.body === null) { - paginatedVariable.result = []; - } else { - paginatedVariable.result = response.body; - } - - const pageHeader = response.headers.get('Pagination'); - if (pageHeader !== null) { - paginatedVariable.pagination = JSON.parse(pageHeader); - } - - return paginatedVariable; - } } diff --git a/UI/Web/src/app/_services/toggle.service.ts b/UI/Web/src/app/_services/toggle.service.ts index 5b9e90bd4..8b335394a 100644 --- a/UI/Web/src/app/_services/toggle.service.ts +++ b/UI/Web/src/app/_services/toggle.service.ts @@ -18,6 +18,7 @@ export class ToggleService { .pipe(filter(event => event instanceof NavigationStart)) .subscribe((event) => { this.toggleState = false; + this.toggleStateSource.next(this.toggleState); }); this.toggleStateSource.next(false); } @@ -26,7 +27,6 @@ export class ToggleService { this.toggleState = !this.toggleState; this.toggleStateSource.pipe(take(1)).subscribe(state => { this.toggleState = !state; - console.log('Toggle: ', this.toggleState) this.toggleStateSource.next(this.toggleState); }); diff --git a/UI/Web/src/app/book-reader/_models/book-black-theme.ts b/UI/Web/src/app/book-reader/_models/book-black-theme.ts index 1e89b49cf..cc588fb76 100644 --- a/UI/Web/src/app/book-reader/_models/book-black-theme.ts +++ b/UI/Web/src/app/book-reader/_models/book-black-theme.ts @@ -47,6 +47,15 @@ export const BookBlackTheme = ` --btn-disabled-text-color: white; --btn-disabled-border-color: #6c757d; + /* Inputs */ + --input-bg-color: #343a40; + --input-bg-readonly-color: #434648; + --input-focused-border-color: #ccc; + --input-text-color: #fff; + --input-placeholder-color: #aeaeae; + --input-border-color: #ccc; + --input-focus-boxshadow-color: rgb(255 255 255 / 50%); + /* Nav (Tabs) */ --nav-tab-border-color: rgba(44, 118, 88, 0.7); --nav-tab-text-color: var(--body-text-color); diff --git a/UI/Web/src/app/book-reader/reader-settings/reader-settings.component.html b/UI/Web/src/app/book-reader/reader-settings/reader-settings.component.html index d36c4bfcd..0de05a19b 100644 --- a/UI/Web/src/app/book-reader/reader-settings/reader-settings.component.html +++ b/UI/Web/src/app/book-reader/reader-settings/reader-settings.component.html @@ -94,7 +94,8 @@
- + Put reader in fullscreen mode