mirror of
https://github.com/Kareadita/Kavita.git
synced 2025-05-31 04:04:19 -04:00
* Started with the redesign of the cover image chooser redesign to be less click intensive for volume/chapter images. Made some headings bold in card detail drawer. * Tweaked the styles * Moved where the info cards show * Added an ability to open a page settings drawer * Cleaned up some old code that isn't needed anymore. * Started implementing a list view. Refactored some title code to a dedicated component * List view implemented but way too many API calls. Either need caching or adjusting the SeriesDetail api. * Fixed a bug where if the progress bar didn't render on a card item while a download was in progress, the download indicator would be removed. * Large refactor to move a lot of the needed fields to the chapter and volume dtos for series detail. All fields are noted when only used in series detail. * Implemented cards for other tabs (except related) * Fixed the unit test which needed a mocked reader service call. * More cleanup around age rating and removing old code from the refactor. Commented out sorting till i feel motivated to work on that. * Some cleanup and restored cards as initial layout. Time to test this out and see if there is value add. * Added ability for Chapters tab to show the volume chapters belong to (if applicable) * Adding style fixes * Cover image updates, don't allow the first image (which is what is currently set) to respond to cover changes. Hide the ID field on list item for series detail. * Refactored the title for list item to be injectable * Cleaned up the selection code to make it less finicky on mobile when tap scrolling. * Refactored chapter tab to show volume as well on list view. * Ensure word count shows for Volumes * Started adding virtual scrolling, pushing up so Robbie can mess around * Started adding virtual scrolling, pushing up so Robbie can mess around * Fixed a bug where all chapters would come under specials * Show title data as accent if set. * Style fixes for virtual scroller * Restyling scroll * Implemented a way to show storyline with virtual scrolling * Show Word Count for chapters and cleaned up some logics. * I might have card layout working with virtual scroll code. * Some cleanup to hide more system like properties from info bar on series detail page. Fixed some missing time estimate info on storyline chapters. * Fixed a regression on series service when I integrated VolumeTitle. * Refactored read time to the backend. Added WordCount to the volume itself so we don't need to calculate on frontend. When asking to analyze files from a series, force the calculation. * Fixed SeriesDetail api code * Fixed up the code in the drawer to better update list/card mode * Basic infinite scroll implemented, however due to how we are updating the list to render, we are re-rending cards that haven't been touched. * Updated how we render and layout data for infinite scroll on library detail. It's almost there. * Started laying foundation for loading pages backwards. Removed lazy loading of images since we are now using virtual paging. * Hooked in some basic code to allow user to load a prev page with infinite scroll. * Fixed up series detail api and undid the non-lazy loaded images. Changed the router to help with this infinite loading on Firefox issue. * Fixed up some naming issues with Series Detail and added a new test. * This is an infinite scroll without pagination implementation. It is not fully done, but off to a good start. Virtual scroller with jump bar is working pretty well, def needs more polishing and tweaking. There are hacks in this implementation that need to be revisited. * Refactored code so that we don't use any pagination and load all results by default. * Misc code cleanup from build warnings. * Cleaned up some logic for how to display titles in list view. * More title cleanup for specials * Hooked up page layout to user preferences and renamed an existing user pref name to match the dto. * Swapped out everything but storyline with virtual-scroller over CDK * Removed CDK from series detail. * Default value for migration on page layout * Updating card layout for library detail page * fixing height for mobile * Moved scrollbar * Tweaked some styling for layouts when there is no data * Refactored the series cards into their own component to make it re-usable. * More tweaks on series info cards layout and enhanced a few pages with trackby functions. * Removed some dead code * Added download on series detail to actionables to fit in with new scroll strategy. * Fixed language not being updated and sent to the backend for series update. * Fixed a bad migration (if you ran any prior migration in this branch, you need to undo before you use this commit) * Adding sticky tabs * fixed mobile gap on sticky tab * Enhanced the card title for books to show number up front. * Adjusted the gutters on admin dashboard * Removed debug code * Removing duplicate book title * Cleaned up old references to cdk scroller * Implemented a basic jump bar scaling algorithm. Not perfect, but works pretty well. * Code smells Co-authored-by: Robbie Davis <robbie@therobbiedavis.com>
106 lines
4.7 KiB
C#
106 lines
4.7 KiB
C#
using System;
|
|
using System.Linq;
|
|
using System.Threading.Tasks;
|
|
using API.Comparators;
|
|
using API.Entities.Enums;
|
|
using API.Services;
|
|
using Microsoft.Extensions.Logging;
|
|
|
|
namespace API.Data;
|
|
|
|
/// <summary>
|
|
/// Responsible to migrate existing bookmarks to files. Introduced in v0.4.9.27
|
|
/// </summary>
|
|
public static class MigrateBookmarks
|
|
{
|
|
/// <summary>
|
|
/// This will migrate existing bookmarks to bookmark folder based.
|
|
/// If the bookmarks folder already exists, this will not run.
|
|
/// </summary>
|
|
/// <remarks>Bookmark directory is configurable. This will always use the default bookmark directory.</remarks>
|
|
/// <param name="directoryService"></param>
|
|
/// <param name="unitOfWork"></param>
|
|
/// <param name="logger"></param>
|
|
/// <param name="cacheService"></param>
|
|
/// <returns></returns>
|
|
public static async Task Migrate(IDirectoryService directoryService, IUnitOfWork unitOfWork,
|
|
ILogger<Program> logger, ICacheService cacheService)
|
|
{
|
|
var bookmarkDirectory = (await unitOfWork.SettingsRepository.GetSettingAsync(ServerSettingKey.BookmarkDirectory))
|
|
.Value;
|
|
if (string.IsNullOrEmpty(bookmarkDirectory))
|
|
{
|
|
bookmarkDirectory = directoryService.BookmarkDirectory;
|
|
}
|
|
|
|
if (directoryService.Exists(bookmarkDirectory)) return;
|
|
|
|
logger.LogInformation("Bookmark migration is needed....This may take some time");
|
|
|
|
var allBookmarks = (await unitOfWork.UserRepository.GetAllBookmarksAsync()).ToList();
|
|
|
|
var uniqueChapterIds = allBookmarks.Select(b => b.ChapterId).Distinct().ToList();
|
|
var uniqueUserIds = allBookmarks.Select(b => b.AppUserId).Distinct().ToList();
|
|
foreach (var userId in uniqueUserIds)
|
|
{
|
|
foreach (var chapterId in uniqueChapterIds)
|
|
{
|
|
var chapterBookmarks = allBookmarks.Where(b => b.ChapterId == chapterId).ToList();
|
|
var chapterPages = chapterBookmarks
|
|
.Select(b => b.Page).ToList();
|
|
var seriesId = chapterBookmarks
|
|
.Select(b => b.SeriesId).First();
|
|
var mangaFiles = await unitOfWork.ChapterRepository.GetFilesForChapterAsync(chapterId);
|
|
var chapterExtractPath = directoryService.FileSystem.Path.Join(directoryService.TempDirectory, $"bookmark_c{chapterId}_u{userId}_s{seriesId}");
|
|
|
|
var numericComparer = new NumericComparer();
|
|
if (!mangaFiles.Any()) continue;
|
|
|
|
switch (mangaFiles.First().Format)
|
|
{
|
|
case MangaFormat.Image:
|
|
directoryService.ExistOrCreate(chapterExtractPath);
|
|
directoryService.CopyFilesToDirectory(mangaFiles.Select(f => f.FilePath), chapterExtractPath);
|
|
break;
|
|
case MangaFormat.Archive:
|
|
case MangaFormat.Pdf:
|
|
cacheService.ExtractChapterFiles(chapterExtractPath, mangaFiles.ToList());
|
|
break;
|
|
case MangaFormat.Epub:
|
|
continue;
|
|
default:
|
|
continue;
|
|
}
|
|
|
|
var files = directoryService.GetFilesWithExtension(chapterExtractPath, Parser.Parser.ImageFileExtensions);
|
|
// Filter out images that aren't in bookmarks
|
|
Array.Sort(files, numericComparer);
|
|
foreach (var chapterPage in chapterPages)
|
|
{
|
|
var file = files.ElementAt(chapterPage);
|
|
var bookmark = allBookmarks.FirstOrDefault(b =>
|
|
b.ChapterId == chapterId && b.SeriesId == seriesId && b.AppUserId == userId &&
|
|
b.Page == chapterPage);
|
|
if (bookmark == null) continue;
|
|
|
|
var filename = directoryService.FileSystem.Path.GetFileName(file);
|
|
var newLocation = directoryService.FileSystem.Path.Join(
|
|
ReaderService.FormatBookmarkFolderPath(String.Empty, userId, seriesId, chapterId),
|
|
filename);
|
|
bookmark.FileName = newLocation;
|
|
directoryService.CopyFileToDirectory(file,
|
|
ReaderService.FormatBookmarkFolderPath(bookmarkDirectory, userId, seriesId, chapterId));
|
|
unitOfWork.UserRepository.Update(bookmark);
|
|
}
|
|
}
|
|
// Clear temp after each user to avoid too much space being eaten
|
|
directoryService.ClearDirectory(directoryService.TempDirectory);
|
|
}
|
|
|
|
await unitOfWork.CommitAsync();
|
|
// Run CleanupService as we cache a ton of files
|
|
directoryService.ClearDirectory(directoryService.TempDirectory);
|
|
|
|
}
|
|
}
|