Fix Some Errors in Filtering

Author: da3dsoul

Shoko.Server/API/v2/Models/common/Filter.cs

@@ -47,58 +47,53 @@ internal static Filter GenerateFromGroupFilter(HttpContext ctx, FilterPreset gf,
             evaluatedResults = evaluator.EvaluateFilter(gf, uid).ToList();
         }
 
-        if (evaluatedResults.Count != 0)
+        if (evaluatedResults.Count == 0)
         {
-            filter.size = evaluatedResults.Count;
+            filter.viewed = 0;
+            filter.url = APIV2Helper.ConstructFilterIdUrl(ctx, filter.id);
 
-            // Populate Random Art
+            return filter;
+        }
 
-            List<SVR_AnimeSeries>? arts = null;
-            var seriesList = evaluatedResults.SelectMany(a => a).Select(RepoFactory.AnimeSeries.GetByID).WhereNotNull().ToList();
-            var groupsList = evaluatedResults.Select(r => RepoFactory.AnimeGroup.GetByID(r.Key)).WhereNotNull().ToList();
-            if (pic == 1)
-            {
-                arts = seriesList.Where(SeriesHasArt).ToList();
+        filter.size = evaluatedResults.Count;
 
-                if (arts.Count == 0)
-                {
-                    arts = seriesList;
-                }
-            }
+        // Populate Random Art
+        List<SVR_AnimeSeries>? arts = null;
+        var seriesList = evaluatedResults.SelectMany(a => a).Select(RepoFactory.AnimeSeries.GetByID).WhereNotNull().ToList();
+        var groupsList = evaluatedResults.Select(r => RepoFactory.AnimeGroup.GetByID(r.Key)).Where(a => a is { AnimeGroupParentID: null }).ToList();
+        if (pic == 1)
+        {
+            arts = seriesList.Where(SeriesHasArt).ToList();
+
+            if (arts.Count == 0) arts = seriesList;
+        }
 
-            if (arts?.Count > 0)
+        if (arts?.Count > 0)
+        {
+            var rand = new Random();
+            var anime = arts[rand.Next(arts.Count)];
+            var backdrops = anime.GetImages(ImageEntityType.Backdrop);
+            if (backdrops.Count > 0)
             {
-                var rand = new Random();
-                var anime = arts[rand.Next(arts.Count)];
-                var backdrops = anime.GetImages(ImageEntityType.Backdrop);
-                if (backdrops.Count > 0)
+                var backdrop = backdrops[rand.Next(backdrops.Count)];
+                filter.art.fanart.Add(new Art
                 {
-                    var backdrop = backdrops[rand.Next(backdrops.Count)];
-                    filter.art.fanart.Add(new Art
-                    {
-                        index = 0,
-                        url = APIHelper.ConstructImageLinkFromTypeAndId(ctx, backdrop.ImageType, backdrop.Source, backdrop.ID),
-                    });
-                }
-
-                filter.art.thumb.Add(new Art
-                {
-                    index = 0,
-                    url = APIHelper.ConstructImageLinkFromTypeAndId(ctx, ImageEntityType.Poster, DataSourceEnum.AniDB, anime.AniDB_ID),
+                    index = 0, url = APIHelper.ConstructImageLinkFromTypeAndId(ctx, backdrop.ImageType, backdrop.Source, backdrop.ID),
                 });
             }
 
-            if (level > 0)
-            {
-                groups.AddRange(groupsList.Select(ag => Group.GenerateFromAnimeGroup(ctx, ag, uid, noCast, noTag, level - 1, all, filter.id, allPic, pic, tagFilter, evaluatedResults?.FirstOrDefault(a => a.Key == ag.AnimeGroupID)?.ToList())));
-            }
-
-            if (groups.Count > 0)
+            filter.art.thumb.Add(new Art
             {
-                filter.groups = groups;
-            }
+                index = 0, url = APIHelper.ConstructImageLinkFromTypeAndId(ctx, ImageEntityType.Poster, DataSourceEnum.AniDB, anime.AniDB_ID),
+            });
         }
 
+        if (level > 0)
+            groups.AddRange(groupsList.Select(ag => Group.GenerateFromAnimeGroup(ctx, ag, uid, noCast, noTag, level - 1, all, filter.id, allPic, pic, tagFilter,
+                evaluatedResults?.FirstOrDefault(a => a.Key == ag.AnimeGroupID)?.ToList())));
+
+        if (groups.Count > 0) filter.groups = groups;
+
         filter.viewed = 0;
         filter.url = APIV2Helper.ConstructFilterIdUrl(ctx, filter.id);
 

Shoko.Server/API/v3/Controllers/TreeController.cs

@@ -175,10 +175,9 @@ public ActionResult<ListResult<Group>> GetFilteredGroups([FromRoute, Range(0, in
             if (!results.Any()) return new ListResult<Group>();
 
             groups = results
-                .Select(group => RepoFactory.AnimeGroup.GetByID(group.Key)?.TopLevelAnimeGroup)
-                .WhereNotNull()
-                .DistinctBy(group => group.AnimeGroupID)
-                .Where(group => includeEmpty || group.AllSeries.Any(s => s.AnimeEpisodes.Any(e => e.VideoLocals.Count > 0)));
+                .Select(group => RepoFactory.AnimeGroup.GetByID(group.Key))
+                .Where(group => group is { AnimeGroupParentID: null } &&
+                                (includeEmpty || group.AllSeries.Any(s => s.AnimeEpisodes.Any(e => e.VideoLocals.Count > 0))));
         }
 
         if (orderByName)

Shoko.Server/API/v3/Helpers/FilterFactory.cs

@@ -59,7 +59,8 @@ public Filter GetFilter(FilterPreset groupFilter, bool fullModel = false)
 
         filter.Size = filter.IsDirectory
             ? RepoFactory.FilterPreset.GetByParentID(groupFilter.FilterPresetID).Count
-            : _evaluator.EvaluateFilter(groupFilter, user?.JMMUserID).Count();
+            // Only count top level groups
+            : _evaluator.EvaluateFilter(groupFilter, user?.JMMUserID).Count(a => RepoFactory.AnimeGroup.GetByID(a.Key)?.AnimeGroupParentID == null);
         return filter;
     }