Merge pull request #1216 from ShokoAnime/cached_tmdb

Cache core tmdb tables
ShokoAnime · Jan 5, 2025 · 23061b5 · 23061b5
2 parents 9dfedb0 + 61edd15
commit 23061b5
Show file tree

Hide file tree

Showing 52 changed files with 247 additions and 283 deletions.
diff --git a/Shoko.Server/Providers/TMDB/TmdbImageService.cs b/Shoko.Server/Providers/TMDB/TmdbImageService.cs
@@ -12,6 +12,8 @@
 using Shoko.Plugin.Abstractions.Extensions;
 using Shoko.Server.Models.TMDB;
 using Shoko.Server.Repositories.Cached;
+using Shoko.Server.Repositories.Cached.AniDB;
+using Shoko.Server.Repositories.Cached.TMDB;
 using Shoko.Server.Repositories.Direct;
 using Shoko.Server.Scheduling;
 using Shoko.Server.Scheduling.Jobs.TMDB;

diff --git a/Shoko.Server/Providers/TMDB/TmdbLinkingService.cs b/Shoko.Server/Providers/TMDB/TmdbLinkingService.cs
@@ -10,6 +10,8 @@
 using Shoko.Server.Models.CrossReference;
 using Shoko.Server.Models.TMDB;
 using Shoko.Server.Repositories.Cached;
+using Shoko.Server.Repositories.Cached.AniDB;
+using Shoko.Server.Repositories.Cached.TMDB;
 using Shoko.Server.Repositories.Direct;
 using Shoko.Server.Scheduling;
 using Shoko.Server.Scheduling.Jobs.TMDB;

diff --git a/Shoko.Server/Providers/TMDB/TmdbMetadataService.cs b/Shoko.Server/Providers/TMDB/TmdbMetadataService.cs
@@ -19,7 +19,11 @@
 using Shoko.Server.Models.Interfaces;
 using Shoko.Server.Models.TMDB;
 using Shoko.Server.Repositories.Cached;
+using Shoko.Server.Repositories.Cached.TMDB;
 using Shoko.Server.Repositories.Direct;
+using Shoko.Server.Repositories.Direct.TMDB;
+using Shoko.Server.Repositories.Direct.TMDB.Optional;
+using Shoko.Server.Repositories.Direct.TMDB.Text;
 using Shoko.Server.Scheduling;
 using Shoko.Server.Scheduling.Jobs.TMDB;
 using Shoko.Server.Server;

diff --git a/...ositories/Cached/AniDB_AnimeRepository.cs → ...ies/Cached/AniDB/AniDB_AnimeRepository.cs b/...ositories/Cached/AniDB_AnimeRepository.cs → ...ies/Cached/AniDB/AniDB_AnimeRepository.cs
@@ -1,12 +1,12 @@
-using System;
+#nullable enable
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using NutzCode.InMemoryIndex;
 using Shoko.Server.Databases;
 using Shoko.Server.Models;
 
-#nullable enable
-namespace Shoko.Server.Repositories.Cached;
+namespace Shoko.Server.Repositories.Cached.AniDB;
 
 public class AniDB_AnimeRepository(DatabaseFactory databaseFactory) : BaseCachedRepository<SVR_AniDB_Anime, int>(databaseFactory)
 {

diff --git a/...Cached/AniDB_Anime_CharacterRepository.cs → .../AniDB/AniDB_Anime_CharacterRepository.cs b/...Cached/AniDB_Anime_CharacterRepository.cs → .../AniDB/AniDB_Anime_CharacterRepository.cs
@@ -1,11 +1,11 @@
-using System.Collections.Generic;
+#nullable enable
+using System.Collections.Generic;
 using System.Linq;
 using NutzCode.InMemoryIndex;
 using Shoko.Server.Databases;
 using Shoko.Server.Models.AniDB;
 
-#nullable enable
-namespace Shoko.Server.Repositories.Cached;
+namespace Shoko.Server.Repositories.Cached.AniDB;
 
 public class AniDB_Anime_CharacterRepository(DatabaseFactory databaseFactory) : BaseCachedRepository<AniDB_Anime_Character, int>(databaseFactory)
 {

diff --git a/...niDB_Anime_Character_CreatorRepository.cs → ...niDB_Anime_Character_CreatorRepository.cs b/...niDB_Anime_Character_CreatorRepository.cs → ...niDB_Anime_Character_CreatorRepository.cs
@@ -1,11 +1,11 @@
+#nullable enable
 using System.Collections.Generic;
 using System.Linq;
 using NutzCode.InMemoryIndex;
 using Shoko.Server.Databases;
 using Shoko.Server.Models.AniDB;
 
-#nullable enable
-namespace Shoko.Server.Repositories.Cached;
+namespace Shoko.Server.Repositories.Cached.AniDB;
 
 public class AniDB_Anime_Character_CreatorRepository(DatabaseFactory databaseFactory) : BaseCachedRepository<AniDB_Anime_Character_Creator, int>(databaseFactory)
 {

diff --git a/...d/AniDB_Anime_PreferredImageRepository.cs → ...B/AniDB_Anime_PreferredImageRepository.cs b/...d/AniDB_Anime_PreferredImageRepository.cs → ...B/AniDB_Anime_PreferredImageRepository.cs
@@ -1,13 +1,13 @@
-using System.Collections.Generic;
+#nullable enable
+using System.Collections.Generic;
 using System.Linq;
 using NutzCode.InMemoryIndex;
 using Shoko.Models.Enums;
 using Shoko.Plugin.Abstractions.Enums;
 using Shoko.Server.Databases;
 using Shoko.Server.Models.AniDB;
 
-#nullable enable
-namespace Shoko.Server.Repositories.Cached;
+namespace Shoko.Server.Repositories.Cached.AniDB;
 
 public class AniDB_Anime_PreferredImageRepository(DatabaseFactory databaseFactory) : BaseCachedRepository<AniDB_Anime_PreferredImage, int>(databaseFactory)
 {

diff --git a/...ories/Cached/AniDB_Anime_TagRepository.cs → ...Cached/AniDB/AniDB_Anime_TagRepository.cs b/...ories/Cached/AniDB_Anime_TagRepository.cs → ...Cached/AniDB/AniDB_Anime_TagRepository.cs
@@ -1,11 +1,11 @@
-using System.Collections.Generic;
+#nullable enable
+using System.Collections.Generic;
 using System.Linq;
 using NutzCode.InMemoryIndex;
 using Shoko.Models.Server;
 using Shoko.Server.Databases;
 
-#nullable enable
-namespace Shoko.Server.Repositories.Cached;
+namespace Shoko.Server.Repositories.Cached.AniDB;
 
 public class AniDB_Anime_TagRepository(DatabaseFactory databaseFactory) : BaseCachedRepository<AniDB_Anime_Tag, int>(databaseFactory)
 {

diff --git a/...ies/Cached/AniDB_Anime_TitleRepository.cs → ...ched/AniDB/AniDB_Anime_TitleRepository.cs b/...ies/Cached/AniDB_Anime_TitleRepository.cs → ...ched/AniDB/AniDB_Anime_TitleRepository.cs
@@ -1,13 +1,13 @@
-using System.Collections.Generic;
+#nullable enable
+using System.Collections.Generic;
 using System.Linq;
 using NutzCode.InMemoryIndex;
 using Shoko.Commons.Properties;
 using Shoko.Server.Databases;
 using Shoko.Server.Models;
 using Shoko.Server.Server;
 
-#nullable enable
-namespace Shoko.Server.Repositories.Cached;
+namespace Shoko.Server.Repositories.Cached.AniDB;
 
 public class AniDB_Anime_TitleRepository(DatabaseFactory databaseFactory) : BaseCachedRepository<SVR_AniDB_Anime_Title, int>(databaseFactory)
 {

diff --git a/...ories/Cached/AniDB_CharacterRepository.cs → ...Cached/AniDB/AniDB_CharacterRepository.cs b/...ories/Cached/AniDB_CharacterRepository.cs → ...Cached/AniDB/AniDB_CharacterRepository.cs
@@ -1,12 +1,12 @@
+#nullable enable
 using System.Collections.Generic;
 using System.Linq;
 using NutzCode.InMemoryIndex;
 using Shoko.Commons.Extensions;
 using Shoko.Server.Databases;
 using Shoko.Server.Models.AniDB;
 
-#nullable enable
-namespace Shoko.Server.Repositories.Cached;
+namespace Shoko.Server.Repositories.Cached.AniDB;
 
 public class AniDB_CharacterRepository(DatabaseFactory databaseFactory) : BaseCachedRepository<AniDB_Character, int>(databaseFactory)
 {

diff --git a/...itories/Cached/AniDB_CreatorRepository.cs → ...s/Cached/AniDB/AniDB_CreatorRepository.cs b/...itories/Cached/AniDB_CreatorRepository.cs → ...s/Cached/AniDB/AniDB_CreatorRepository.cs
@@ -1,10 +1,10 @@
+#nullable enable
 using System.Linq;
 using NutzCode.InMemoryIndex;
-using Shoko.Server.Models.AniDB;
 using Shoko.Server.Databases;
+using Shoko.Server.Models.AniDB;
 
-#nullable enable
-namespace Shoko.Server.Repositories.Cached;
+namespace Shoko.Server.Repositories.Cached.AniDB;
 
 public class AniDB_CreatorRepository(DatabaseFactory databaseFactory) : BaseCachedRepository<AniDB_Creator, int>(databaseFactory)
 {

diff --git a/...itories/Cached/AniDB_EpisodeRepository.cs → ...s/Cached/AniDB/AniDB_EpisodeRepository.cs b/...itories/Cached/AniDB_EpisodeRepository.cs → ...s/Cached/AniDB/AniDB_EpisodeRepository.cs
@@ -1,4 +1,5 @@
-using System;
+#nullable enable
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using NutzCode.InMemoryIndex;
@@ -7,8 +8,7 @@
 using Shoko.Server.Databases;
 using Shoko.Server.Models;
 
-#nullable enable
-namespace Shoko.Server.Repositories.Cached;
+namespace Shoko.Server.Repositories.Cached.AniDB;
 
 public class AniDB_EpisodeRepository(DatabaseFactory databaseFactory) : BaseCachedRepository<SVR_AniDB_Episode, int>(databaseFactory)
 {

diff --git a/...AniDB_Episode_PreferredImageRepository.cs → ...AniDB_Episode_PreferredImageRepository.cs b/...AniDB_Episode_PreferredImageRepository.cs → ...AniDB_Episode_PreferredImageRepository.cs
@@ -1,3 +1,4 @@
+#nullable enable
 using System.Collections.Generic;
 using System.Linq;
 using NutzCode.InMemoryIndex;
@@ -6,8 +7,7 @@
 using Shoko.Server.Databases;
 using Shoko.Server.Models.AniDB;
 
-#nullable enable
-namespace Shoko.Server.Repositories.Cached;
+namespace Shoko.Server.Repositories.Cached.AniDB;
 
 public class AniDB_Episode_PreferredImageRepository(DatabaseFactory databaseFactory) : BaseCachedRepository<AniDB_Episode_PreferredImage, int>(databaseFactory)
 {

diff --git a/...s/Cached/AniDB_Episode_TitleRepository.cs → ...ed/AniDB/AniDB_Episode_TitleRepository.cs b/...s/Cached/AniDB_Episode_TitleRepository.cs → ...ed/AniDB/AniDB_Episode_TitleRepository.cs
@@ -1,12 +1,12 @@
-using System.Collections.Generic;
+#nullable enable
+using System.Collections.Generic;
 using System.Linq;
 using NutzCode.InMemoryIndex;
 using Shoko.Plugin.Abstractions.DataModels;
 using Shoko.Server.Databases;
 using Shoko.Server.Models;
 
-#nullable enable
-namespace Shoko.Server.Repositories.Cached;
+namespace Shoko.Server.Repositories.Cached.AniDB;
 
 public class AniDB_Episode_TitleRepository(DatabaseFactory databaseFactory) : BaseCachedRepository<SVR_AniDB_Episode_Title, int>(databaseFactory)
 {

diff --git a/...positories/Cached/AniDB_FileRepository.cs → ...ries/Cached/AniDB/AniDB_FileRepository.cs b/...positories/Cached/AniDB_FileRepository.cs → ...ries/Cached/AniDB/AniDB_FileRepository.cs
@@ -1,16 +1,15 @@
-using System.Collections.Generic;
+#nullable enable
+using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
-using NLog;
 using NutzCode.InMemoryIndex;
 using Shoko.Server.Databases;
 using Shoko.Server.Models;
 using Shoko.Server.Scheduling;
 using Shoko.Server.Scheduling.Jobs.Actions;
 
-#nullable enable
-namespace Shoko.Server.Repositories.Cached;
+namespace Shoko.Server.Repositories.Cached.AniDB;
 
 public class AniDB_FileRepository(ILogger<AniDB_FileRepository> logger, JobFactory jobFactory, DatabaseFactory databaseFactory) : BaseCachedRepository<SVR_AniDB_File, int>(databaseFactory)
 {

diff --git a/...es/Cached/AniDB_ReleaseGroupRepository.cs → ...hed/AniDB/AniDB_ReleaseGroupRepository.cs b/...es/Cached/AniDB_ReleaseGroupRepository.cs → ...hed/AniDB/AniDB_ReleaseGroupRepository.cs
@@ -9,7 +9,7 @@
 
 #pragma warning disable CS8618
 #nullable enable
-namespace Shoko.Server.Repositories.Cached;
+namespace Shoko.Server.Repositories.Cached.AniDB;
 
 public class AniDB_ReleaseGroupRepository(DatabaseFactory databaseFactory) : BaseCachedRepository<AniDB_ReleaseGroup, int>(databaseFactory)
 {

diff --git a/...epositories/Cached/AniDB_TagRepository.cs → ...ories/Cached/AniDB/AniDB_TagRepository.cs b/...epositories/Cached/AniDB_TagRepository.cs → ...ories/Cached/AniDB/AniDB_TagRepository.cs
@@ -1,12 +1,12 @@
-using System.Collections.Generic;
+#nullable enable
+using System.Collections.Generic;
 using System.Linq;
 using NutzCode.InMemoryIndex;
 using Shoko.Commons.Extensions;
 using Shoko.Models.Server;
 using Shoko.Server.Databases;
 
-#nullable enable
-namespace Shoko.Server.Repositories.Cached;
+namespace Shoko.Server.Repositories.Cached.AniDB;
 
 public class AniDB_TagRepository(DatabaseFactory databaseFactory) : BaseCachedRepository<AniDB_Tag, int>(databaseFactory)
 {

diff --git a/...positories/Cached/AniDB_VoteRepository.cs → ...ries/Cached/AniDB/AniDB_VoteRepository.cs b/...positories/Cached/AniDB_VoteRepository.cs → ...ries/Cached/AniDB/AniDB_VoteRepository.cs
@@ -1,4 +1,4 @@
-using System;
+#nullable enable
 using System.Collections.Generic;
 using System.Linq;
 using NutzCode.InMemoryIndex;
@@ -8,8 +8,7 @@
 using Shoko.Server.Scheduling;
 using Shoko.Server.Scheduling.Jobs.Actions;
 
-#nullable enable
-namespace Shoko.Server.Repositories.Cached;
+namespace Shoko.Server.Repositories.Cached.AniDB;
 
 public class AniDB_VoteRepository : BaseCachedRepository<AniDB_Vote, int>
 {

diff --git a/Shoko.Server/Repositories/Cached/TMDB/TMDB_EpisodeRepository.cs b/Shoko.Server/Repositories/Cached/TMDB/TMDB_EpisodeRepository.cs
@@ -0,0 +1,42 @@
+#nullable enable
+using System.Collections.Generic;
+using System.Linq;
+using NutzCode.InMemoryIndex;
+using Shoko.Server.Databases;
+using Shoko.Server.Models.TMDB;
+
+namespace Shoko.Server.Repositories.Cached.TMDB;
+
+public class TMDB_EpisodeRepository : BaseCachedRepository<TMDB_Episode, int>
+{
+    protected override int SelectKey(TMDB_Episode entity) => entity.Id;
+    private PocoIndex<int, TMDB_Episode, int> _showIDs = null!;
+    private PocoIndex<int, TMDB_Episode, int> _seasonIDs = null!;
+    private PocoIndex<int, TMDB_Episode, int> _episodeIDs = null!;
+
+    public override void PopulateIndexes()
+    {
+        _showIDs = Cache.CreateIndex(a => a.TmdbShowID);
+        _seasonIDs = Cache.CreateIndex(a => a.TmdbSeasonID);
+        _episodeIDs = Cache.CreateIndex(a => a.TmdbEpisodeID);
+    }
+
+    public IReadOnlyList<TMDB_Episode> GetByTmdbShowID(int showId)
+    {
+        return _showIDs.GetMultiple(showId).OrderBy(a => a.EpisodeNumber).ToList();
+    }
+
+    public IReadOnlyList<TMDB_Episode> GetByTmdbSeasonID(int seasonId)
+    {
+        return _seasonIDs.GetMultiple(seasonId).OrderBy(a => a.EpisodeNumber).ToList();
+    }
+
+    public TMDB_Episode? GetByTmdbEpisodeID(int episodeId)
+    {
+        return _episodeIDs.GetOne(episodeId);
+    }
+
+    public TMDB_EpisodeRepository(DatabaseFactory databaseFactory) : base(databaseFactory)
+    {
+    }
+}
diff --git a/...positories/Cached/TMDB_ImageRepository.cs → ...ories/Cached/TMDB/TMDB_ImageRepository.cs b/...positories/Cached/TMDB_ImageRepository.cs → ...ories/Cached/TMDB/TMDB_ImageRepository.cs
@@ -1,3 +1,4 @@
+#nullable enable
 using System.Collections.Generic;
 using System.Linq;
 using NutzCode.InMemoryIndex;
@@ -6,8 +7,7 @@
 using Shoko.Server.Models.TMDB;
 using Shoko.Server.Server;
 
-#nullable enable
-namespace Shoko.Server.Repositories.Cached;
+namespace Shoko.Server.Repositories.Cached.TMDB;
 
 public class TMDB_ImageRepository(DatabaseFactory databaseFactory) : BaseCachedRepository<TMDB_Image, int>(databaseFactory)
 {

diff --git a/Shoko.Server/Repositories/Cached/TMDB/TMDB_MovieRepository.cs b/Shoko.Server/Repositories/Cached/TMDB/TMDB_MovieRepository.cs
@@ -0,0 +1,37 @@
+#nullable enable
+using System.Collections.Generic;
+using System.Linq;
+using NutzCode.InMemoryIndex;
+using Shoko.Server.Databases;
+using Shoko.Server.Models.TMDB;
+
+namespace Shoko.Server.Repositories.Cached.TMDB;
+
+public class TMDB_MovieRepository : BaseCachedRepository<TMDB_Movie, int>
+{
+    protected override int SelectKey(TMDB_Movie entity) => entity.Id;
+    private PocoIndex<int, TMDB_Movie, int> _movieIDs = null!;
+    private PocoIndex<int, TMDB_Movie, int?> _collectionIDs = null!;
+
+    public override void PopulateIndexes()
+    {
+        _movieIDs = Cache.CreateIndex(a => a.TmdbMovieID);
+        _collectionIDs = Cache.CreateIndex(a => a.TmdbCollectionID);
+    }
+
+    public TMDB_Movie? GetByTmdbMovieID(int tmdbMovieId)
+    {
+        return _movieIDs.GetOne(tmdbMovieId);
+    }
+
+    public IReadOnlyList<TMDB_Movie> GetByTmdbCollectionID(int tmdbCollectionId)
+    {
+        return _collectionIDs.GetMultiple(tmdbCollectionId).OrderBy(a => a.EnglishTitle)
+            .ThenBy(a => a.TmdbMovieID)
+            .ToList();
+    }
+
+    public TMDB_MovieRepository(DatabaseFactory databaseFactory) : base(databaseFactory)
+    {
+    }
+}
diff --git a/Shoko.Server/Repositories/Cached/TMDB/TMDB_SeasonRepository.cs b/Shoko.Server/Repositories/Cached/TMDB/TMDB_SeasonRepository.cs
@@ -0,0 +1,38 @@
+#nullable enable
+using System.Collections.Generic;
+using System.Linq;
+using NutzCode.InMemoryIndex;
+using Shoko.Server.Databases;
+using Shoko.Server.Models.TMDB;
+
+namespace Shoko.Server.Repositories.Cached.TMDB;
+
+public class TMDB_SeasonRepository : BaseCachedRepository<TMDB_Season, int>
+{
+    protected override int SelectKey(TMDB_Season entity) => entity.Id;
+    private PocoIndex<int, TMDB_Season, int> _showIDs = null!;
+    private PocoIndex<int, TMDB_Season, int> _seasonIDs = null!;
+
+    public override void PopulateIndexes()
+    {
+        _showIDs = Cache.CreateIndex(a => a.TmdbShowID);
+        _seasonIDs = Cache.CreateIndex(a => a.TmdbSeasonID);
+    }
+
+    public IReadOnlyList<TMDB_Season> GetByTmdbShowID(int tmdbShowId)
+    {
+        return _showIDs.GetMultiple(tmdbShowId)
+            .OrderBy(e => e.SeasonNumber == 0)
+            .ThenBy(e => e.SeasonNumber)
+            .ToList();
+    }
+
+    public TMDB_Season? GetByTmdbSeasonID(int tmdbSeasonId)
+    {
+        return _seasonIDs.GetOne(tmdbSeasonId);
+    }
+
+    public TMDB_SeasonRepository(DatabaseFactory databaseFactory) : base(databaseFactory)
+    {
+    }
+}