mirror of
https://github.com/Kareadita/Kavita.git
synced 2025-06-23 15:30:34 -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>
172 lines
6.4 KiB
C#
172 lines
6.4 KiB
C#
using System;
|
|
using System.Linq;
|
|
using System.Threading.Tasks;
|
|
using API.Data;
|
|
using API.Entities;
|
|
using API.Entities.Enums.Theme;
|
|
using API.Extensions;
|
|
using API.SignalR;
|
|
using Kavita.Common;
|
|
using Microsoft.AspNetCore.Authorization;
|
|
|
|
namespace API.Services.Tasks;
|
|
|
|
public interface IThemeService
|
|
{
|
|
Task<string> GetContent(int themeId);
|
|
Task Scan();
|
|
Task UpdateDefault(int themeId);
|
|
}
|
|
|
|
public class ThemeService : IThemeService
|
|
{
|
|
private readonly IDirectoryService _directoryService;
|
|
private readonly IUnitOfWork _unitOfWork;
|
|
private readonly IEventHub _eventHub;
|
|
|
|
public ThemeService(IDirectoryService directoryService, IUnitOfWork unitOfWork, IEventHub eventHub)
|
|
{
|
|
_directoryService = directoryService;
|
|
_unitOfWork = unitOfWork;
|
|
_eventHub = eventHub;
|
|
}
|
|
|
|
/// <summary>
|
|
/// Given a themeId, return the content inside that file
|
|
/// </summary>
|
|
/// <param name="themeId"></param>
|
|
/// <returns></returns>
|
|
[AllowAnonymous]
|
|
public async Task<string> GetContent(int themeId)
|
|
{
|
|
var theme = await _unitOfWork.SiteThemeRepository.GetThemeDto(themeId);
|
|
if (theme == null) throw new KavitaException("theme-doesnt-exist");
|
|
var themeFile = _directoryService.FileSystem.Path.Join(_directoryService.SiteThemeDirectory, theme.FileName);
|
|
if (string.IsNullOrEmpty(themeFile) || !_directoryService.FileSystem.File.Exists(themeFile))
|
|
throw new KavitaException("theme-doesnt-exist");
|
|
|
|
return await _directoryService.FileSystem.File.ReadAllTextAsync(themeFile);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Scans the site theme directory for custom css files and updates what the system has on store
|
|
/// </summary>
|
|
public async Task Scan()
|
|
{
|
|
_directoryService.ExistOrCreate(_directoryService.SiteThemeDirectory);
|
|
var reservedNames = Seed.DefaultThemes.Select(t => t.NormalizedName).ToList();
|
|
var themeFiles = _directoryService
|
|
.GetFilesWithExtension(Scanner.Parser.Parser.NormalizePath(_directoryService.SiteThemeDirectory), @"\.css")
|
|
.Where(name => !reservedNames.Contains(name.ToNormalized())).ToList();
|
|
|
|
var allThemes = (await _unitOfWork.SiteThemeRepository.GetThemes()).ToList();
|
|
|
|
// First remove any files from allThemes that are User Defined and not on disk
|
|
var userThemes = allThemes.Where(t => t.Provider == ThemeProvider.User).ToList();
|
|
foreach (var userTheme in userThemes)
|
|
{
|
|
var filepath = Scanner.Parser.Parser.NormalizePath(
|
|
_directoryService.FileSystem.Path.Join(_directoryService.SiteThemeDirectory, userTheme.FileName));
|
|
if (_directoryService.FileSystem.File.Exists(filepath)) continue;
|
|
|
|
// I need to do the removal different. I need to update all user preferences to use DefaultTheme
|
|
allThemes.Remove(userTheme);
|
|
await RemoveTheme(userTheme);
|
|
}
|
|
|
|
// Add new custom themes
|
|
var allThemeNames = allThemes.Select(t => t.NormalizedName).ToList();
|
|
foreach (var themeFile in themeFiles)
|
|
{
|
|
var themeName =
|
|
_directoryService.FileSystem.Path.GetFileNameWithoutExtension(themeFile).ToNormalized();
|
|
if (allThemeNames.Contains(themeName)) continue;
|
|
|
|
_unitOfWork.SiteThemeRepository.Add(new SiteTheme()
|
|
{
|
|
Name = _directoryService.FileSystem.Path.GetFileNameWithoutExtension(themeFile),
|
|
NormalizedName = themeName,
|
|
FileName = _directoryService.FileSystem.Path.GetFileName(themeFile),
|
|
Provider = ThemeProvider.User,
|
|
IsDefault = false,
|
|
});
|
|
|
|
await _eventHub.SendMessageAsync(MessageFactory.NotificationProgress,
|
|
MessageFactory.SiteThemeProgressEvent(_directoryService.FileSystem.Path.GetFileName(themeFile), themeName,
|
|
ProgressEventType.Updated));
|
|
}
|
|
|
|
|
|
if (_unitOfWork.HasChanges())
|
|
{
|
|
await _unitOfWork.CommitAsync();
|
|
}
|
|
|
|
// if there are no default themes, reselect Dark as default
|
|
var postSaveThemes = (await _unitOfWork.SiteThemeRepository.GetThemes()).ToList();
|
|
if (!postSaveThemes.Exists(t => t.IsDefault))
|
|
{
|
|
var defaultThemeName = Seed.DefaultThemes.Single(t => t.IsDefault).NormalizedName;
|
|
var theme = postSaveThemes.SingleOrDefault(t => t.NormalizedName == defaultThemeName);
|
|
if (theme != null)
|
|
{
|
|
theme.IsDefault = true;
|
|
_unitOfWork.SiteThemeRepository.Update(theme);
|
|
await _unitOfWork.CommitAsync();
|
|
}
|
|
|
|
}
|
|
|
|
await _eventHub.SendMessageAsync(MessageFactory.NotificationProgress,
|
|
MessageFactory.SiteThemeProgressEvent("", "", ProgressEventType.Ended));
|
|
}
|
|
|
|
|
|
/// <summary>
|
|
/// Removes the theme and any references to it from Pref and sets them to the default at the time.
|
|
/// This commits to DB.
|
|
/// </summary>
|
|
/// <param name="theme"></param>
|
|
private async Task RemoveTheme(SiteTheme theme)
|
|
{
|
|
var prefs = await _unitOfWork.UserRepository.GetAllPreferencesByThemeAsync(theme.Id);
|
|
var defaultTheme = await _unitOfWork.SiteThemeRepository.GetDefaultTheme();
|
|
foreach (var pref in prefs)
|
|
{
|
|
pref.Theme = defaultTheme;
|
|
_unitOfWork.UserRepository.Update(pref);
|
|
}
|
|
_unitOfWork.SiteThemeRepository.Remove(theme);
|
|
await _unitOfWork.CommitAsync();
|
|
}
|
|
|
|
/// <summary>
|
|
/// Updates the themeId to the default theme, all others are marked as non-default
|
|
/// </summary>
|
|
/// <param name="themeId"></param>
|
|
/// <returns></returns>
|
|
/// <exception cref="KavitaException">If theme does not exist</exception>
|
|
public async Task UpdateDefault(int themeId)
|
|
{
|
|
try
|
|
{
|
|
var theme = await _unitOfWork.SiteThemeRepository.GetThemeDto(themeId);
|
|
if (theme == null) throw new KavitaException("theme-doesnt-exist");
|
|
|
|
foreach (var siteTheme in await _unitOfWork.SiteThemeRepository.GetThemes())
|
|
{
|
|
siteTheme.IsDefault = (siteTheme.Id == themeId);
|
|
_unitOfWork.SiteThemeRepository.Update(siteTheme);
|
|
}
|
|
|
|
if (!_unitOfWork.HasChanges()) return;
|
|
await _unitOfWork.CommitAsync();
|
|
}
|
|
catch (Exception)
|
|
{
|
|
await _unitOfWork.RollbackAsync();
|
|
throw;
|
|
}
|
|
}
|
|
}
|