From 8805b60a4313849d4b6ce1648c6876e5226f568b Mon Sep 17 00:00:00 2001 From: vosmiic <44092756+vosmiic@users.noreply.github.com> Date: Thu, 16 Jun 2022 21:13:52 +0100 Subject: [PATCH] dotnet 5 namespace changes --- UpdateProviderStatus.cs | 852 ++++++++++++++++++++-------------------- UserDataServerEntry.cs | 114 +++--- 2 files changed, 483 insertions(+), 483 deletions(-) diff --git a/UpdateProviderStatus.cs b/UpdateProviderStatus.cs index b5f15a7..900a750 100644 --- a/UpdateProviderStatus.cs +++ b/UpdateProviderStatus.cs @@ -23,124 +23,101 @@ using Microsoft.AspNetCore.Http; using Microsoft.Extensions.Logging; -namespace jellyfin_ani_sync; - -public class UpdateProviderStatus { - private readonly IHttpClientFactory _httpClientFactory; - private readonly IApplicationPaths _applicationPaths; - private readonly IServerApplicationHost _serverApplicationHost; - private readonly IHttpContextAccessor _httpContextAccessor; - - private readonly ILogger _logger; - - private ApiCallHelpers _apiCallHelpers; - private UserConfig _userConfig; - private Type _animeType; - private readonly ILibraryManager _libraryManager; - private readonly IFileSystem _fileSystem; - - private ApiName _apiName; - private readonly ILoggerFactory _loggerFactory; - - public UpdateProviderStatus(IFileSystem fileSystem, - ILibraryManager libraryManager, - ILoggerFactory loggerFactory, - IHttpContextAccessor httpContextAccessor, - IServerApplicationHost serverApplicationHost, - IHttpClientFactory httpClientFactory, - IApplicationPaths applicationPaths) { - _fileSystem = fileSystem; - _libraryManager = libraryManager; - _httpContextAccessor = httpContextAccessor; - _serverApplicationHost = serverApplicationHost; - _httpClientFactory = httpClientFactory; - _applicationPaths = applicationPaths; - _logger = loggerFactory.CreateLogger(); - _loggerFactory = loggerFactory; - } +namespace jellyfin_ani_sync { + public class UpdateProviderStatus { + private readonly IHttpClientFactory _httpClientFactory; + private readonly IApplicationPaths _applicationPaths; + private readonly IServerApplicationHost _serverApplicationHost; + private readonly IHttpContextAccessor _httpContextAccessor; + + private readonly ILogger _logger; + + private ApiCallHelpers _apiCallHelpers; + private UserConfig _userConfig; + private Type _animeType; + private readonly ILibraryManager _libraryManager; + private readonly IFileSystem _fileSystem; + + private ApiName _apiName; + private readonly ILoggerFactory _loggerFactory; + + public UpdateProviderStatus(IFileSystem fileSystem, + ILibraryManager libraryManager, + ILoggerFactory loggerFactory, + IHttpContextAccessor httpContextAccessor, + IServerApplicationHost serverApplicationHost, + IHttpClientFactory httpClientFactory, + IApplicationPaths applicationPaths) { + _fileSystem = fileSystem; + _libraryManager = libraryManager; + _httpContextAccessor = httpContextAccessor; + _serverApplicationHost = serverApplicationHost; + _httpClientFactory = httpClientFactory; + _applicationPaths = applicationPaths; + _logger = loggerFactory.CreateLogger(); + _loggerFactory = loggerFactory; + } - public async Task Update(BaseItem e, Guid userId, bool playedToCompletion) { - var video = e as Video; - Episode episode = video as Episode; - Movie movie = video as Movie; - if (video is Episode) { - _animeType = typeof(Episode); - } else if (video is Movie) { - _animeType = typeof(Movie); - video.IndexNumber = 1; - } + public async Task Update(BaseItem e, Guid userId, bool playedToCompletion) { + var video = e as Video; + Episode episode = video as Episode; + Movie movie = video as Movie; + if (video is Episode) { + _animeType = typeof(Episode); + } else if (video is Movie) { + _animeType = typeof(Movie); + video.IndexNumber = 1; + } - _userConfig = Plugin.Instance.PluginConfiguration.UserConfig.FirstOrDefault(item => item.UserId == userId); - if (_userConfig == null) { - _logger.LogWarning($"The user {userId} does not exist in the plugins config file. Skipping"); - return; - } + _userConfig = Plugin.Instance.PluginConfiguration.UserConfig.FirstOrDefault(item => item.UserId == userId); + if (_userConfig == null) { + _logger.LogWarning($"The user {userId} does not exist in the plugins config file. Skipping"); + return; + } - if (_userConfig.UserApiAuth == null) { - _logger.LogWarning($"The user {userId} is not authenticated. Skipping"); - return; - } + if (_userConfig.UserApiAuth == null) { + _logger.LogWarning($"The user {userId} is not authenticated. Skipping"); + return; + } - if (LibraryCheck(e) && video is Episode or Movie && playedToCompletion) { - AnimeOfflineDatabaseHelpers.OfflineDatabaseResponse providerIds = new AnimeOfflineDatabaseHelpers.OfflineDatabaseResponse(); - (int? aniDbId, int? episodeOffset) aniDbId = (null, null); - if (_animeType == typeof(Episode) - ? episode.ProviderIds != null && - episode.Series.ProviderIds.ContainsKey("AniList") && - episode.Season.IndexNumber.Value == 1 && - int.TryParse(episode.Series.ProviderIds["AniList"], out int retrievedAniListId) - : movie.ProviderIds != null && - movie.ProviderIds.ContainsKey("AniList") && - int.TryParse(movie.ProviderIds["AniList"], out retrievedAniListId)) { - _logger.LogInformation("AniList ID found. Retrieving provider IDs from offline database..."); - providerIds = await AnimeOfflineDatabaseHelpers.GetProviderIdsFromMetadataProvider(_httpClientFactory.CreateClient(NamedClient.Default), retrievedAniListId, false); - _logger.LogInformation("Retrieved provider IDs"); - } else if (_animeType == typeof(Episode) - ? (episode.Series.ProviderIds.ContainsKey("Tvdb") || - episode.Series.ProviderIds.ContainsKey("Anidb")) - : movie.ProviderIds != null && - movie.ProviderIds.ContainsKey("Anidb")) { - aniDbId = _animeType == typeof(Episode) - ? await AnimeListHelpers.GetAniDbId(_logger, _loggerFactory, _httpClientFactory, _applicationPaths, episode.Series.ProviderIds, episode.IndexNumber.Value, episode.Season.IndexNumber.Value) - : await AnimeListHelpers.GetAniDbId(_logger, _loggerFactory, _httpClientFactory, _applicationPaths, movie.ProviderIds, movie.IndexNumber.Value, 1); - if (aniDbId.aniDbId != null) { - _logger.LogInformation("Retrieving provider IDs from offline database..."); - providerIds = await AnimeOfflineDatabaseHelpers.GetProviderIdsFromMetadataProvider(_httpClientFactory.CreateClient(NamedClient.Default), aniDbId.aniDbId.Value, true); + if (LibraryCheck(e) && video is Episode or Movie && playedToCompletion) { + AnimeOfflineDatabaseHelpers.OfflineDatabaseResponse providerIds = new AnimeOfflineDatabaseHelpers.OfflineDatabaseResponse(); + (int? aniDbId, int? episodeOffset) aniDbId = (null, null); + if (_animeType == typeof(Episode) + ? episode.ProviderIds != null && + episode.Series.ProviderIds.ContainsKey("AniList") && + episode.Season.IndexNumber.Value == 1 && + int.TryParse(episode.Series.ProviderIds["AniList"], out int retrievedAniListId) + : movie.ProviderIds != null && + movie.ProviderIds.ContainsKey("AniList") && + int.TryParse(movie.ProviderIds["AniList"], out retrievedAniListId)) { + _logger.LogInformation("AniList ID found. Retrieving provider IDs from offline database..."); + providerIds = await AnimeOfflineDatabaseHelpers.GetProviderIdsFromMetadataProvider(_httpClientFactory.CreateClient(NamedClient.Default), retrievedAniListId, false); _logger.LogInformation("Retrieved provider IDs"); + } else if (_animeType == typeof(Episode) + ? (episode.Series.ProviderIds.ContainsKey("Tvdb") || + episode.Series.ProviderIds.ContainsKey("Anidb")) + : movie.ProviderIds != null && + movie.ProviderIds.ContainsKey("Anidb")) { + aniDbId = _animeType == typeof(Episode) + ? await AnimeListHelpers.GetAniDbId(_logger, _loggerFactory, _httpClientFactory, _applicationPaths, episode.Series.ProviderIds, episode.IndexNumber.Value, episode.Season.IndexNumber.Value) + : await AnimeListHelpers.GetAniDbId(_logger, _loggerFactory, _httpClientFactory, _applicationPaths, movie.ProviderIds, movie.IndexNumber.Value, 1); + if (aniDbId.aniDbId != null) { + _logger.LogInformation("Retrieving provider IDs from offline database..."); + providerIds = await AnimeOfflineDatabaseHelpers.GetProviderIdsFromMetadataProvider(_httpClientFactory.CreateClient(NamedClient.Default), aniDbId.aniDbId.Value, true); + _logger.LogInformation("Retrieved provider IDs"); + } } - } - foreach (UserApiAuth userApiAuth in _userConfig.UserApiAuth) { - _apiName = userApiAuth.Name; - _logger.LogInformation($"Using provider {userApiAuth.Name}..."); - switch (userApiAuth.Name) { - case ApiName.Mal: - _apiCallHelpers = new ApiCallHelpers(malApiCalls: new MalApiCalls(_httpClientFactory, _loggerFactory, _serverApplicationHost, _httpContextAccessor, _userConfig)); - if (providerIds.MyAnimeList != 0 && (episode != null && episode.Season.IndexNumber.Value != 0)) { - await CheckUserListAnimeStatus(providerIds.MyAnimeList, _animeType == typeof(Episode) - ? (aniDbId.episodeOffset != null - ? episode.IndexNumber.Value - aniDbId.episodeOffset.Value - : episode.IndexNumber.Value) - : movie.IndexNumber.Value, - false); - continue; - } - - break; - case ApiName.AniList: - _apiCallHelpers = new ApiCallHelpers(aniListApiCalls: new AniListApiCalls(_httpClientFactory, _loggerFactory, _serverApplicationHost, _httpContextAccessor, _userConfig)); - if (providerIds.Anilist != 0 && (episode != null && episode.Season.IndexNumber.Value != 0)) { - await CheckUserListAnimeStatus(providerIds.Anilist, _animeType == typeof(Episode) - ? (aniDbId.episodeOffset != null - ? episode.IndexNumber.Value - aniDbId.episodeOffset.Value - : episode.IndexNumber.Value) - : movie.IndexNumber.Value, - false); - continue; - } else if (_animeType == typeof(Episode) ? episode.Series.ProviderIds.ContainsKey("AniList") && episode.Season.IndexNumber.Value == 1 : movie.ProviderIds.ContainsKey("AniList")) { - if (_animeType == typeof(Episode) ? int.TryParse(episode.Series.ProviderIds["AniList"], out int aniListId) : int.TryParse(movie.ProviderIds["AniList"], out aniListId)) { - await CheckUserListAnimeStatus(aniListId, _animeType == typeof(Episode) + foreach (UserApiAuth userApiAuth in _userConfig.UserApiAuth) { + _apiName = userApiAuth.Name; + _logger.LogInformation($"Using provider {userApiAuth.Name}..."); + switch (userApiAuth.Name) { + case ApiName.Mal: + _apiCallHelpers = new ApiCallHelpers(malApiCalls: new MalApiCalls(_httpClientFactory, _loggerFactory, _serverApplicationHost, _httpContextAccessor, _userConfig)); + if (providerIds.MyAnimeList != 0 && (episode != null && episode.Season.IndexNumber.Value != 0)) { + await CheckUserListAnimeStatus(providerIds.MyAnimeList, _animeType == typeof(Episode) ? (aniDbId.episodeOffset != null ? episode.IndexNumber.Value - aniDbId.episodeOffset.Value : episode.IndexNumber.Value) @@ -148,398 +125,421 @@ await CheckUserListAnimeStatus(aniListId, _animeType == typeof(Episode) false); continue; } - } - break; - case ApiName.Kitsu: - _apiCallHelpers = new ApiCallHelpers(kitsuApiCalls: new KitsuApiCalls(_httpClientFactory, _loggerFactory, _serverApplicationHost, _httpContextAccessor, _userConfig)); - if (providerIds.Kitsu != 0 && (episode != null && episode.Season.IndexNumber.Value != 0)) { - await CheckUserListAnimeStatus(providerIds.Kitsu, _animeType == typeof(Episode) - ? (aniDbId.episodeOffset != null - ? episode.IndexNumber.Value - aniDbId.episodeOffset.Value - : episode.IndexNumber.Value) - : movie.IndexNumber.Value, - false); - continue; - } + break; + case ApiName.AniList: + _apiCallHelpers = new ApiCallHelpers(aniListApiCalls: new AniListApiCalls(_httpClientFactory, _loggerFactory, _serverApplicationHost, _httpContextAccessor, _userConfig)); + if (providerIds.Anilist != 0 && (episode != null && episode.Season.IndexNumber.Value != 0)) { + await CheckUserListAnimeStatus(providerIds.Anilist, _animeType == typeof(Episode) + ? (aniDbId.episodeOffset != null + ? episode.IndexNumber.Value - aniDbId.episodeOffset.Value + : episode.IndexNumber.Value) + : movie.IndexNumber.Value, + false); + continue; + } else if (_animeType == typeof(Episode) ? episode.Series.ProviderIds.ContainsKey("AniList") && episode.Season.IndexNumber.Value == 1 : movie.ProviderIds.ContainsKey("AniList")) { + if (_animeType == typeof(Episode) ? int.TryParse(episode.Series.ProviderIds["AniList"], out int aniListId) : int.TryParse(movie.ProviderIds["AniList"], out aniListId)) { + await CheckUserListAnimeStatus(aniListId, _animeType == typeof(Episode) + ? (aniDbId.episodeOffset != null + ? episode.IndexNumber.Value - aniDbId.episodeOffset.Value + : episode.IndexNumber.Value) + : movie.IndexNumber.Value, + false); + continue; + } + } - break; - } + break; + case ApiName.Kitsu: + _apiCallHelpers = new ApiCallHelpers(kitsuApiCalls: new KitsuApiCalls(_httpClientFactory, _loggerFactory, _serverApplicationHost, _httpContextAccessor, _userConfig)); + if (providerIds.Kitsu != 0 && (episode != null && episode.Season.IndexNumber.Value != 0)) { + await CheckUserListAnimeStatus(providerIds.Kitsu, _animeType == typeof(Episode) + ? (aniDbId.episodeOffset != null + ? episode.IndexNumber.Value - aniDbId.episodeOffset.Value + : episode.IndexNumber.Value) + : movie.IndexNumber.Value, + false); + continue; + } - List animeList = await _apiCallHelpers.SearchAnime(_animeType == typeof(Episode) ? episode.SeriesName : video.Name); - bool found = false; - if (animeList != null) { - foreach (var anime in animeList) { - if (TitleCheck(anime, episode, movie)) { - _logger.LogInformation($"({_apiName}) Found matching {(_animeType == typeof(Episode) ? "series" : "movie")}: {GetAnimeTitle(anime)}"); - Anime matchingAnime = anime; - if (_animeType == typeof(Episode)) { - int episodeNumber = episode.IndexNumber.Value; - if (episode?.Season.IndexNumber is > 1) { - // if this is not the first season, then we need to lookup the related season. - matchingAnime = await GetDifferentSeasonAnime(anime.Id, episode.Season.IndexNumber.Value); - if (matchingAnime == null) { - _logger.LogWarning($"({_apiName}) Could not find next season"); - found = true; - break; - } + break; + } - _logger.LogInformation($"({_apiName}) Season being watched is {GetAnimeTitle(matchingAnime)}"); - } else if (episode?.Season.IndexNumber == 0) { - // the episode is an ova or special - matchingAnime = await GetOva(anime.Id, episode.Name); - if (matchingAnime == null) { - _logger.LogWarning($"({_apiName}) Could not find OVA"); - found = true; - break; - } - } else if (matchingAnime.NumEpisodes < episode?.IndexNumber.Value) { - _logger.LogInformation($"({_apiName}) Watched episode passes total episodes in season! Checking for additional seasons/cours..."); - // either we have found the wrong series (highly unlikely) or it is a multi cour series/Jellyfin has grouped next season into the current. - int seasonEpisodeCounter = matchingAnime.NumEpisodes; - int totalEpisodesWatched = 0; - int seasonCounter = episode.Season.IndexNumber.Value; - int episodeCount = episode.IndexNumber.Value; - Anime season = matchingAnime; - bool isRootSeason = false; - while (seasonEpisodeCounter < episodeCount) { - var nextSeason = await GetDifferentSeasonAnime(season.Id, seasonCounter + 1); - if (nextSeason == null) { + List animeList = await _apiCallHelpers.SearchAnime(_animeType == typeof(Episode) ? episode.SeriesName : video.Name); + bool found = false; + if (animeList != null) { + foreach (var anime in animeList) { + if (TitleCheck(anime, episode, movie)) { + _logger.LogInformation($"({_apiName}) Found matching {(_animeType == typeof(Episode) ? "series" : "movie")}: {GetAnimeTitle(anime)}"); + Anime matchingAnime = anime; + if (_animeType == typeof(Episode)) { + int episodeNumber = episode.IndexNumber.Value; + if (episode?.Season.IndexNumber is > 1) { + // if this is not the first season, then we need to lookup the related season. + matchingAnime = await GetDifferentSeasonAnime(anime.Id, episode.Season.IndexNumber.Value); + if (matchingAnime == null) { _logger.LogWarning($"({_apiName}) Could not find next season"); - if (matchingAnime.Status == AiringStatus.currently_airing && matchingAnime.NumEpisodes == 0) { - _logger.LogWarning($"({_apiName}) Show is currently airing and API reports 0 episodes, going to use first season"); - isRootSeason = true; - } + found = true; + break; + } + _logger.LogInformation($"({_apiName}) Season being watched is {GetAnimeTitle(matchingAnime)}"); + } else if (episode?.Season.IndexNumber == 0) { + // the episode is an ova or special + matchingAnime = await GetOva(anime.Id, episode.Name); + if (matchingAnime == null) { + _logger.LogWarning($"({_apiName}) Could not find OVA"); found = true; break; } + } else if (matchingAnime.NumEpisodes < episode?.IndexNumber.Value) { + _logger.LogInformation($"({_apiName}) Watched episode passes total episodes in season! Checking for additional seasons/cours..."); + // either we have found the wrong series (highly unlikely) or it is a multi cour series/Jellyfin has grouped next season into the current. + int seasonEpisodeCounter = matchingAnime.NumEpisodes; + int totalEpisodesWatched = 0; + int seasonCounter = episode.Season.IndexNumber.Value; + int episodeCount = episode.IndexNumber.Value; + Anime season = matchingAnime; + bool isRootSeason = false; + while (seasonEpisodeCounter < episodeCount) { + var nextSeason = await GetDifferentSeasonAnime(season.Id, seasonCounter + 1); + if (nextSeason == null) { + _logger.LogWarning($"({_apiName}) Could not find next season"); + if (matchingAnime.Status == AiringStatus.currently_airing && matchingAnime.NumEpisodes == 0) { + _logger.LogWarning($"({_apiName}) Show is currently airing and API reports 0 episodes, going to use first season"); + isRootSeason = true; + } + + found = true; + break; + } - seasonEpisodeCounter += nextSeason.NumEpisodes; - seasonCounter++; - // complete the current season; we have surpassed it onto the next season/cour - totalEpisodesWatched += season.NumEpisodes; - await CheckUserListAnimeStatus(season.Id, season.NumEpisodes, false); - season = nextSeason; - } + seasonEpisodeCounter += nextSeason.NumEpisodes; + seasonCounter++; + // complete the current season; we have surpassed it onto the next season/cour + totalEpisodesWatched += season.NumEpisodes; + await CheckUserListAnimeStatus(season.Id, season.NumEpisodes, false); + season = nextSeason; + } - if (!isRootSeason) { - if (season.Id != matchingAnime.Id) { - matchingAnime = season; - episodeNumber = episodeCount - totalEpisodesWatched; - } else { - break; + if (!isRootSeason) { + if (season.Id != matchingAnime.Id) { + matchingAnime = season; + episodeNumber = episodeCount - totalEpisodesWatched; + } else { + break; + } } } - } - await CheckUserListAnimeStatus(matchingAnime.Id, episodeNumber); - found = true; - break; - } + await CheckUserListAnimeStatus(matchingAnime.Id, episodeNumber); + found = true; + break; + } - if (_animeType == typeof(Movie)) { - await CheckUserListAnimeStatus(matchingAnime.Id, movie.IndexNumber.Value); - found = true; - break; + if (_animeType == typeof(Movie)) { + await CheckUserListAnimeStatus(matchingAnime.Id, movie.IndexNumber.Value); + found = true; + break; + } } } } - } - if (!found) { - _logger.LogWarning($"({_apiName}) Series not found"); + if (!found) { + _logger.LogWarning($"({_apiName}) Series not found"); + } } } } - } - /// - /// Gets anime's title. - /// - /// The API anime - /// - /// if it isn't empty.
- /// If it is, then the first synonym.
- /// If there isn't any, then the japanese title. - /// - private static string GetAnimeTitle(Anime anime) { - var title = string.IsNullOrWhiteSpace(anime.Title) - ? anime.AlternativeTitles.Synonyms.Count > 0 - ? anime.AlternativeTitles.Synonyms[0] - : anime.AlternativeTitles.Ja - : anime.Title; - return title; - } + /// + /// Gets anime's title. + /// + /// The API anime + /// + /// if it isn't empty.
+ /// If it is, then the first synonym.
+ /// If there isn't any, then the japanese title. + /// + private static string GetAnimeTitle(Anime anime) { + var title = string.IsNullOrWhiteSpace(anime.Title) + ? anime.AlternativeTitles.Synonyms.Count > 0 + ? anime.AlternativeTitles.Synonyms[0] + : anime.AlternativeTitles.Ja + : anime.Title; + return title; + } - /// - /// Checks if the Jellyfin library entry matches the API names. - /// - /// The API anime. - /// The episode if its a series. - /// The movie if its a single episode movie. - /// - private bool TitleCheck(Anime anime, Episode episode, Movie movie) { - var title = _animeType == typeof(Episode) ? episode.SeriesName : movie.Name; - return CompareStrings(anime.Title, title) || - CompareStrings(anime.AlternativeTitles.En, title) || - (anime.AlternativeTitles.Ja != null && CompareStrings(anime.AlternativeTitles.Ja, title)) || - (anime.AlternativeTitles.Synonyms != null && anime.AlternativeTitles.Synonyms.Any(synonym => CompareStrings(synonym, title))); - } + /// + /// Checks if the Jellyfin library entry matches the API names. + /// + /// The API anime. + /// The episode if its a series. + /// The movie if its a single episode movie. + /// + private bool TitleCheck(Anime anime, Episode episode, Movie movie) { + var title = _animeType == typeof(Episode) ? episode.SeriesName : movie.Name; + return CompareStrings(anime.Title, title) || + CompareStrings(anime.AlternativeTitles.En, title) || + (anime.AlternativeTitles.Ja != null && CompareStrings(anime.AlternativeTitles.Ja, title)) || + (anime.AlternativeTitles.Synonyms != null && anime.AlternativeTitles.Synonyms.Any(synonym => CompareStrings(synonym, title))); + } - /// - /// Compare two strings, ignoring symbols and case. - /// - /// The first string. - /// The second string. - /// True if first string is equal to second string, false if not. - private bool CompareStrings(string first, string second) { - return String.Compare(first, second, CultureInfo.CurrentCulture, CompareOptions.IgnoreCase | CompareOptions.IgnoreSymbols) == 0; - } + /// + /// Compare two strings, ignoring symbols and case. + /// + /// The first string. + /// The second string. + /// True if first string is equal to second string, false if not. + private bool CompareStrings(string first, string second) { + return String.Compare(first, second, CultureInfo.CurrentCulture, CompareOptions.IgnoreCase | CompareOptions.IgnoreSymbols) == 0; + } - /// - /// Check if a string exists in another, ignoring symbols and case. - /// - /// The first string. - /// The second string. - /// True if first string contains second string, false if not. - private bool ContainsExtended(string first, string second) { - return StringFormatter.RemoveSpecialCharacters(first).Contains(StringFormatter.RemoveSpecialCharacters(second), StringComparison.OrdinalIgnoreCase); - } + /// + /// Check if a string exists in another, ignoring symbols and case. + /// + /// The first string. + /// The second string. + /// True if first string contains second string, false if not. + private bool ContainsExtended(string first, string second) { + return StringFormatter.RemoveSpecialCharacters(first).Contains(StringFormatter.RemoveSpecialCharacters(second), StringComparison.OrdinalIgnoreCase); + } - private bool LibraryCheck(BaseItem item) { - if (_userConfig.LibraryToCheck is { Length: > 0 }) { - var folders = _libraryManager.GetVirtualFolders().Where(item => _userConfig.LibraryToCheck.Contains(item.ItemId)); + private bool LibraryCheck(BaseItem item) { + if (_userConfig.LibraryToCheck is { Length: > 0 }) { + var folders = _libraryManager.GetVirtualFolders().Where(item => _userConfig.LibraryToCheck.Contains(item.ItemId)); - foreach (var folder in folders) { - foreach (var location in folder.Locations) { - if (_fileSystem.ContainsSubPath(location, item.Path)) { - // item is in a path of a folder the user wants to be monitored - return true; + foreach (var folder in folders) { + foreach (var location in folder.Locations) { + if (_fileSystem.ContainsSubPath(location, item.Path)) { + // item is in a path of a folder the user wants to be monitored + return true; + } } } + } else { + // user has no library filters + return true; } - } else { - // user has no library filters - return true; - } - - _logger.LogInformation("Item is in a folder the user does not want to be monitored; ignoring"); - return false; - } - - private async Task CheckUserListAnimeStatus(int matchingAnimeId, int episodeNumber, bool? overrideCheckRewatch = null) { - Anime detectedAnime = await GetAnime(matchingAnimeId); - if (detectedAnime == null) return; - if (detectedAnime.MyListStatus != null && detectedAnime.MyListStatus.Status == Status.Watching) { - _logger.LogInformation($"({_apiName}) {(_animeType == typeof(Episode) ? "Series" : "Movie")} ({GetAnimeTitle(detectedAnime)}) found on watching list"); - await UpdateAnimeStatus(detectedAnime, episodeNumber); - return; + _logger.LogInformation("Item is in a folder the user does not want to be monitored; ignoring"); + return false; } - // only plan to watch - if (_userConfig.PlanToWatchOnly) { - if (detectedAnime.MyListStatus != null && detectedAnime.MyListStatus.Status == Status.Plan_to_watch) { - _logger.LogInformation($"({_apiName}) {(_animeType == typeof(Episode) ? "Series" : "Movie")} ({GetAnimeTitle(detectedAnime)}) found on plan to watch list"); + private async Task CheckUserListAnimeStatus(int matchingAnimeId, int episodeNumber, bool? overrideCheckRewatch = null) { + Anime detectedAnime = await GetAnime(matchingAnimeId); + + if (detectedAnime == null) return; + if (detectedAnime.MyListStatus != null && detectedAnime.MyListStatus.Status == Status.Watching) { + _logger.LogInformation($"({_apiName}) {(_animeType == typeof(Episode) ? "Series" : "Movie")} ({GetAnimeTitle(detectedAnime)}) found on watching list"); await UpdateAnimeStatus(detectedAnime, episodeNumber); + return; } - // also check if rewatch completed is checked - _logger.LogInformation($"({_apiName}) {(_animeType == typeof(Episode) ? "Series" : "Movie")} ({GetAnimeTitle(detectedAnime)}) not found in plan to watch list{(_userConfig.RewatchCompleted ? ", checking completed list.." : null)}"); - await CheckIfRewatchCompleted(detectedAnime, episodeNumber, overrideCheckRewatch); - return; - } - - _logger.LogInformation("User does not have plan to watch only ticked"); - - // check if rewatch completed is checked - await CheckIfRewatchCompleted(detectedAnime, episodeNumber, overrideCheckRewatch); + // only plan to watch + if (_userConfig.PlanToWatchOnly) { + if (detectedAnime.MyListStatus != null && detectedAnime.MyListStatus.Status == Status.Plan_to_watch) { + _logger.LogInformation($"({_apiName}) {(_animeType == typeof(Episode) ? "Series" : "Movie")} ({GetAnimeTitle(detectedAnime)}) found on plan to watch list"); + await UpdateAnimeStatus(detectedAnime, episodeNumber); + } - // everything else - if (detectedAnime.MyListStatus != null) { - // anime is on user list - _logger.LogInformation($"({_apiName}) {(_animeType == typeof(Episode) ? "Series" : "Movie")} ({GetAnimeTitle(detectedAnime)}) found on {detectedAnime.MyListStatus.Status} list"); - if (detectedAnime.MyListStatus.Status == Status.Completed) { - _logger.LogInformation($"({_apiName}) {(_animeType == typeof(Episode) ? "Series" : "Movie")} ({GetAnimeTitle(detectedAnime)}) found on Completed list, but user does not want to automatically set as rewatching. Skipping"); + // also check if rewatch completed is checked + _logger.LogInformation($"({_apiName}) {(_animeType == typeof(Episode) ? "Series" : "Movie")} ({GetAnimeTitle(detectedAnime)}) not found in plan to watch list{(_userConfig.RewatchCompleted ? ", checking completed list.." : null)}"); + await CheckIfRewatchCompleted(detectedAnime, episodeNumber, overrideCheckRewatch); return; } - } else { - _logger.LogInformation($"({_apiName}) {(_animeType == typeof(Episode) ? "Series" : "Movie")} ({GetAnimeTitle(detectedAnime)}) not on user list"); - } - await UpdateAnimeStatus(detectedAnime, episodeNumber); - } + _logger.LogInformation("User does not have plan to watch only ticked"); + + // check if rewatch completed is checked + await CheckIfRewatchCompleted(detectedAnime, episodeNumber, overrideCheckRewatch); - private async Task CheckIfRewatchCompleted(Anime detectedAnime, int indexNumber, bool? overrideCheckRewatch) { - if (overrideCheckRewatch == null || - overrideCheckRewatch.Value || - detectedAnime.MyListStatus is { Status: Status.Completed } && detectedAnime.MyListStatus.NumEpisodesWatched < indexNumber) { - if (_userConfig.RewatchCompleted) { - if (detectedAnime.MyListStatus != null && detectedAnime.MyListStatus.Status == Status.Completed) { - _logger.LogInformation($"({_apiName}) {(_animeType == typeof(Episode) ? "Series" : "Movie")} ({GetAnimeTitle(detectedAnime)}) found on completed list, setting as re-watching"); - await UpdateAnimeStatus(detectedAnime, indexNumber, true, detectedAnime.MyListStatus.RewatchCount, true); + // everything else + if (detectedAnime.MyListStatus != null) { + // anime is on user list + _logger.LogInformation($"({_apiName}) {(_animeType == typeof(Episode) ? "Series" : "Movie")} ({GetAnimeTitle(detectedAnime)}) found on {detectedAnime.MyListStatus.Status} list"); + if (detectedAnime.MyListStatus.Status == Status.Completed) { + _logger.LogInformation($"({_apiName}) {(_animeType == typeof(Episode) ? "Series" : "Movie")} ({GetAnimeTitle(detectedAnime)}) found on Completed list, but user does not want to automatically set as rewatching. Skipping"); + return; } } else { - _logger.LogInformation($"({_apiName}) {(_animeType == typeof(Episode) ? "Series" : "Movie")} ({GetAnimeTitle(detectedAnime)}) found on Completed list, but user does not want to automatically set as rewatching. Skipping"); + _logger.LogInformation($"({_apiName}) {(_animeType == typeof(Episode) ? "Series" : "Movie")} ({GetAnimeTitle(detectedAnime)}) not on user list"); } - } else if (detectedAnime.MyListStatus != null && detectedAnime.MyListStatus.NumEpisodesWatched >= indexNumber) { - _logger.LogInformation($"({_apiName}) {(_animeType == typeof(Episode) ? "Series" : "Movie")} ({GetAnimeTitle(detectedAnime)}) found, but provider reports episode already watched. Skipping"); - } else if (_userConfig.PlanToWatchOnly) { - _logger.LogInformation($"({_apiName}) {(_animeType == typeof(Episode) ? "Series" : "Movie")} ({GetAnimeTitle(detectedAnime)}) found, but not on completed or plan to watch list. Skipping"); + + await UpdateAnimeStatus(detectedAnime, episodeNumber); } - } - /// - /// Get a single result from a user anime search. - /// - /// ID of the anime you want to get. - /// User status of the show. - /// Single anime result. - private async Task GetAnime(int animeId, Status? status = null) { - Anime anime = await _apiCallHelpers.GetAnime(animeId); - if (anime != null && ((status != null && anime.MyListStatus != null && anime.MyListStatus.Status == status) || status == null)) { - return anime; + private async Task CheckIfRewatchCompleted(Anime detectedAnime, int indexNumber, bool? overrideCheckRewatch) { + if (overrideCheckRewatch == null || + overrideCheckRewatch.Value || + detectedAnime.MyListStatus is { Status: Status.Completed } && detectedAnime.MyListStatus.NumEpisodesWatched < indexNumber) { + if (_userConfig.RewatchCompleted) { + if (detectedAnime.MyListStatus != null && detectedAnime.MyListStatus.Status == Status.Completed) { + _logger.LogInformation($"({_apiName}) {(_animeType == typeof(Episode) ? "Series" : "Movie")} ({GetAnimeTitle(detectedAnime)}) found on completed list, setting as re-watching"); + await UpdateAnimeStatus(detectedAnime, indexNumber, true, detectedAnime.MyListStatus.RewatchCount, true); + } + } else { + _logger.LogInformation($"({_apiName}) {(_animeType == typeof(Episode) ? "Series" : "Movie")} ({GetAnimeTitle(detectedAnime)}) found on Completed list, but user does not want to automatically set as rewatching. Skipping"); + } + } else if (detectedAnime.MyListStatus != null && detectedAnime.MyListStatus.NumEpisodesWatched >= indexNumber) { + _logger.LogInformation($"({_apiName}) {(_animeType == typeof(Episode) ? "Series" : "Movie")} ({GetAnimeTitle(detectedAnime)}) found, but provider reports episode already watched. Skipping"); + } else if (_userConfig.PlanToWatchOnly) { + _logger.LogInformation($"({_apiName}) {(_animeType == typeof(Episode) ? "Series" : "Movie")} ({GetAnimeTitle(detectedAnime)}) found, but not on completed or plan to watch list. Skipping"); + } } - return null; - } + /// + /// Get a single result from a user anime search. + /// + /// ID of the anime you want to get. + /// User status of the show. + /// Single anime result. + private async Task GetAnime(int animeId, Status? status = null) { + Anime anime = await _apiCallHelpers.GetAnime(animeId); + if (anime != null && ((status != null && anime.MyListStatus != null && anime.MyListStatus.Status == status) || status == null)) { + return anime; + } - /// - /// Update a users anime status. - /// - /// The anime search result to update. - /// The episode number to update the anime to. - /// Whether to set the show as being re-watched or not. - private async Task UpdateAnimeStatus(Anime detectedAnime, int? episodeNumber, bool? setRewatching = null, int? rewatchCount = null, bool firstTimeRewatch = false) { - if (episodeNumber != null) { - UpdateAnimeStatusResponse response; - if (detectedAnime.MyListStatus != null) { - if (detectedAnime.MyListStatus.NumEpisodesWatched < episodeNumber.Value || detectedAnime.NumEpisodes == 1 || - (setRewatching != null && setRewatching.Value && detectedAnime.MyListStatus.NumEpisodesWatched == episodeNumber.Value)) { - // covers the very rare occurence of re-watching the show and starting at the last episode - // movie or ova has only one episode, so just mark it as finished - if (episodeNumber.Value == detectedAnime.NumEpisodes || detectedAnime.NumEpisodes == 1) { - // either watched all episodes or the anime only has a single episode (ova) - if (detectedAnime.NumEpisodes == 1) { - // its a movie or ova since it only has one "episode", so the start and end date is the same - response = await _apiCallHelpers.UpdateAnime(detectedAnime.Id, 1, Status.Completed, startDate: detectedAnime.MyListStatus.IsRewatching || detectedAnime.MyListStatus.Status == Status.Completed ? null : DateTime.Now, endDate: detectedAnime.MyListStatus.IsRewatching || detectedAnime.MyListStatus.Status == Status.Completed ? null : DateTime.Now, isRewatching: false, numberOfTimesRewatched: (setRewatching != null && setRewatching.Value) || detectedAnime.MyListStatus.IsRewatching ? detectedAnime.MyListStatus.RewatchCount + 1 : null); - } else { - // user has reached the number of episodes in the anime, set as completed - response = await _apiCallHelpers.UpdateAnime(detectedAnime.Id, episodeNumber.Value, Status.Completed, endDate: detectedAnime.MyListStatus.IsRewatching || detectedAnime.MyListStatus.Status == Status.Completed ? null : DateTime.Now, isRewatching: false, numberOfTimesRewatched: (setRewatching != null && setRewatching.Value) || detectedAnime.MyListStatus.IsRewatching ? detectedAnime.MyListStatus.RewatchCount + 1 : null); - } + return null; + } - _logger.LogInformation($"({_apiName}) {(_animeType == typeof(Episode) ? "Series" : "Movie")} ({GetAnimeTitle(detectedAnime)}) complete, marking anime as complete{(_apiName != ApiName.Mal && (setRewatching != null && setRewatching.Value) ? ", increasing re-watch count by 1" : "")}"); - if ((detectedAnime.MyListStatus.IsRewatching || (detectedAnime.NumEpisodes == 1 && detectedAnime.MyListStatus.Status == Status.Completed) || (setRewatching != null && setRewatching.Value)) && _apiName == ApiName.Mal) { - // also increase number of times re-watched by 1 - // only way to get the number of times re-watched is by doing the update and capturing the response, and then re-updating for MAL :/ - _logger.LogInformation($"({_apiName}) {(_animeType == typeof(Episode) ? "Series" : "Movie")} ({GetAnimeTitle(detectedAnime)}) has also been re-watched, increasing re-watch count by 1"); - response = await _apiCallHelpers.UpdateAnime(detectedAnime.Id, episodeNumber.Value, Status.Completed, numberOfTimesRewatched: response.NumTimesRewatched + 1, isRewatching: false); - } - } else { - if (detectedAnime.MyListStatus.IsRewatching) { - // MAL likes to mark re-watching shows as completed, instead of watching. I guess technically both are correct - _logger.LogInformation($"({_apiName}) User is re-watching {(_animeType == typeof(Episode) ? "series" : "movie")} ({GetAnimeTitle(detectedAnime)}), set as completed but update re-watch progress"); - response = await _apiCallHelpers.UpdateAnime(detectedAnime.Id, episodeNumber.Value, Status.Completed, isRewatching: true); + /// + /// Update a users anime status. + /// + /// The anime search result to update. + /// The episode number to update the anime to. + /// Whether to set the show as being re-watched or not. + private async Task UpdateAnimeStatus(Anime detectedAnime, int? episodeNumber, bool? setRewatching = null, int? rewatchCount = null, bool firstTimeRewatch = false) { + if (episodeNumber != null) { + UpdateAnimeStatusResponse response; + if (detectedAnime.MyListStatus != null) { + if (detectedAnime.MyListStatus.NumEpisodesWatched < episodeNumber.Value || detectedAnime.NumEpisodes == 1 || + (setRewatching != null && setRewatching.Value && detectedAnime.MyListStatus.NumEpisodesWatched == episodeNumber.Value)) { + // covers the very rare occurence of re-watching the show and starting at the last episode + // movie or ova has only one episode, so just mark it as finished + if (episodeNumber.Value == detectedAnime.NumEpisodes || detectedAnime.NumEpisodes == 1) { + // either watched all episodes or the anime only has a single episode (ova) + if (detectedAnime.NumEpisodes == 1) { + // its a movie or ova since it only has one "episode", so the start and end date is the same + response = await _apiCallHelpers.UpdateAnime(detectedAnime.Id, 1, Status.Completed, startDate: detectedAnime.MyListStatus.IsRewatching || detectedAnime.MyListStatus.Status == Status.Completed ? null : DateTime.Now, endDate: detectedAnime.MyListStatus.IsRewatching || detectedAnime.MyListStatus.Status == Status.Completed ? null : DateTime.Now, isRewatching: false, numberOfTimesRewatched: (setRewatching != null && setRewatching.Value) || detectedAnime.MyListStatus.IsRewatching ? detectedAnime.MyListStatus.RewatchCount + 1 : null); + } else { + // user has reached the number of episodes in the anime, set as completed + response = await _apiCallHelpers.UpdateAnime(detectedAnime.Id, episodeNumber.Value, Status.Completed, endDate: detectedAnime.MyListStatus.IsRewatching || detectedAnime.MyListStatus.Status == Status.Completed ? null : DateTime.Now, isRewatching: false, numberOfTimesRewatched: (setRewatching != null && setRewatching.Value) || detectedAnime.MyListStatus.IsRewatching ? detectedAnime.MyListStatus.RewatchCount + 1 : null); + } + + _logger.LogInformation($"({_apiName}) {(_animeType == typeof(Episode) ? "Series" : "Movie")} ({GetAnimeTitle(detectedAnime)}) complete, marking anime as complete{(_apiName != ApiName.Mal && (setRewatching != null && setRewatching.Value) ? ", increasing re-watch count by 1" : "")}"); + if ((detectedAnime.MyListStatus.IsRewatching || (detectedAnime.NumEpisodes == 1 && detectedAnime.MyListStatus.Status == Status.Completed) || (setRewatching != null && setRewatching.Value)) && _apiName == ApiName.Mal) { + // also increase number of times re-watched by 1 + // only way to get the number of times re-watched is by doing the update and capturing the response, and then re-updating for MAL :/ + _logger.LogInformation($"({_apiName}) {(_animeType == typeof(Episode) ? "Series" : "Movie")} ({GetAnimeTitle(detectedAnime)}) has also been re-watched, increasing re-watch count by 1"); + response = await _apiCallHelpers.UpdateAnime(detectedAnime.Id, episodeNumber.Value, Status.Completed, numberOfTimesRewatched: response.NumTimesRewatched + 1, isRewatching: false); + } } else { - if (episodeNumber > 1) { - // don't set start date after first episode - response = await _apiCallHelpers.UpdateAnime(detectedAnime.Id, episodeNumber.Value, Status.Watching); + if (detectedAnime.MyListStatus.IsRewatching) { + // MAL likes to mark re-watching shows as completed, instead of watching. I guess technically both are correct + _logger.LogInformation($"({_apiName}) User is re-watching {(_animeType == typeof(Episode) ? "series" : "movie")} ({GetAnimeTitle(detectedAnime)}), set as completed but update re-watch progress"); + response = await _apiCallHelpers.UpdateAnime(detectedAnime.Id, episodeNumber.Value, Status.Completed, isRewatching: true); } else { - _logger.LogInformation($"({_apiName}) Setting new {(_animeType == typeof(Episode) ? "series" : "movie")} ({GetAnimeTitle(detectedAnime)}) as watching."); - response = await _apiCallHelpers.UpdateAnime(detectedAnime.Id, episodeNumber.Value, Status.Watching, startDate: DateTime.Now); + if (episodeNumber > 1) { + // don't set start date after first episode + response = await _apiCallHelpers.UpdateAnime(detectedAnime.Id, episodeNumber.Value, Status.Watching); + } else { + _logger.LogInformation($"({_apiName}) Setting new {(_animeType == typeof(Episode) ? "series" : "movie")} ({GetAnimeTitle(detectedAnime)}) as watching."); + response = await _apiCallHelpers.UpdateAnime(detectedAnime.Id, episodeNumber.Value, Status.Watching, startDate: DateTime.Now); + } } } - } - if (response != null) { - _logger.LogInformation($"({_apiName}) Updated {(_animeType == typeof(Episode) ? "series" : "movie")} ({GetAnimeTitle(detectedAnime)}) progress to {episodeNumber.Value}"); - } else { - _logger.LogError($"({_apiName}) Could not update anime status"); - } - } else { - if (setRewatching != null && setRewatching.Value) { - _logger.LogInformation($"({_apiName}) Series ({GetAnimeTitle(detectedAnime)}) has already been watched, marking anime as re-watching; progress of {episodeNumber.Value}"); - if (_apiName == ApiName.Kitsu && firstTimeRewatch) { - response = await _apiCallHelpers.UpdateAnime(detectedAnime.Id, episodeNumber.Value, Status.Rewatching, true, detectedAnime.MyListStatus.RewatchCount + 1); + if (response != null) { + _logger.LogInformation($"({_apiName}) Updated {(_animeType == typeof(Episode) ? "series" : "movie")} ({GetAnimeTitle(detectedAnime)}) progress to {episodeNumber.Value}"); } else { - response = await _apiCallHelpers.UpdateAnime(detectedAnime.Id, episodeNumber.Value, Status.Completed, true); - // anilist seems to (at the moment) not allow you to set the show as rewatching and the progress at the same time; going to have to do a separate call - if (_apiName == ApiName.AniList) { + _logger.LogError($"({_apiName}) Could not update anime status"); + } + } else { + if (setRewatching != null && setRewatching.Value) { + _logger.LogInformation($"({_apiName}) Series ({GetAnimeTitle(detectedAnime)}) has already been watched, marking anime as re-watching; progress of {episodeNumber.Value}"); + if (_apiName == ApiName.Kitsu && firstTimeRewatch) { + response = await _apiCallHelpers.UpdateAnime(detectedAnime.Id, episodeNumber.Value, Status.Rewatching, true, detectedAnime.MyListStatus.RewatchCount + 1); + } else { response = await _apiCallHelpers.UpdateAnime(detectedAnime.Id, episodeNumber.Value, Status.Completed, true); + // anilist seems to (at the moment) not allow you to set the show as rewatching and the progress at the same time; going to have to do a separate call + if (_apiName == ApiName.AniList) { + response = await _apiCallHelpers.UpdateAnime(detectedAnime.Id, episodeNumber.Value, Status.Completed, true); + } } + } else { + response = null; + _logger.LogInformation($"({_apiName}) Provider reports episode already watched; not updating"); } - } else { - response = null; - _logger.LogInformation($"({_apiName}) Provider reports episode already watched; not updating"); } + } else { + // status is not set, must be a new anime + _logger.LogInformation($"({_apiName}) Adding new {(_animeType == typeof(Episode) ? "series" : "movie")} ({GetAnimeTitle(detectedAnime)}) to user list as watching with a progress of {episodeNumber.Value}"); + response = await _apiCallHelpers.UpdateAnime(detectedAnime.Id, episodeNumber.Value, Status.Watching); } - } else { - // status is not set, must be a new anime - _logger.LogInformation($"({_apiName}) Adding new {(_animeType == typeof(Episode) ? "series" : "movie")} ({GetAnimeTitle(detectedAnime)}) to user list as watching with a progress of {episodeNumber.Value}"); - response = await _apiCallHelpers.UpdateAnime(detectedAnime.Id, episodeNumber.Value, Status.Watching); - } - if (response == null) { - _logger.LogError($"({_apiName}) Could not update anime status"); + if (response == null) { + _logger.LogError($"({_apiName}) Could not update anime status"); + } } } - } - /// - /// Get further anime seasons. Jellyfin uses numbered seasons whereas MAL uses entirely different entities. - /// - /// - /// - /// - private async Task GetDifferentSeasonAnime(int animeId, int seasonNumber) { - _logger.LogInformation($"({_apiName}) Attempting to get season 1..."); - Anime initialSeason = await _apiCallHelpers.GetAnime(animeId); - - if (initialSeason != null) { - int i = 1; - while (i != seasonNumber) { - RelatedAnime initialSeasonRelatedAnime = initialSeason.RelatedAnime.FirstOrDefault(item => item.RelationType == RelationType.Sequel); - if (initialSeasonRelatedAnime != null) { - _logger.LogInformation($"({_apiName}) Attempting to get season {i + 1}..."); - Anime nextSeason = await _apiCallHelpers.GetAnime(initialSeasonRelatedAnime.Anime.Id); - - if (nextSeason != null) { - initialSeason = nextSeason; + /// + /// Get further anime seasons. Jellyfin uses numbered seasons whereas MAL uses entirely different entities. + /// + /// + /// + /// + private async Task GetDifferentSeasonAnime(int animeId, int seasonNumber) { + _logger.LogInformation($"({_apiName}) Attempting to get season 1..."); + Anime initialSeason = await _apiCallHelpers.GetAnime(animeId); + + if (initialSeason != null) { + int i = 1; + while (i != seasonNumber) { + RelatedAnime initialSeasonRelatedAnime = initialSeason.RelatedAnime.FirstOrDefault(item => item.RelationType == RelationType.Sequel); + if (initialSeasonRelatedAnime != null) { + _logger.LogInformation($"({_apiName}) Attempting to get season {i + 1}..."); + Anime nextSeason = await _apiCallHelpers.GetAnime(initialSeasonRelatedAnime.Anime.Id); + + if (nextSeason != null) { + initialSeason = nextSeason; + } + } else { + _logger.LogInformation($"({_apiName}) Could not find any related anime"); + return null; } - } else { - _logger.LogInformation($"({_apiName}) Could not find any related anime"); - return null; + + i++; } - i++; + return initialSeason; } - return initialSeason; + return null; } - return null; - } - - private async Task GetOva(int animeId, string episodeName) { - Anime anime = await _apiCallHelpers.GetAnime(animeId); - - if (anime != null) { - var listOfRelatedAnime = anime.RelatedAnime.Where(relation => relation.RelationType is RelationType.Side_Story or RelationType.Alternative_Version or RelationType.Alternative_Setting); - foreach (RelatedAnime relatedAnime in listOfRelatedAnime) { - var detailedRelatedAnime = await _apiCallHelpers.GetAnime(relatedAnime.Anime.Id); - if (detailedRelatedAnime is { Title: { }, AlternativeTitles: { En: { } } }) { - if (ContainsExtended(detailedRelatedAnime.Title, episodeName) || - ContainsExtended(detailedRelatedAnime.AlternativeTitles.En, episodeName) || - (detailedRelatedAnime.AlternativeTitles.Ja != null && ContainsExtended(detailedRelatedAnime.AlternativeTitles.Ja, episodeName))) { - // rough match - return detailedRelatedAnime; + private async Task GetOva(int animeId, string episodeName) { + Anime anime = await _apiCallHelpers.GetAnime(animeId); + + if (anime != null) { + var listOfRelatedAnime = anime.RelatedAnime.Where(relation => relation.RelationType is RelationType.Side_Story or RelationType.Alternative_Version or RelationType.Alternative_Setting); + foreach (RelatedAnime relatedAnime in listOfRelatedAnime) { + var detailedRelatedAnime = await _apiCallHelpers.GetAnime(relatedAnime.Anime.Id); + if (detailedRelatedAnime is { Title: { }, AlternativeTitles: { En: { } } }) { + if (ContainsExtended(detailedRelatedAnime.Title, episodeName) || + ContainsExtended(detailedRelatedAnime.AlternativeTitles.En, episodeName) || + (detailedRelatedAnime.AlternativeTitles.Ja != null && ContainsExtended(detailedRelatedAnime.AlternativeTitles.Ja, episodeName))) { + // rough match + return detailedRelatedAnime; + } } } } - } - // no matches - return null; + // no matches + return null; + } } } \ No newline at end of file diff --git a/UserDataServerEntry.cs b/UserDataServerEntry.cs index 9dacf89..459dacd 100644 --- a/UserDataServerEntry.cs +++ b/UserDataServerEntry.cs @@ -14,70 +14,70 @@ using Microsoft.Extensions.Caching.Memory; using Microsoft.Extensions.Logging; -namespace jellyfin_ani_sync; +namespace jellyfin_ani_sync { + public class UserDataServerEntry : IServerEntryPoint { + private readonly IUserDataManager _userDataManager; + private readonly IFileSystem _fileSystem; + private readonly ILibraryManager _libraryManager; + private readonly ILoggerFactory _loggerFactory; + private readonly IHttpContextAccessor _httpContextAccessor; + private readonly IServerApplicationHost _serverApplicationHost; + private readonly IHttpClientFactory _httpClientFactory; + private readonly IMemoryCache _memoryCache; + private readonly IApplicationPaths _applicationPaths; + private readonly ILogger _logger; -public class UserDataServerEntry : IServerEntryPoint { - private readonly IUserDataManager _userDataManager; - private readonly IFileSystem _fileSystem; - private readonly ILibraryManager _libraryManager; - private readonly ILoggerFactory _loggerFactory; - private readonly IHttpContextAccessor _httpContextAccessor; - private readonly IServerApplicationHost _serverApplicationHost; - private readonly IHttpClientFactory _httpClientFactory; - private readonly IMemoryCache _memoryCache; - private readonly IApplicationPaths _applicationPaths; - private readonly ILogger _logger; - - public UserDataServerEntry(IUserDataManager userDataManager, - IFileSystem fileSystem, - ILibraryManager libraryManager, - ILoggerFactory loggerFactory, - IHttpContextAccessor httpContextAccessor, - IServerApplicationHost serverApplicationHost, - IHttpClientFactory httpClientFactory, - IMemoryCache memoryCache, - IApplicationPaths applicationPaths) { - _userDataManager = userDataManager; - _fileSystem = fileSystem; - _libraryManager = libraryManager; - _loggerFactory = loggerFactory; - _logger = loggerFactory.CreateLogger(); - _httpContextAccessor = httpContextAccessor; - _serverApplicationHost = serverApplicationHost; - _httpClientFactory = httpClientFactory; - _memoryCache = memoryCache; - _applicationPaths = applicationPaths; - } - - public Task RunAsync() { - _userDataManager.UserDataSaved += UserDataManagerOnUserDataSaved; - return Task.CompletedTask; - } + public UserDataServerEntry(IUserDataManager userDataManager, + IFileSystem fileSystem, + ILibraryManager libraryManager, + ILoggerFactory loggerFactory, + IHttpContextAccessor httpContextAccessor, + IServerApplicationHost serverApplicationHost, + IHttpClientFactory httpClientFactory, + IMemoryCache memoryCache, + IApplicationPaths applicationPaths) { + _userDataManager = userDataManager; + _fileSystem = fileSystem; + _libraryManager = libraryManager; + _loggerFactory = loggerFactory; + _logger = loggerFactory.CreateLogger(); + _httpContextAccessor = httpContextAccessor; + _serverApplicationHost = serverApplicationHost; + _httpClientFactory = httpClientFactory; + _memoryCache = memoryCache; + _applicationPaths = applicationPaths; + } - private void UserDataManagerOnUserDataSaved(object sender, UserDataSaveEventArgs e) { - if (e.SaveReason == UserDataSaveReason.TogglePlayed && Plugin.Instance.PluginConfiguration.watchedTickboxUpdatesProvider) { - if (!e.UserData.Played || e.Item is not Video) return; - var _ = UpdateJob(e); + public Task RunAsync() { + _userDataManager.UserDataSaved += UserDataManagerOnUserDataSaved; + return Task.CompletedTask; } - } - private async Task UpdateJob(UserDataSaveEventArgs e) { - if (_memoryCache.TryGetValue("lastQuery", out DateTime lastQuery)) { - if ((DateTime.UtcNow - lastQuery).TotalSeconds <= 5) { - Thread.Sleep(5000); - _logger.LogInformation("Too many requests! Waiting 5 seconds..."); + private void UserDataManagerOnUserDataSaved(object sender, UserDataSaveEventArgs e) { + if (e.SaveReason == UserDataSaveReason.TogglePlayed && Plugin.Instance.PluginConfiguration.watchedTickboxUpdatesProvider) { + if (!e.UserData.Played || e.Item is not Video) return; + var _ = UpdateJob(e); } } - _memoryCache.Set("lastQuery", DateTime.UtcNow, new MemoryCacheEntryOptions { - AbsoluteExpirationRelativeToNow = TimeSpan.FromSeconds(5) - }); - UpdateProviderStatus updateProviderStatus = new UpdateProviderStatus(_fileSystem, _libraryManager, _loggerFactory, _httpContextAccessor, _serverApplicationHost, _httpClientFactory, _applicationPaths); - await updateProviderStatus.Update(e.Item, e.UserId, true); - } + private async Task UpdateJob(UserDataSaveEventArgs e) { + if (_memoryCache.TryGetValue("lastQuery", out DateTime lastQuery)) { + if ((DateTime.UtcNow - lastQuery).TotalSeconds <= 5) { + Thread.Sleep(5000); + _logger.LogInformation("Too many requests! Waiting 5 seconds..."); + } + } - public void Dispose() { - _userDataManager.UserDataSaved -= UserDataManagerOnUserDataSaved; - GC.SuppressFinalize(this); + _memoryCache.Set("lastQuery", DateTime.UtcNow, new MemoryCacheEntryOptions { + AbsoluteExpirationRelativeToNow = TimeSpan.FromSeconds(5) + }); + UpdateProviderStatus updateProviderStatus = new UpdateProviderStatus(_fileSystem, _libraryManager, _loggerFactory, _httpContextAccessor, _serverApplicationHost, _httpClientFactory, _applicationPaths); + await updateProviderStatus.Update(e.Item, e.UserId, true); + } + + public void Dispose() { + _userDataManager.UserDataSaved -= UserDataManagerOnUserDataSaved; + GC.SuppressFinalize(this); + } } } \ No newline at end of file