Improve Speed of retrieving multiple files

ShokoAnime · Apr 16, 2017 · 9863796 · 9863796
1 parent 012b2dc
commit 9863796
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 15 deletions.
diff --git a/Shoko.Server/API/v2/Modules/Common.cs b/Shoko.Server/API/v2/Modules/Common.cs
@@ -881,14 +881,17 @@ private object GetMultipleFiles()
             Dictionary<int,Serie> results = new Dictionary<int, Serie>();
             try
             {
-                foreach (SVR_AnimeEpisode ep in RepoFactory.AnimeEpisode.GetEpisodesWithMultipleFiles(true))
+                List<SVR_AnimeEpisode> list = RepoFactory.AnimeEpisode.GetEpisodesWithMultipleFiles(true);
+                foreach(SVR_AnimeEpisode ep in list)
                 {
                     Serie serie = null;
                     SVR_AnimeSeries series = ep.GetAnimeSeries();
                     if (results.ContainsKey(series.AnimeSeriesID)) serie = results[series.AnimeSeriesID];
                     if (serie == null)
                         serie =
-                            Serie.GenerateFromAnimeSeries(Context, series, userID, para.nocast == 1, para.notag == 1, 0, false);
+                            Serie.GenerateFromAnimeSeries(Context, series, userID, para.nocast == 1,
+                                para.notag == 1, 0,
+                                false);
                     if (serie.eps == null) serie.eps = new List<Episode>();
                     Episode episode = Episode.GenerateFromAnimeEpisode(Context, ep, userID, 0);
                     List<SVR_VideoLocal> vls = ep.GetVideoLocals();

diff --git a/Shoko.Server/Repositories/Cached/AnimeEpisodeRepository.cs b/Shoko.Server/Repositories/Cached/AnimeEpisodeRepository.cs
@@ -5,6 +5,7 @@
 using Shoko.Models.Server;
 using NHibernate;
 using NutzCode.InMemoryIndex;
+using Shoko.Server.Databases;
 using Shoko.Server.Models;
 using Shoko.Server.PlexAndKodi;
 
@@ -151,19 +152,17 @@ public List<SVR_AnimeEpisode> GetByHash(string hash)
 
         public List<SVR_AnimeEpisode> GetEpisodesWithMultipleFiles(bool ignoreVariations)
         {
-            List<string> hashes = ignoreVariations
-                ? RepoFactory.VideoLocal.GetAll()
-                    .Where(a => a.IsVariation == 0)
-                    .Select(a => a.Hash)
-                    .Where(a => a != string.Empty)
-                    .ToList()
-                : RepoFactory.VideoLocal.GetAll().Select(a => a.Hash).Where(a => a != string.Empty).ToList();
-            return RepoFactory.CrossRef_File_Episode.GetAll()
-                .Where(a => hashes.Contains(a.Hash))
-                .GroupBy(a => a.EpisodeID)
-                .Where(a => a.Count() > 1)
-                .Select(a => GetByAniDBEpisodeID(a.Key))
-                .ToList();
+            string ignoreVariationsQuery =
+                @"SELECT ani.EpisodeID FROM VideoLocal AS vl JOIN CrossRef_File_Episode ani ON vl.Hash = ani.Hash WHERE vl.IsVariation = 0 AND vl.Hash != '' GROUP BY ani.EpisodeID HAVING COUNT(ani.EpisodeID) > 1";
+            string countVariationsQuery =
+                @"SELECT ani.EpisodeID FROM VideoLocal AS vl JOIN CrossRef_File_Episode ani ON vl.Hash = ani.Hash WHERE vl.Hash != '' GROUP BY ani.EpisodeID HAVING COUNT(ani.EpisodeID) > 1";
+            using (var session = DatabaseFactory.SessionFactory.OpenSession())
+            {
+                IList<int> ids = ignoreVariations
+                    ? session.CreateSQLQuery(ignoreVariationsQuery).List<int>()
+                    : session.CreateSQLQuery(countVariationsQuery).List<int>();
+                return ids.Select(GetByAniDBEpisodeID).ToList();
+            }
             /*
 
             using (var session = JMMService.SessionFactory.OpenSession())