cardigannIndexer and assorted yml: genre fixups

handle genre with spaces
Jackett · Aug 6, 2022 · 8865d66 · 8865d66
1 parent 844d159
commit 8865d66
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 10 deletions.
diff --git a/src/Jackett.Common/Definitions/chilebt.yml b/src/Jackett.Common/Definitions/chilebt.yml
@@ -128,8 +128,10 @@ search:
     genre:
       selector: td:nth-last-child(6)
       filters:
+        - name: re_replace
+          args: ["(?i)(Science Fiction)", "Science_Fiction"]
         - name: validate
-          args: "Action, Adventure, Animation, Biography, Comedy, Crime, Documentary, Drama, Family, Fantasy, Game-Show, History, Horror, Music, Musical, Mystery, News, Reality-TV, Romance, Science Fiction, Sitcom, Sport, Talk-Show, Thriller, War, Western"
+          args: "Action, Adventure, Animation, Biography, Comedy, Crime, Documentary, Drama, Family, Fantasy, Game-Show, History, Horror, Music, Musical, Mystery, News, Reality-TV, Romance, Science_Fiction, Sitcom, Sport, Talk-Show, Thriller, War, Western"
     description:
       text: "{{ .Result.genre }}"
     size:

diff --git a/src/Jackett.Common/Definitions/esharenet.yml b/src/Jackett.Common/Definitions/esharenet.yml
@@ -148,8 +148,10 @@ search:
       filters:
         - name: replace
           args: ["\n", ""]
+        - name: re_replace
+          args: ["(?i)(Science Fiction)", "Science_Fiction"]
         - name: validate
-          args: "Action, Adventure, Animation, Biography, Comedy, Crime, Documentary, Drama, Family, Fantasy, Game-Show, History, Horror, Music, Musical, Mystery, News, Reality-TV, Romance, Science Fiction, Sitcom, Sport, Talk-Show, Thriller, War, Western"
+          args: "Action, Adventure, Animation, Biography, Comedy, Crime, Documentary, Drama, Family, Fantasy, Game-Show, History, Horror, Music, Musical, Mystery, News, Reality-TV, Romance, Science_Fiction, Sitcom, Sport, Talk-Show, Thriller, War, Western"
     description:
       text: "{{ .Result.genre }}"
     size:

diff --git a/src/Jackett.Common/Definitions/immortuos.yml b/src/Jackett.Common/Definitions/immortuos.yml
@@ -129,8 +129,10 @@ search:
       filters:
         - name: replace
           args: ["\n", ""]
+        - name: re_replace
+          args: ["(?i)(Science Fiction)", "Science_Fiction"]
         - name: validate
-          args: "Action, Adventure, Animation, Biography, Comedy, Crime, Documentary, Drama, Family, Fantasy, Game-Show, History, Horror, Music, Musical, Mystery, News, Reality-TV, Romance, Science Fiction, Sitcom, Sport, Talk-Show, Thriller, War, Western"
+          args: "Action, Adventure, Animation, Biography, Comedy, Crime, Documentary, Drama, Family, Fantasy, Game-Show, History, Horror, Music, Musical, Mystery, News, Reality-TV, Romance, Science_Fiction, Sitcom, Sport, Talk-Show, Thriller, War, Western"
     description:
       text: "{{ .Result.genre }}"
     size:

diff --git a/src/Jackett.Common/Definitions/theshinning.yml b/src/Jackett.Common/Definitions/theshinning.yml
@@ -125,10 +125,14 @@ search:
         - name: replace
           args: ["https://images.weserv.nl/?url=https://theshinning.me/img/nocover.png&w=180&h=270", ""]
     genre:
-      selector: td:nth-last-child(11)
+      selector: td:nth-last-child(10)
       filters:
+        - name: replace
+          args: ["\n", ""]
+        - name: re_replace
+          args: ["(?i)(Science Fiction)", "Science_Fiction"]
         - name: validate
-          args: "Action, Adventure, Animation, Biography, Comedy, Crime, Documentary, Drama, Family, Fantasy, Game-Show, History, Horror, Music, Musical, Mystery, News, Reality-TV, Romance, Science Fiction, Sitcom, Sport, Talk-Show, Thriller, War, Western"
+          args: "Action, Adventure, Animation, Biography, Comedy, Crime, Documentary, Drama, Family, Fantasy, Game-Show, History, Horror, Music, Musical, Mystery, News, Reality-TV, Romance, Science_Fiction, Sitcom, Sport, Talk-Show, Thriller, War, Western"
     description:
       text: "{{ .Result.genre }}"
     imdbid:

diff --git a/src/Jackett.Common/Definitions/torrentdb.yml b/src/Jackett.Common/Definitions/torrentdb.yml
@@ -111,8 +111,10 @@ search:
     genre:
       selector: td:nth-child(2)
       filters:
+        - name: re_replace
+          args: ["(?i)(Science Fiction)", "Science_Fiction"]
         - name: validate
-          args: "Action, Adventure, Animation, Biography, Comedy, Crime, Documentary, Drama, Family, Fantasy, Game-Show, History, Horror, Music, Musical, Mystery, News, Reality-TV, Romance, Science Fiction, Sitcom, Sport, Talk-Show, Thriller, War, Western"
+          args: "Action, Adventure, Animation, Biography, Comedy, Crime, Documentary, Drama, Family, Fantasy, Game-Show, History, Horror, Music, Musical, Mystery, News, Reality-TV, Romance, Science_Fiction, Sitcom, Sport, Talk-Show, Thriller, War, Western"
     description:
       text: "{{ .Result.genre }}"
     date:

diff --git a/src/Jackett.Common/Definitions/torrentmasters.yml b/src/Jackett.Common/Definitions/torrentmasters.yml
@@ -171,6 +171,9 @@ search:
     genre:
       selector: td:nth-child(3)
       remove: a, font
+      filters:
+        - name: replace
+          args: ["/xA", ""]
     description:
       text: "{{ .Result.title_hungarian }}{{ if and .Result.title_hungarian .Result.genre }}<br>{{ else }}{{ end }}{{ .Result.genre }}"
     minimumratio:

diff --git a/src/Jackett.Common/Definitions/tvchaosuk.yml b/src/Jackett.Common/Definitions/tvchaosuk.yml
@@ -132,8 +132,10 @@ search:
       filters:
         - name: replace
           args: ["\n", ""]
+        - name: re_replace
+          args: ["(?i)(Science Fiction)", "Science_Fiction"]
         - name: validate
-          args: "Action, Adventure, Animation, Biography, Comedy, Crime, Documentary, Drama, Family, Fantasy, Game-Show, History, Horror, Music, Musical, Mystery, News, Reality-TV, Romance, Science Fiction, Sitcom, Sport, Talk-Show, Thriller, War, Western"
+          args: "Action, Adventure, Animation, Biography, Comedy, Crime, Documentary, Drama, Family, Fantasy, Game-Show, History, Horror, Music, Musical, Mystery, News, Reality-TV, Romance, Science_Fiction, Sitcom, Sport, Talk-Show, Thriller, War, Western"
     description:
       text: "{{ .Result.genre }}"
     size:

diff --git a/src/Jackett.Common/Indexers/CardigannIndexer.cs b/src/Jackett.Common/Indexers/CardigannIndexer.cs
@@ -1135,7 +1135,7 @@ protected string applyFilters(string Data, List<filterBlock> Filters, Dictionary
                         var argsList = args.ToLower().Split(delimiters, System.StringSplitOptions.RemoveEmptyEntries);
                         var validList = argsList.ToList();
                         var validIntersect = validList.Intersect(Data.ToLower().Split(delimiters, System.StringSplitOptions.RemoveEmptyEntries)).ToList();
-                        Data = string.Join(", ", validIntersect);
+                        Data = string.Join(",", validIntersect);
                         break;
                     default:
                         break;
@@ -2093,8 +2093,10 @@ private string ParseFields(string value, string FieldName, ReleaseInfo release,
                     if (release.Genres == null)
                         release.Genres = new List<string>();
                     char[] delimiters = { ',', ' ', '/', ')', '(', '.', ';', '[', ']', '"', '|', ':' };
-                    release.Genres = release.Genres.Union(value.Split(delimiters, System.StringSplitOptions.RemoveEmptyEntries)).ToList();
-                    value = string.Join(", ", release.Genres);
+                    var releaseGenres = release.Genres.Union(value.Split(delimiters, System.StringSplitOptions.RemoveEmptyEntries));
+                    releaseGenres = releaseGenres.Select(x => x.Replace("_", " "));
+                    release.Genres = releaseGenres.ToList();
+                    value = string.Join(",", release.Genres);
                     break;
                 case "year":
                     release.Year = ReleaseInfo.GetBytes(value);