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>
183 lines
8.3 KiB
C#
183 lines
8.3 KiB
C#
using System;
|
|
using System.IO;
|
|
using System.Linq;
|
|
using System.Threading.Tasks;
|
|
using API.Comparators;
|
|
using API.Helpers;
|
|
using API.Services;
|
|
using Microsoft.EntityFrameworkCore;
|
|
|
|
namespace API.Data
|
|
{
|
|
/// <summary>
|
|
/// A data structure to migrate Cover Images from byte[] to files.
|
|
/// </summary>
|
|
internal class CoverMigration
|
|
{
|
|
public string Id { get; set; }
|
|
public byte[] CoverImage { get; set; }
|
|
public string ParentId { get; set; }
|
|
}
|
|
|
|
/// <summary>
|
|
/// In v0.4.6, Cover Images were migrated from byte[] in the DB to external files. This migration handles that work.
|
|
/// </summary>
|
|
public static class MigrateCoverImages
|
|
{
|
|
private static readonly ChapterSortComparerZeroFirst ChapterSortComparerForInChapterSorting = new ();
|
|
|
|
/// <summary>
|
|
/// Run first. Will extract byte[]s from DB and write them to the cover directory.
|
|
/// </summary>
|
|
public static void ExtractToImages(DbContext context, IDirectoryService directoryService, IImageService imageService)
|
|
{
|
|
Console.WriteLine("Migrating Cover Images to disk. Expect delay.");
|
|
directoryService.ExistOrCreate(directoryService.CoverImageDirectory);
|
|
|
|
Console.WriteLine("Extracting cover images for Series");
|
|
var lockedSeries = SqlHelper.RawSqlQuery(context, "Select Id, CoverImage From Series Where CoverImage IS NOT NULL", x =>
|
|
new CoverMigration()
|
|
{
|
|
Id = x[0] + string.Empty,
|
|
CoverImage = (byte[]) x[1],
|
|
ParentId = "0"
|
|
});
|
|
foreach (var series in lockedSeries)
|
|
{
|
|
if (series.CoverImage == null || !series.CoverImage.Any()) continue;
|
|
if (File.Exists(directoryService.FileSystem.Path.Join(directoryService.CoverImageDirectory,
|
|
$"{ImageService.GetSeriesFormat(int.Parse(series.Id))}.png"))) continue;
|
|
|
|
try
|
|
{
|
|
var stream = new MemoryStream(series.CoverImage);
|
|
stream.Position = 0;
|
|
imageService.WriteCoverThumbnail(stream, ImageService.GetSeriesFormat(int.Parse(series.Id)), directoryService.CoverImageDirectory);
|
|
}
|
|
catch (Exception e)
|
|
{
|
|
Console.WriteLine(e);
|
|
}
|
|
}
|
|
|
|
Console.WriteLine("Extracting cover images for Chapters");
|
|
var chapters = SqlHelper.RawSqlQuery(context, "Select Id, CoverImage, VolumeId From Chapter Where CoverImage IS NOT NULL;", x =>
|
|
new CoverMigration()
|
|
{
|
|
Id = x[0] + string.Empty,
|
|
CoverImage = (byte[]) x[1],
|
|
ParentId = x[2] + string.Empty
|
|
});
|
|
foreach (var chapter in chapters)
|
|
{
|
|
if (chapter.CoverImage == null || !chapter.CoverImage.Any()) continue;
|
|
if (directoryService.FileSystem.File.Exists(directoryService.FileSystem.Path.Join(directoryService.CoverImageDirectory,
|
|
$"{ImageService.GetChapterFormat(int.Parse(chapter.Id), int.Parse(chapter.ParentId))}.png"))) continue;
|
|
|
|
try
|
|
{
|
|
var stream = new MemoryStream(chapter.CoverImage);
|
|
stream.Position = 0;
|
|
imageService.WriteCoverThumbnail(stream, $"{ImageService.GetChapterFormat(int.Parse(chapter.Id), int.Parse(chapter.ParentId))}", directoryService.CoverImageDirectory);
|
|
}
|
|
catch (Exception e)
|
|
{
|
|
Console.WriteLine(e);
|
|
}
|
|
}
|
|
|
|
Console.WriteLine("Extracting cover images for Collection Tags");
|
|
var tags = SqlHelper.RawSqlQuery(context, "Select Id, CoverImage From CollectionTag Where CoverImage IS NOT NULL;", x =>
|
|
new CoverMigration()
|
|
{
|
|
Id = x[0] + string.Empty,
|
|
CoverImage = (byte[]) x[1] ,
|
|
ParentId = "0"
|
|
});
|
|
foreach (var tag in tags)
|
|
{
|
|
if (tag.CoverImage == null || !tag.CoverImage.Any()) continue;
|
|
if (directoryService.FileSystem.File.Exists(Path.Join(directoryService.CoverImageDirectory,
|
|
$"{ImageService.GetCollectionTagFormat(int.Parse(tag.Id))}.png"))) continue;
|
|
try
|
|
{
|
|
var stream = new MemoryStream(tag.CoverImage);
|
|
stream.Position = 0;
|
|
imageService.WriteCoverThumbnail(stream, $"{ImageService.GetCollectionTagFormat(int.Parse(tag.Id))}", directoryService.CoverImageDirectory);
|
|
}
|
|
catch (Exception e)
|
|
{
|
|
Console.WriteLine(e);
|
|
}
|
|
}
|
|
}
|
|
|
|
/// <summary>
|
|
/// Run after <see cref="ExtractToImages"/>. Will update the DB with names of files that were extracted.
|
|
/// </summary>
|
|
/// <param name="context"></param>
|
|
public static async Task UpdateDatabaseWithImages(DataContext context, IDirectoryService directoryService)
|
|
{
|
|
Console.WriteLine("Updating Series entities");
|
|
var seriesCovers = await context.Series.Where(s => !string.IsNullOrEmpty(s.CoverImage)).ToListAsync();
|
|
foreach (var series in seriesCovers)
|
|
{
|
|
if (!directoryService.FileSystem.File.Exists(directoryService.FileSystem.Path.Join(directoryService.CoverImageDirectory,
|
|
$"{ImageService.GetSeriesFormat(series.Id)}.png"))) continue;
|
|
series.CoverImage = $"{ImageService.GetSeriesFormat(series.Id)}.png";
|
|
}
|
|
|
|
await context.SaveChangesAsync();
|
|
|
|
Console.WriteLine("Updating Chapter entities");
|
|
var chapters = await context.Chapter.ToListAsync();
|
|
// ReSharper disable once ForeachCanBePartlyConvertedToQueryUsingAnotherGetEnumerator
|
|
foreach (var chapter in chapters)
|
|
{
|
|
if (directoryService.FileSystem.File.Exists(directoryService.FileSystem.Path.Join(directoryService.CoverImageDirectory,
|
|
$"{ImageService.GetChapterFormat(chapter.Id, chapter.VolumeId)}.png")))
|
|
{
|
|
chapter.CoverImage = $"{ImageService.GetChapterFormat(chapter.Id, chapter.VolumeId)}.png";
|
|
}
|
|
|
|
}
|
|
|
|
await context.SaveChangesAsync();
|
|
|
|
Console.WriteLine("Updating Volume entities");
|
|
var volumes = await context.Volume.Include(v => v.Chapters).ToListAsync();
|
|
foreach (var volume in volumes)
|
|
{
|
|
var firstChapter = volume.Chapters.MinBy(x => double.Parse(x.Number), ChapterSortComparerForInChapterSorting);
|
|
if (firstChapter == null) continue;
|
|
if (directoryService.FileSystem.File.Exists(directoryService.FileSystem.Path.Join(directoryService.CoverImageDirectory,
|
|
$"{ImageService.GetChapterFormat(firstChapter.Id, firstChapter.VolumeId)}.png")))
|
|
{
|
|
volume.CoverImage = $"{ImageService.GetChapterFormat(firstChapter.Id, firstChapter.VolumeId)}.png";
|
|
}
|
|
|
|
}
|
|
|
|
await context.SaveChangesAsync();
|
|
|
|
Console.WriteLine("Updating Collection Tag entities");
|
|
var tags = await context.CollectionTag.ToListAsync();
|
|
// ReSharper disable once ForeachCanBePartlyConvertedToQueryUsingAnotherGetEnumerator
|
|
foreach (var tag in tags)
|
|
{
|
|
if (directoryService.FileSystem.File.Exists(directoryService.FileSystem.Path.Join(directoryService.CoverImageDirectory,
|
|
$"{ImageService.GetCollectionTagFormat(tag.Id)}.png")))
|
|
{
|
|
tag.CoverImage = $"{ImageService.GetCollectionTagFormat(tag.Id)}.png";
|
|
}
|
|
|
|
}
|
|
|
|
await context.SaveChangesAsync();
|
|
|
|
Console.WriteLine("Cover Image Migration completed");
|
|
}
|
|
|
|
}
|
|
}
|