Use Arrays instead regex string to check if its Anime/Donghua/Aeni

nattadasu · Dec 3, 2024 · 569255a · 569255a
1 parent a22f84a
commit 569255a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/modules/common_movie.groovy b/modules/common_movie.groovy
@@ -2,12 +2,11 @@
 @./r18_checker.groovy
 {
     // check Country of Origin
-    def cjk_countries = /(CN|JP|KR|KP|TW|HK)/
-    def cjkani_tags = /(aeni|donghua|anime)/
-    def is_anime = anime || info.Keywords =~ cjkani_tags || any {(genres =~ /Animation/ && country =~ cjk_countries)}{false} ? true : false
-
+    def cjk_countries = ["CN", "JP", "KR", "KP", "TW", "HK"]
+    def cjkani_tags = ["aeni", "donghua", "anime"]
+    def is_cjk = any { anime } { info.Keywords.findAll { it in cjkani_tags } } { cjk_countries.contains(country) } { false }
     // Categorized path
-    is_anime ? "Anime Movies/" : "Movies/"
+    is_cjk && genres =~ /Animation/ ? "Anime Movies/" : "Movies/"
 }
 @./medianame.groovy
 {" ("}{y}{") [tmdbid-"}{tmdbid}{"]/"}

diff --git a/modules/common_tv.groovy b/modules/common_tv.groovy
@@ -2,12 +2,11 @@
 @./r18_checker.groovy
 {
     // check Country of Origin
-    def cjk_countries = /(CN|JP|KR|KP|TW|HK)/
-    def cjkani_tags = /(aeni|donghua|anime)/
-    def is_anime = anime || info.Keywords =~ cjkani_tags || (genres =~ /Animation/ && country =~ cjk_countries) ? true : false
-
+    def cjk_countries = ["CN", "JP", "KR", "KP", "TW", "HK"]
+    def cjkani_tags = ["aeni", "donghua", "anime"]
+    def is_cjk = any { anime } { info.Keywords.findAll { it in cjkani_tags } } { cjk_countries.contains(country) } { false }
     // Categorized path
-    is_anime ? "Anime/" : "TV Series/"
+    is_cjk && genres =~ /Animation/ ? "Anime/" : "TV Series/"
 }
 @./medianame.groovy
 @./forceshowid_tv.groovy