mirror of
https://github.com/Kareadita/Kavita.git
synced 2025-06-03 05:34:21 -04:00
* Implemented the first version of dynamic filtering which is all Extension based. * Implemented basic generic property filter for expanded metadata filtering. * Fixed up the code to allow for nested properties and fixed up the Contains to work only for IList's * Started refactoring for the new approach * More progress, need to rethink a few filters like read progress to be % based and people needs to be more explicit. * Refactored most of the existing filtering operations into dedicate extensions for the appropriate comparisons. People still need to be reworked to be more dynamic. * Fixed a bug with continue point where it fails on chapters or volumes tagged with a range * Wired up a basic api path to start building groups. No and/or support yet. * Started on the UI * Made a bit of progress on the UI as I'm putting the pieces together about how to design it. * Refactored names to make it more consistent. New thinking is we will have one row that will take a filter statement and manipulate it. It will emit said statement and a builder will turn into the higher level statement. * Started working on updating code to use new inject() method. * Fixed the code to switch the comparisons. * Added dynamic input structure in and moved add/remove to the builder. * Fixed an enum bug * Hooked in basic dropdown support that is dynamic to the field. Only language is missing as that needs a DTO change (but don't want to break API) * Fixed a bug where dropdown options wouldn't re-populate when switching fields that are both dropdowns * Started adding metadata builder * Fixed when typing on filter row the focus resetting * Refactored to add an additional component which handles the compounding of filter rows. * Started hooking up v2 dto in the UI to send to the backend. * Started working on building group UI for and/or support. * Lots of backend code fixes to ensure OR and AND statements combine correctly. * More trying to figure out how to write the UI code * Started debugging to remember what I was last doing. * Lots of progress towards building out the UI recursively * I got the dto to build and propagate up the chain * Started hooking up to the actual api to fetch the data. * Basic wire up to the backend is working. * HasName is now complete * Refactored SortOptions code into an extension and streamlined LimitTo to the correct place. * Fixed a bug where Library Filters from the Group weren't actually being taken into account. * Refactored a lot of code so builder will now export the full dto. * Cleaned up the data flow from metadata filter to library detail * Got the dropdown to load preset values on first load, but now it triggers twice. * Changed so when you add a new filter, it does it at top and fixed remove * Fixed the remove button being on the wrong row * Cleaned up the arrays to make it easier to manage * Cleaned up some of the backend to ensure it doesn't throw an incorrect exception * I'm starting to tread water, taking a break * Fixed a merge issue * Cleaned up Docker checks. * Default IpAddresses to empty string. * Refactored IsDocker to be completely static * Figured out the issue with the dropdown not working. * Almost got it, but the event isn't being called. * I think i might try something else. This doesn't seem to be working. * On the new implementation, implemented remove group. * Use enums to reduce copy/paste * the new system is working pretty well, ill go with it and move on. Can alwasy refactor. * Code is totally broken, but working the cache resume code with some hiccups. * I need to take a break * Stashing my broken code. I have an idea on how to serialize to the URL, but I need to rearchitect a lot. * Reverted last commit * remove domain * Fixed up some hardcoded caching. I'm giving up on this implementation and going to a simpler version * Refactored the backend to just allow flat filtering. * Started refactoring the components to make it flat filtering only. * Finished refactoring so that the base preset case will render. * Implemented basic query functionality on desktop. Clear needs some work and url code. * Some cleanup * Working on filtering url encode/decode * Interacting with filters now saves to url and can be reloaded from the url. Named filters is not hooked up. * Fixed a double load on the library detail page. * Moved the library filtering code out of the FilterBuilder as it needs to be handled differently. * Fixed up how we handle library statements in the filter. * Fixed up how links that perform a filter work. * Refactored a bunch of linking to a search page. * LimitTo works, my css however does not. * Switched some code to use localized strings. * Cleaned up some css * Hooked up Languages and put some additional code in so that Languages will return invalid Language codes back. * Removed a duplicate language signature. * Hooked up ability to preload collection tag. * Want To Read is converted * Converted lots of code to new filtering system. Need to do Bookmarks. * Fixed a potential bug with default filter creation. * Hooked up the ability to disable certain filter fields from appearing. * Added mobile drawer code and a hook for Robbie to take a look for some css. * Converted the APIs for dashboard along with other safety fixes to ensure bad data doesn't break any of the filtering apis * Added the backend code to handle summary query * Converted Want to Read api properly now. * Fixed the HasReadingProgress query * Hooked back the Reading Progress for legacy APIs * Fixed some bad localization strings * Wrote the filtering code for all-bookmarks. * OPDS is now using the new filter * Fixed OPDS reading lists and covers not sending their images. * Fixed up the OPDS feed and fixed a bug where libraries also weren't sending their images over OPDS * All but dropdown options have been validated and tested. * Fixed up some default cases for setting up the filter. * Sorted filter fields and re-keyed to be better suited based on user's needs. Fixed a bug where OPDS Series (from library view) wasn't showing the summary. Moved the (Format) from the title to the description to make the UX much better for OPDS. MOved * don't send empty summaries in the new summary formatting * Fixed up some default cases for setting up the filter. * Fixed the reset button * Fixed infinite scroller not having correct scope key * Added localization to the new components and removed old debug code * Styling fixes * Fixed deep linking across the app. Made it so you can click Characters from Reading list and open a filtered search. * A bit of styling for mobile * Don't show language if it's not properly set --------- Co-authored-by: Robbie Davis <robbie@therobbiedavis.com>
327 lines
12 KiB
C#
327 lines
12 KiB
C#
using System;
|
|
using System.Collections.Generic;
|
|
using System.IO;
|
|
using System.Linq;
|
|
using System.Net.Http;
|
|
using System.Runtime.InteropServices;
|
|
using System.Threading.Tasks;
|
|
using API.Data;
|
|
using API.Data.Repositories;
|
|
using API.DTOs.Stats;
|
|
using API.Entities.Enums;
|
|
using API.Entities.Enums.UserPreferences;
|
|
using Flurl.Http;
|
|
using Kavita.Common.EnvironmentInfo;
|
|
using Kavita.Common.Helpers;
|
|
using Microsoft.AspNetCore.Http;
|
|
using Microsoft.EntityFrameworkCore;
|
|
using Microsoft.Extensions.Logging;
|
|
|
|
namespace API.Services.Tasks;
|
|
|
|
public interface IStatsService
|
|
{
|
|
Task Send();
|
|
Task<ServerInfoDto> GetServerInfo();
|
|
Task<ServerInfoSlimDto> GetServerInfoSlim();
|
|
Task SendCancellation();
|
|
}
|
|
/// <summary>
|
|
/// This is for reporting to the stat server
|
|
/// </summary>
|
|
public class StatsService : IStatsService
|
|
{
|
|
private readonly ILogger<StatsService> _logger;
|
|
private readonly IUnitOfWork _unitOfWork;
|
|
private readonly DataContext _context;
|
|
private readonly IStatisticService _statisticService;
|
|
private const string ApiUrl = "https://stats.kavitareader.com"; // ""
|
|
|
|
public StatsService(ILogger<StatsService> logger, IUnitOfWork unitOfWork, DataContext context, IStatisticService statisticService)
|
|
{
|
|
_logger = logger;
|
|
_unitOfWork = unitOfWork;
|
|
_context = context;
|
|
_statisticService = statisticService;
|
|
|
|
FlurlHttp.ConfigureClient(ApiUrl, cli =>
|
|
cli.Settings.HttpClientFactory = new UntrustedCertClientFactory());
|
|
}
|
|
|
|
/// <summary>
|
|
/// Due to all instances firing this at the same time, we can DDOS our server. This task when fired will schedule the task to be run
|
|
/// randomly over a 6 hour spread
|
|
/// </summary>
|
|
public async Task Send()
|
|
{
|
|
var allowStatCollection = (await _unitOfWork.SettingsRepository.GetSettingsDtoAsync()).AllowStatCollection;
|
|
if (!allowStatCollection)
|
|
{
|
|
return;
|
|
}
|
|
|
|
await SendData();
|
|
}
|
|
|
|
/// <summary>
|
|
/// This must be public for Hangfire. Do not call this directly.
|
|
/// </summary>
|
|
// ReSharper disable once MemberCanBePrivate.Global
|
|
public async Task SendData()
|
|
{
|
|
var data = await GetServerInfo();
|
|
await SendDataToStatsServer(data);
|
|
}
|
|
|
|
|
|
private async Task SendDataToStatsServer(ServerInfoDto data)
|
|
{
|
|
var responseContent = string.Empty;
|
|
|
|
try
|
|
{
|
|
var response = await (ApiUrl + "/api/v2/stats")
|
|
.WithHeader("Accept", "application/json")
|
|
.WithHeader("User-Agent", "Kavita")
|
|
.WithHeader("x-api-key", "MsnvA2DfQqxSK5jh")
|
|
.WithHeader("x-kavita-version", BuildInfo.Version)
|
|
.WithHeader("Content-Type", "application/json")
|
|
.WithTimeout(TimeSpan.FromSeconds(30))
|
|
.PostJsonAsync(data);
|
|
|
|
if (response.StatusCode != StatusCodes.Status200OK)
|
|
{
|
|
_logger.LogError("KavitaStats did not respond successfully. {Content}", response);
|
|
}
|
|
}
|
|
catch (HttpRequestException e)
|
|
{
|
|
var info = new
|
|
{
|
|
dataSent = data,
|
|
response = responseContent
|
|
};
|
|
|
|
_logger.LogError(e, "KavitaStats did not respond successfully. {Content}", info);
|
|
}
|
|
catch (Exception e)
|
|
{
|
|
_logger.LogError(e, "An error happened during the request to KavitaStats");
|
|
}
|
|
}
|
|
|
|
public async Task<ServerInfoDto> GetServerInfo()
|
|
{
|
|
var serverSettings = await _unitOfWork.SettingsRepository.GetSettingsDtoAsync();
|
|
|
|
var serverInfo = new ServerInfoDto
|
|
{
|
|
InstallId = serverSettings.InstallId,
|
|
Os = RuntimeInformation.OSDescription,
|
|
KavitaVersion = serverSettings.InstallVersion,
|
|
DotnetVersion = Environment.Version.ToString(),
|
|
IsDocker = OsInfo.IsDocker,
|
|
NumOfCores = Math.Max(Environment.ProcessorCount, 1),
|
|
UsersWithEmulateComicBook = await _context.AppUserPreferences.CountAsync(p => p.EmulateBook),
|
|
TotalReadingHours = await _statisticService.TimeSpentReadingForUsersAsync(ArraySegment<int>.Empty, ArraySegment<int>.Empty),
|
|
|
|
PercentOfLibrariesWithFolderWatchingEnabled = await GetPercentageOfLibrariesWithFolderWatchingEnabled(),
|
|
PercentOfLibrariesIncludedInRecommended = await GetPercentageOfLibrariesIncludedInRecommended(),
|
|
PercentOfLibrariesIncludedInDashboard = await GetPercentageOfLibrariesIncludedInDashboard(),
|
|
PercentOfLibrariesIncludedInSearch = await GetPercentageOfLibrariesIncludedInSearch(),
|
|
|
|
HasBookmarks = (await _unitOfWork.UserRepository.GetAllBookmarksAsync()).Any(),
|
|
NumberOfLibraries = (await _unitOfWork.LibraryRepository.GetLibrariesAsync()).Count(),
|
|
NumberOfCollections = (await _unitOfWork.CollectionTagRepository.GetAllTagsAsync()).Count(),
|
|
NumberOfReadingLists = await _unitOfWork.ReadingListRepository.Count(),
|
|
OPDSEnabled = serverSettings.EnableOpds,
|
|
NumberOfUsers = (await _unitOfWork.UserRepository.GetAllUsersAsync()).Count(),
|
|
TotalFiles = await _unitOfWork.LibraryRepository.GetTotalFiles(),
|
|
TotalGenres = await _unitOfWork.GenreRepository.GetCountAsync(),
|
|
TotalPeople = await _unitOfWork.PersonRepository.GetCountAsync(),
|
|
UsingSeriesRelationships = await GetIfUsingSeriesRelationship(),
|
|
EncodeMediaAs = serverSettings.EncodeMediaAs,
|
|
MaxSeriesInALibrary = await MaxSeriesInAnyLibrary(),
|
|
MaxVolumesInASeries = await MaxVolumesInASeries(),
|
|
MaxChaptersInASeries = await MaxChaptersInASeries(),
|
|
MangaReaderBackgroundColors = await AllMangaReaderBackgroundColors(),
|
|
MangaReaderPageSplittingModes = await AllMangaReaderPageSplitting(),
|
|
MangaReaderLayoutModes = await AllMangaReaderLayoutModes(),
|
|
FileFormats = AllFormats(),
|
|
UsingRestrictedProfiles = await GetUsingRestrictedProfiles(),
|
|
LastReadTime = await _unitOfWork.AppUserProgressRepository.GetLatestProgress()
|
|
};
|
|
|
|
var usersWithPref = (await _unitOfWork.UserRepository.GetAllUsersAsync(AppUserIncludes.UserPreferences)).ToList();
|
|
serverInfo.UsersOnCardLayout =
|
|
usersWithPref.Count(u => u.UserPreferences.GlobalPageLayoutMode == PageLayoutMode.Cards);
|
|
serverInfo.UsersOnListLayout =
|
|
usersWithPref.Count(u => u.UserPreferences.GlobalPageLayoutMode == PageLayoutMode.List);
|
|
|
|
var firstAdminUser = (await _unitOfWork.UserRepository.GetAdminUsersAsync()).FirstOrDefault();
|
|
|
|
if (firstAdminUser != null)
|
|
{
|
|
var firstAdminUserPref = (await _unitOfWork.UserRepository.GetPreferencesAsync(firstAdminUser.UserName!));
|
|
var activeTheme = firstAdminUserPref?.Theme ?? Seed.DefaultThemes.First(t => t.IsDefault);
|
|
|
|
serverInfo.ActiveSiteTheme = activeTheme.Name;
|
|
if (firstAdminUserPref != null) serverInfo.MangaReaderMode = firstAdminUserPref.ReaderMode;
|
|
}
|
|
|
|
return serverInfo;
|
|
}
|
|
|
|
public async Task<ServerInfoSlimDto> GetServerInfoSlim()
|
|
{
|
|
var serverSettings = await _unitOfWork.SettingsRepository.GetSettingsDtoAsync();
|
|
return new ServerInfoSlimDto()
|
|
{
|
|
InstallId = serverSettings.InstallId,
|
|
KavitaVersion = serverSettings.InstallVersion,
|
|
IsDocker = OsInfo.IsDocker
|
|
};
|
|
}
|
|
|
|
public async Task SendCancellation()
|
|
{
|
|
_logger.LogInformation("Informing KavitaStats that this instance is no longer sending stats");
|
|
var installId = (await _unitOfWork.SettingsRepository.GetSettingsDtoAsync()).InstallId;
|
|
|
|
var responseContent = string.Empty;
|
|
|
|
try
|
|
{
|
|
var response = await (ApiUrl + "/api/v2/stats/opt-out?installId=" + installId)
|
|
.WithHeader("Accept", "application/json")
|
|
.WithHeader("User-Agent", "Kavita")
|
|
.WithHeader("x-api-key", "MsnvA2DfQqxSK5jh")
|
|
.WithHeader("x-kavita-version", BuildInfo.Version)
|
|
.WithHeader("Content-Type", "application/json")
|
|
.WithTimeout(TimeSpan.FromSeconds(30))
|
|
.PostAsync();
|
|
|
|
if (response.StatusCode != StatusCodes.Status200OK)
|
|
{
|
|
_logger.LogError("KavitaStats did not respond successfully. {Content}", response);
|
|
}
|
|
}
|
|
catch (HttpRequestException e)
|
|
{
|
|
_logger.LogError(e, "KavitaStats did not respond successfully. {Response}", responseContent);
|
|
}
|
|
catch (Exception e)
|
|
{
|
|
_logger.LogError(e, "An error happened during the request to KavitaStats");
|
|
}
|
|
}
|
|
|
|
private async Task<float> GetPercentageOfLibrariesWithFolderWatchingEnabled()
|
|
{
|
|
var libraries = (await _unitOfWork.LibraryRepository.GetLibrariesAsync()).ToList();
|
|
if (libraries.Count == 0) return 0.0f;
|
|
return libraries.Count(l => l.FolderWatching) / (1.0f * libraries.Count);
|
|
}
|
|
|
|
private async Task<float> GetPercentageOfLibrariesIncludedInRecommended()
|
|
{
|
|
var libraries = (await _unitOfWork.LibraryRepository.GetLibrariesAsync()).ToList();
|
|
if (libraries.Count == 0) return 0.0f;
|
|
return libraries.Count(l => l.IncludeInRecommended) / (1.0f * libraries.Count);
|
|
}
|
|
|
|
private async Task<float> GetPercentageOfLibrariesIncludedInDashboard()
|
|
{
|
|
var libraries = (await _unitOfWork.LibraryRepository.GetLibrariesAsync()).ToList();
|
|
if (libraries.Count == 0) return 0.0f;
|
|
return libraries.Count(l => l.IncludeInDashboard) / (1.0f * libraries.Count);
|
|
}
|
|
|
|
private async Task<float> GetPercentageOfLibrariesIncludedInSearch()
|
|
{
|
|
var libraries = (await _unitOfWork.LibraryRepository.GetLibrariesAsync()).ToList();
|
|
if (libraries.Count == 0) return 0.0f;
|
|
return libraries.Count(l => l.IncludeInSearch) / (1.0f * libraries.Count);
|
|
}
|
|
|
|
private Task<bool> GetIfUsingSeriesRelationship()
|
|
{
|
|
return _context.SeriesRelation.AnyAsync();
|
|
}
|
|
|
|
private async Task<int> MaxSeriesInAnyLibrary()
|
|
{
|
|
// If first time flow, just return 0
|
|
if (!await _context.Series.AnyAsync()) return 0;
|
|
return await _context.Series
|
|
.Select(s => _context.Library.Where(l => l.Id == s.LibraryId).SelectMany(l => l.Series!).Count())
|
|
.MaxAsync();
|
|
}
|
|
|
|
private async Task<int> MaxVolumesInASeries()
|
|
{
|
|
// If first time flow, just return 0
|
|
if (!await _context.Volume.AnyAsync()) return 0;
|
|
return await _context.Volume
|
|
.Select(v => new
|
|
{
|
|
v.SeriesId,
|
|
Count = _context.Series.Where(s => s.Id == v.SeriesId).SelectMany(s => s.Volumes!).Count()
|
|
})
|
|
.AsNoTracking()
|
|
.AsSplitQuery()
|
|
.MaxAsync(d => d.Count);
|
|
}
|
|
|
|
private async Task<int> MaxChaptersInASeries()
|
|
{
|
|
// If first time flow, just return 0
|
|
if (!await _context.Chapter.AnyAsync()) return 0;
|
|
return await _context.Series
|
|
.AsNoTracking()
|
|
.AsSplitQuery()
|
|
.MaxAsync(s => s.Volumes!
|
|
.Where(v => v.Number == 0)
|
|
.SelectMany(v => v.Chapters!)
|
|
.Count());
|
|
}
|
|
|
|
private async Task<IEnumerable<string>> AllMangaReaderBackgroundColors()
|
|
{
|
|
return await _context.AppUserPreferences.Select(p => p.BackgroundColor).Distinct().ToListAsync();
|
|
}
|
|
|
|
private async Task<IEnumerable<PageSplitOption>> AllMangaReaderPageSplitting()
|
|
{
|
|
return await _context.AppUserPreferences.Select(p => p.PageSplitOption).Distinct().ToListAsync();
|
|
}
|
|
|
|
|
|
private async Task<IEnumerable<LayoutMode>> AllMangaReaderLayoutModes()
|
|
{
|
|
return await _context.AppUserPreferences.Select(p => p.LayoutMode).Distinct().ToListAsync();
|
|
}
|
|
|
|
private IEnumerable<FileFormatDto> AllFormats()
|
|
{
|
|
|
|
var results = _context.MangaFile
|
|
.AsNoTracking()
|
|
.AsEnumerable()
|
|
.Select(m => new FileFormatDto()
|
|
{
|
|
Format = m.Format,
|
|
Extension = m.Extension
|
|
})
|
|
.DistinctBy(f => f.Extension)
|
|
.ToList();
|
|
|
|
return results;
|
|
}
|
|
|
|
private Task<bool> GetUsingRestrictedProfiles()
|
|
{
|
|
return _context.Users.AnyAsync(u => u.AgeRestriction > AgeRating.NotApplicable);
|
|
}
|
|
}
|