mirror of
https://github.com/Kareadita/Kavita.git
synced 2025-05-24 00:52:23 -04:00
* Started designing the backend localization service * Worked in Transloco for initial PoC * Worked in Transloco for initial PoC * Translated the login screen * translated dashboard screen * Started work on the backend * Fixed a logic bug * translated edit-user screen * Hooked up the backend for having a locale property. * Hooked up the ability to view the available locales and switch to them. * Made the localization service languages be derived from what's in langs/ directory. * Fixed up localization switching * Switched when we check for a license on UI bootstrap * Tweaked some code * Fixed the bug where dashboard wasn't loading and made it so language switching is working. * Fixed a bug on dashboard with languagePath * Converted user-scrobble-history.component.html * Converted spoiler.component.html * Converted review-series-modal.component.html * Converted review-card-modal.component.html * Updated the readme * Translated using Weblate (English) Currently translated at 100.0% (54 of 54 strings) Translation: Kavita/ui Translate-URL: https://hosted.weblate.org/projects/kavita/ui/en/ * Converted review-card.component.html * Deleted dead component * Converted want-to-read.component.html * Added translation using Weblate (Korean) * Translated using Weblate (Spanish) Currently translated at 40.7% (22 of 54 strings) Translation: Kavita/ui Translate-URL: https://hosted.weblate.org/projects/kavita/ui/es/ * Translated using Weblate (Korean) Currently translated at 62.9% (34 of 54 strings) Translation: Kavita/ui Translate-URL: https://hosted.weblate.org/projects/kavita/ui/ko/ * Converted user-preferences.component.html * Translated using Weblate (Korean) Currently translated at 92.5% (50 of 54 strings) Translation: Kavita/ui Translate-URL: https://hosted.weblate.org/projects/kavita/ui/ko/ * Converted user-holds.component.html * Converted theme-manager.component.html * Converted restriction-selector.component.html * Converted manage-devices.component.html * Converted edit-device.component.html * Converted change-password.component.html * Converted change-email.component.html * Converted change-age-restriction.component.html * Converted api-key.component.html * Converted anilist-key.component.html * Converted typeahead.component.html * Converted user-stats-info-cards.component.html * Converted user-stats.component.html * Converted top-readers.component.html * Converted some pipes and ensure translation is loaded before the app. * Finished all but one pipe for localization * Converted directory-picker.component.html * Converted library-access-modal.component.html * Converted a few components * Converted a few components * Converted a few components * Converted a few components * Converted a few components * Merged weblate in * ... -> … update * Updated the readme * Updateded all fonts to be woff2 * Cleaned up some strings to increase re-use * Removed an old flow (that doesn't exist in backend any longer) from when we introduced emails on Kavita. * Converted Series detail * Lots more converted * Lots more converted & hooked up the ability to flatten during prod build the language files. * Lots more converted * Lots more converted & fixed a bunch of broken pipes due to inject() * Lots more converted * Lots more converted * Lots more converted & fixed some bad keys * Lots more converted * Fixed some bugs with admin dasbhoard nested tabs not rendering on first load due to not using onpush change detection * Fixed up some localization errors and fixed forgot password error when the user doesn't have change password permission * Fixed a stupid build issue again * Started adding errors for interceptor and backend. * Finished off manga-reader * More translations * Few fixes * Fixed a bug where character tag badges weren't showing the name on chapter info * All components are translated * All toasts are translated * All confirm/alerts are translated * Trying something new for the backend * Migrated the localization strings for the backend into a new file. * Updated the localization service to be able to do backend localization with fallback to english. * Cleaned up some external reviews code to reduce looping * Localized AccountController.cs * 60% done with controllers * All controllers are done * All KavitaExceptions are covered * Some shakeout fixes * Prep for initial merge * Everything is done except options and basic shakeout proves response times are good. Unit tests are broken. * Fixed up the unit tests * All unit tests are now working * Removed some quantifier * I'm not sure I can support localization for some Volume/Chapter/Book strings within the codebase. --------- Co-authored-by: Robbie Davis <robbie@therobbiedavis.com> Co-authored-by: majora2007 <kavitareader@gmail.com> Co-authored-by: expertjun <jtrobin@naver.com> Co-authored-by: ThePromidius <thepromidiusyt@gmail.com>
210 lines
8.1 KiB
C#
210 lines
8.1 KiB
C#
using System;
|
|
using System.Collections.Generic;
|
|
using System.Linq;
|
|
using System.Threading.Tasks;
|
|
using API.Data.ManualMigrations;
|
|
using API.DTOs;
|
|
using API.Entities;
|
|
using API.Entities.Enums;
|
|
using API.Services.Tasks.Scanner.Parser;
|
|
using AutoMapper;
|
|
using AutoMapper.QueryableExtensions;
|
|
using Microsoft.EntityFrameworkCore;
|
|
|
|
namespace API.Data.Repositories;
|
|
#nullable enable
|
|
public interface IAppUserProgressRepository
|
|
{
|
|
void Update(AppUserProgress userProgress);
|
|
Task<int> CleanupAbandonedChapters();
|
|
Task<bool> UserHasProgress(LibraryType libraryType, int userId);
|
|
Task<AppUserProgress?> GetUserProgressAsync(int chapterId, int userId);
|
|
Task<bool> HasAnyProgressOnSeriesAsync(int seriesId, int userId);
|
|
/// <summary>
|
|
/// This is built exclusively for <see cref="MigrateUserProgressLibraryId"/>
|
|
/// </summary>
|
|
/// <returns></returns>
|
|
Task<AppUserProgress?> GetAnyProgress();
|
|
Task<IEnumerable<AppUserProgress>> GetUserProgressForSeriesAsync(int seriesId, int userId);
|
|
Task<IEnumerable<AppUserProgress>> GetAllProgress();
|
|
Task<DateTime> GetLatestProgress();
|
|
Task<ProgressDto?> GetUserProgressDtoAsync(int chapterId, int userId);
|
|
Task<bool> AnyUserProgressForSeriesAsync(int seriesId, int userId);
|
|
Task<int> GetHighestFullyReadChapterForSeries(int seriesId, int userId);
|
|
Task<int> GetHighestFullyReadVolumeForSeries(int seriesId, int userId);
|
|
Task<DateTime?> GetLatestProgressForSeries(int seriesId, int userId);
|
|
Task<DateTime?> GetFirstProgressForSeries(int seriesId, int userId);
|
|
}
|
|
#nullable disable
|
|
public class AppUserProgressRepository : IAppUserProgressRepository
|
|
{
|
|
private readonly DataContext _context;
|
|
private readonly IMapper _mapper;
|
|
|
|
public AppUserProgressRepository(DataContext context, IMapper mapper)
|
|
{
|
|
_context = context;
|
|
_mapper = mapper;
|
|
}
|
|
|
|
public void Update(AppUserProgress userProgress)
|
|
{
|
|
_context.Entry(userProgress).State = EntityState.Modified;
|
|
}
|
|
|
|
/// <summary>
|
|
/// This will remove any entries that have chapterIds that no longer exists. This will execute the save as well.
|
|
/// </summary>
|
|
public async Task<int> CleanupAbandonedChapters()
|
|
{
|
|
var chapterIds = _context.Chapter.Select(c => c.Id);
|
|
|
|
var rowsToRemove = await _context.AppUserProgresses
|
|
.Where(progress => !chapterIds.Contains(progress.ChapterId))
|
|
.ToListAsync();
|
|
|
|
var rowsToRemoveBookmarks = await _context.AppUserBookmark
|
|
.Where(progress => !chapterIds.Contains(progress.ChapterId))
|
|
.ToListAsync();
|
|
|
|
var rowsToRemoveReadingLists = await _context.ReadingListItem
|
|
.Where(item => !chapterIds.Contains(item.ChapterId))
|
|
.ToListAsync();
|
|
|
|
_context.RemoveRange(rowsToRemove);
|
|
_context.RemoveRange(rowsToRemoveBookmarks);
|
|
_context.RemoveRange(rowsToRemoveReadingLists);
|
|
return await _context.SaveChangesAsync() > 0 ? rowsToRemove.Count : 0;
|
|
}
|
|
|
|
/// <summary>
|
|
/// Checks if user has any progress against a library of passed type
|
|
/// </summary>
|
|
/// <param name="libraryType"></param>
|
|
/// <param name="userId"></param>
|
|
/// <returns></returns>
|
|
public async Task<bool> UserHasProgress(LibraryType libraryType, int userId)
|
|
{
|
|
var seriesIds = await _context.AppUserProgresses
|
|
.Where(aup => aup.PagesRead > 0 && aup.AppUserId == userId)
|
|
.AsNoTracking()
|
|
.Select(aup => aup.SeriesId)
|
|
.ToListAsync();
|
|
|
|
if (seriesIds.Count == 0) return false;
|
|
|
|
return await _context.Series
|
|
.Include(s => s.Library)
|
|
.Where(s => seriesIds.Contains(s.Id) && s.Library.Type == libraryType)
|
|
.AsNoTracking()
|
|
.AnyAsync();
|
|
}
|
|
|
|
public async Task<bool> HasAnyProgressOnSeriesAsync(int seriesId, int userId)
|
|
{
|
|
return await _context.AppUserProgresses
|
|
.AnyAsync(aup => aup.PagesRead > 0 && aup.AppUserId == userId && aup.SeriesId == seriesId);
|
|
}
|
|
|
|
#nullable enable
|
|
public async Task<AppUserProgress?> GetAnyProgress()
|
|
{
|
|
return await _context.AppUserProgresses.FirstOrDefaultAsync();
|
|
}
|
|
#nullable disable
|
|
|
|
/// <summary>
|
|
/// This will return any user progress. This filters out progress rows that have no pages read.
|
|
/// </summary>
|
|
/// <param name="seriesId"></param>
|
|
/// <param name="userId"></param>
|
|
/// <returns></returns>
|
|
public async Task<IEnumerable<AppUserProgress>> GetUserProgressForSeriesAsync(int seriesId, int userId)
|
|
{
|
|
return await _context.AppUserProgresses
|
|
.Where(p => p.SeriesId == seriesId && p.AppUserId == userId && p.PagesRead > 0)
|
|
.ToListAsync();
|
|
}
|
|
|
|
public async Task<IEnumerable<AppUserProgress>> GetAllProgress()
|
|
{
|
|
return await _context.AppUserProgresses.ToListAsync();
|
|
}
|
|
|
|
/// <summary>
|
|
/// Returns the latest progress in UTC
|
|
/// </summary>
|
|
/// <returns></returns>
|
|
public async Task<DateTime> GetLatestProgress()
|
|
{
|
|
return await _context.AppUserProgresses
|
|
.Select(d => d.LastModifiedUtc)
|
|
.OrderByDescending(d => d)
|
|
.FirstOrDefaultAsync();
|
|
}
|
|
|
|
public async Task<ProgressDto?> GetUserProgressDtoAsync(int chapterId, int userId)
|
|
{
|
|
return await _context.AppUserProgresses
|
|
.Where(p => p.AppUserId == userId && p.ChapterId == chapterId)
|
|
.ProjectTo<ProgressDto>(_mapper.ConfigurationProvider)
|
|
.FirstOrDefaultAsync();
|
|
}
|
|
|
|
public async Task<bool> AnyUserProgressForSeriesAsync(int seriesId, int userId)
|
|
{
|
|
return await _context.AppUserProgresses
|
|
.Where(p => p.SeriesId == seriesId && p.AppUserId == userId && p.PagesRead > 0)
|
|
.AnyAsync();
|
|
}
|
|
|
|
public async Task<int> GetHighestFullyReadChapterForSeries(int seriesId, int userId)
|
|
{
|
|
var list = await _context.AppUserProgresses
|
|
.Join(_context.Chapter, appUserProgresses => appUserProgresses.ChapterId, chapter => chapter.Id,
|
|
(appUserProgresses, chapter) => new {appUserProgresses, chapter})
|
|
.Where(p => p.appUserProgresses.SeriesId == seriesId && p.appUserProgresses.AppUserId == userId &&
|
|
p.appUserProgresses.PagesRead >= p.chapter.Pages)
|
|
.Select(p => p.chapter.Range)
|
|
.ToListAsync();
|
|
return list.Count == 0 ? 0 : list.DefaultIfEmpty().Where(d => d != null).Max(d => (int) Math.Floor(Parser.MaxNumberFromRange(d)));
|
|
}
|
|
|
|
public async Task<int> GetHighestFullyReadVolumeForSeries(int seriesId, int userId)
|
|
{
|
|
var list = await _context.AppUserProgresses
|
|
.Join(_context.Chapter, appUserProgresses => appUserProgresses.ChapterId, chapter => chapter.Id,
|
|
(appUserProgresses, chapter) => new {appUserProgresses, chapter})
|
|
.Where(p => p.appUserProgresses.SeriesId == seriesId && p.appUserProgresses.AppUserId == userId &&
|
|
p.appUserProgresses.PagesRead >= p.chapter.Pages)
|
|
.Select(p => p.chapter.Volume.Number)
|
|
.ToListAsync();
|
|
return list.Count == 0 ? 0 : list.DefaultIfEmpty().Max();
|
|
}
|
|
|
|
public async Task<DateTime?> GetLatestProgressForSeries(int seriesId, int userId)
|
|
{
|
|
var list = await _context.AppUserProgresses.Where(p => p.AppUserId == userId && p.SeriesId == seriesId)
|
|
.Select(p => p.LastModifiedUtc)
|
|
.ToListAsync();
|
|
return list.Count == 0 ? null : list.DefaultIfEmpty().Max();
|
|
}
|
|
|
|
public async Task<DateTime?> GetFirstProgressForSeries(int seriesId, int userId)
|
|
{
|
|
var list = await _context.AppUserProgresses.Where(p => p.AppUserId == userId && p.SeriesId == seriesId)
|
|
.Select(p => p.LastModifiedUtc)
|
|
.ToListAsync();
|
|
return list.Count == 0 ? null : list.DefaultIfEmpty().Min();
|
|
}
|
|
|
|
#nullable enable
|
|
public async Task<AppUserProgress?> GetUserProgressAsync(int chapterId, int userId)
|
|
{
|
|
return await _context.AppUserProgresses
|
|
.Where(p => p.ChapterId == chapterId && p.AppUserId == userId)
|
|
.FirstOrDefaultAsync();
|
|
}
|
|
#nullable disable
|
|
}
|