chore(starr): Improve streaming service CFs (#1992)

TRaSH-Guides · Jun 29, 2024 · 28cf570 · 28cf570
1 parent c9a9b8e
commit 28cf570
Show file tree

Hide file tree

Showing 51 changed files with 161 additions and 140 deletions.
diff --git a/docs/json/radarr/cf/atvp.json b/docs/json/radarr/cf/atvp.json
@@ -9,7 +9,7 @@
       "negate": false,
       "required": true,
       "fields": {
-        "value": "\\b(atvp|aptv|Apple TV\\+)\\b"
+        "value": "\\b((atvp|aptv)\\b|Apple[ ._-]TV\\+)[ ._-]web[ ._-]?(dl|rip)?\\b"
       }
     },
     {

diff --git a/docs/json/radarr/cf/crav.json b/docs/json/radarr/cf/crav.json
@@ -1,6 +1,6 @@
 {
   "trash_id": "f6ff65b3f4b464a79dcc75950fe20382",
-  "trash_regex": "https://regex101.com/r/eymcie/1",
+  "trash_regex": "https://regex101.com/r/eymcie/latest",
   "name": "CRAV",
   "includeCustomFormatWhenRenaming": true,
   "specifications": [

diff --git a/docs/json/radarr/cf/dsnp.json b/docs/json/radarr/cf/dsnp.json
@@ -9,7 +9,7 @@
       "negate": false,
       "required": true,
       "fields": {
-        "value": "\\b(dsnp|dsny|disney|Disney\\+)\\b"
+        "value": "\\b((dsnp|dsny|disney)\\b|Disney\\+)[ ._-]web[ ._-]?(dl|rip)?\\b"
       }
     },
     {

diff --git a/docs/json/radarr/cf/fod.json b/docs/json/radarr/cf/fod.json
@@ -1,6 +1,6 @@
 {
   "trash_id": "917d1f2c845b2b466036b0cc2d7c72a3",
-  "trash_regex": "https://regex101.com/r/kgngPG/1",
+  "trash_regex": "https://regex101.com/r/kgngPG/latest",
   "name": "FOD",
   "includeCustomFormatWhenRenaming": true,
   "specifications": [

diff --git a/docs/json/radarr/cf/hbo.json b/docs/json/radarr/cf/hbo.json
@@ -9,7 +9,7 @@
       "negate": false,
       "required": true,
       "fields": {
-        "value": "\\b(hbo)(?![ ._-]max)\\b(?=[ ._-]web[ ._-]?(dl|rip)\\b)"
+        "value": "\\b(hbo)(?![ ._-]max)\\b[ ._-]web[ ._-]?(dl|rip)?\\b"
       }
     },
     {

diff --git a/docs/json/radarr/cf/hmax.json b/docs/json/radarr/cf/hmax.json
@@ -9,7 +9,7 @@
       "negate": false,
       "required": true,
       "fields": {
-        "value": "\\b(hmax|hbom|hbo[ ._-]?max)\\b(?=[ ._-]web[ ._-]?(dl|rip)\\b)"
+        "value": "\\b(hmax|hbom|hbo[ ._-]?max)\\b[ ._-]web[ ._-]?(dl|rip)?\\b"
       }
     },
     {

diff --git a/docs/json/radarr/cf/htsr.json b/docs/json/radarr/cf/htsr.json
@@ -1,6 +1,6 @@
 {
   "trash_id": "834b2c0ba0a8596029b4479a29e1a032",
-  "trash_regex": "https://regex101.com/r/PNiRKh/1",
+  "trash_regex": "https://regex101.com/r/PNiRKh/latest",
   "name": "HTSR",
   "includeCustomFormatWhenRenaming": true,
   "specifications": [

diff --git a/docs/json/radarr/cf/ip.json b/docs/json/radarr/cf/ip.json
@@ -1,5 +1,6 @@
 {
   "trash_id": "6185878161f1e2eef9cd0641a0d09eae",
+  "trash_regex": "https://regex101.com/r/iuUsmT/latest",
   "name": "IP",
   "includeCustomFormatWhenRenaming": true,
   "specifications": [
@@ -9,7 +10,7 @@
       "negate": false,
       "required": true,
       "fields": {
-        "value": "\\b(ip|iplayer)\\b"
+        "value": "\\b(ip(layer)?)\\b[ ._-]web[ ._-]?(dl|rip)?\\b"
       }
     },
     {

diff --git a/docs/json/radarr/cf/it.json b/docs/json/radarr/cf/it.json
@@ -9,7 +9,7 @@
       "negate": false,
       "required": true,
       "fields": {
-        "value": "\\b(it|itunes)\\b(?=[ ._-]web[ ._-]?(dl|rip)\\b)"
+        "value": "\\b(it(unes)?)\\b[ ._-]web[ ._-]?(dl|rip)?\\b"
       }
     },
     {

diff --git a/docs/json/radarr/cf/itvx.json b/docs/json/radarr/cf/itvx.json
@@ -1,6 +1,6 @@
 {
   "trash_id": "c3492a26af412e385404eade438ec51c",
-  "trash_regex": "https://regex101.com/r/WzmpCx/1",
+  "trash_regex": "https://regex101.com/r/WzmpCx/latest",
   "name": "ITVX",
   "includeCustomFormatWhenRenaming": true,
   "specifications": [
@@ -10,7 +10,7 @@
       "negate": false,
       "required": true,
       "fields": {
-        "value": "\\bITV(X)?\\b[ ._-]web[ ._-]?(dl|rip)?\\b"
+        "value": "\\b(ITV(X)?)\\b[ ._-]web[ ._-]?(dl|rip)?\\b"
       }
     },
     {

diff --git a/docs/json/radarr/cf/max.json b/docs/json/radarr/cf/max.json
@@ -1,6 +1,6 @@
 {
   "trash_id": "6a061313d22e51e0f25b7cd4dc065233",
-  "trash_regex": "https://regex101.com/r/fa649l/1",
+  "trash_regex": "https://regex101.com/r/fa649l/latest",
   "name": "MAX",
   "includeCustomFormatWhenRenaming": true,
   "specifications": [
@@ -10,7 +10,7 @@
       "negate": false,
       "required": true,
       "fields": {
-        "value": "\\b((?<!hbo[ ._-])max)\\b(?=[ ._-]web[ ._-]?(dl|rip)\\b)"
+        "value": "\\b((?<!hbo[ ._-])max)\\b[ ._-]web[ ._-]?(dl|rip)?\\b"
       }
     },
     {

diff --git a/docs/json/radarr/cf/ovid.json b/docs/json/radarr/cf/ovid.json
@@ -1,6 +1,6 @@
 {
   "trash_id": "fbca986396c5e695ef7b2def3c755d01",
-  "trash_regex": "https://regex101.com/r/hWHpjV/1",
+  "trash_regex": "https://regex101.com/r/hWHpjV/latest",
   "name": "OViD",
   "includeCustomFormatWhenRenaming": true,
   "specifications": [

diff --git a/docs/json/radarr/cf/pcok.json b/docs/json/radarr/cf/pcok.json
@@ -9,7 +9,7 @@
       "negate": false,
       "required": true,
       "fields": {
-        "value": "\\b(pcok|peacock)\\b"
+        "value": "\\b(pcok|peacock)\\b[ ._-]web[ ._-]?(dl|rip)?\\b"
       }
     },
     {

diff --git a/docs/json/radarr/cf/pmtp.json b/docs/json/radarr/cf/pmtp.json
@@ -1,5 +1,6 @@
 {
   "trash_id": "e36a0ba1bc902b26ee40818a1d59b8bd",
+  "trash_regex": "https://regex101.com/r/3EhY8J/latest",
   "name": "PMTP",
   "includeCustomFormatWhenRenaming": true,
   "specifications": [
@@ -9,7 +10,7 @@
       "negate": false,
       "required": true,
       "fields": {
-        "value": "\\b(pmtp|Paramount Plus)\\b"
+        "value": "\\b((pmtp|Paramount[ ._-]Plus)\\b|Paramount\\+)[ ._-]web[ ._-]?(dl|rip)\\b"
       }
     },
     {

diff --git a/docs/json/radarr/cf/stan.json b/docs/json/radarr/cf/stan.json
@@ -1,6 +1,6 @@
 {
   "trash_id": "c2863d2a50c9acad1fb50e53ece60817",
-  "trash_regex": "https://regex101.com/r/IMS7Or/1",
+  "trash_regex": "https://regex101.com/r/IMS7Or/latest",
   "name": "STAN",
   "includeCustomFormatWhenRenaming": true,
   "specifications": [

diff --git a/docs/json/radarr/cf/tver.json b/docs/json/radarr/cf/tver.json
@@ -1,6 +1,6 @@
 {
   "trash_id": "f1b0bae9bc222dab32c1b38b5a7a1088",
-  "trash_regex": "https://regex101.com/r/ZdWC9D/1",
+  "trash_regex": "https://regex101.com/r/ZdWC9D/latest",
   "name": "TVer",
   "includeCustomFormatWhenRenaming": true,
   "specifications": [

diff --git a/docs/json/radarr/cf/u-next.json b/docs/json/radarr/cf/u-next.json
@@ -1,6 +1,6 @@
 {
   "trash_id": "279bda7434fd9075786de274e6c3c202",
-  "trash_regex": "https://regex101.com/r/04ZSLm/1",
+  "trash_regex": "https://regex101.com/r/04ZSLm/latest",
   "name": "U-NEXT",
   "includeCustomFormatWhenRenaming": true,
   "specifications": [

diff --git a/docs/json/sonarr/cf/4od.json b/docs/json/sonarr/cf/4od.json
@@ -3,7 +3,7 @@
   "trash_scores": {
     "default": 50
   },
-  "trash_regex": "https://regex101.com/r/pa5TPZ/1",
+  "trash_regex": "https://regex101.com/r/pa5TPZ/latest",
   "name": "4OD",
   "includeCustomFormatWhenRenaming": true,
   "specifications": [

diff --git a/docs/json/sonarr/cf/all4.json b/docs/json/sonarr/cf/all4.json
@@ -3,7 +3,7 @@
   "trash_scores": {
     "default": 50
   },
-  "trash_regex": "https://regex101.com/r/pUDbbp/1",
+  "trash_regex": "https://regex101.com/r/pUDbbp/latest",
   "name": "ALL4",
   "includeCustomFormatWhenRenaming": true,
   "specifications": [

diff --git a/docs/json/sonarr/cf/atvp.json b/docs/json/sonarr/cf/atvp.json
@@ -12,7 +12,7 @@
       "negate": false,
       "required": true,
       "fields": {
-        "value": "\\b(atvp|aptv|Apple TV\\+)\\b"
+        "value": "\\b((atvp|aptv)\\b|Apple[ ._-]TV\\+)[ ._-]web[ ._-]?(dl|rip)?\\b"
       }
     },
     {

diff --git a/docs/json/sonarr/cf/bglobal.json b/docs/json/sonarr/cf/bglobal.json
@@ -3,6 +3,15 @@
   "name": "B-Global",
   "includeCustomFormatWhenRenaming": true,
   "specifications": [
+    {
+      "name": "B-Global",
+      "implementation": "ReleaseTitleSpecification",
+      "negate": false,
+      "required": true,
+      "fields": {
+        "value": "\\b(B[ ._-]?Global)\\b"
+      }
+    },
     {
       "name": "WEBDL",
       "implementation": "SourceSpecification",
@@ -29,15 +38,6 @@
       "fields": {
         "value": 1
       }
-    },
-    {
-      "name": "B-Global",
-      "implementation": "ReleaseTitleSpecification",
-      "negate": false,
-      "required": true,
-      "fields": {
-        "value": "\\b(B[ .-]?Global)\\b"
-      }
     }
   ]
 }
diff --git a/docs/json/sonarr/cf/bilibili.json b/docs/json/sonarr/cf/bilibili.json
@@ -3,6 +3,15 @@
   "name": "Bilibili",
   "includeCustomFormatWhenRenaming": true,
   "specifications": [
+    {
+      "name": "Bilibili",
+      "implementation": "ReleaseTitleSpecification",
+      "negate": false,
+      "required": true,
+      "fields": {
+        "value": "\\b(Bilibili)\\b"
+      }
+    },
     {
       "name": "WEBDL",
       "implementation": "SourceSpecification",
@@ -29,15 +38,6 @@
       "fields": {
         "value": 1
       }
-    },
-    {
-      "name": "Bilibili",
-      "implementation": "ReleaseTitleSpecification",
-      "negate": false,
-      "required": true,
-      "fields": {
-        "value": "\\b(Bilibili)\\b"
-      }
     }
   ]
 }
diff --git a/docs/json/sonarr/cf/cc.json b/docs/json/sonarr/cf/cc.json
@@ -3,7 +3,7 @@
   "trash_scores": {
     "default": 50
   },
-  "trash_regex": "https://regex101.com/r/A3TRwE/1",
+  "trash_regex": "https://regex101.com/r/A3TRwE/latest",
   "name": "CC",
   "includeCustomFormatWhenRenaming": true,
   "specifications": [

diff --git a/docs/json/sonarr/cf/cr.json b/docs/json/sonarr/cf/cr.json
@@ -6,6 +6,15 @@
   "name": "CR",
   "includeCustomFormatWhenRenaming": true,
   "specifications": [
+    {
+      "name": "Crunchyroll",
+      "implementation": "ReleaseTitleSpecification",
+      "negate": false,
+      "required": true,
+      "fields": {
+        "value": "\\b(C(runchy)?[ ._-]?R(oll)?)\\b"
+      }
+    },
     {
       "name": "WEBDL",
       "implementation": "SourceSpecification",
@@ -32,15 +41,6 @@
       "fields": {
         "value": 1
       }
-    },
-    {
-      "name": "Crunchyroll",
-      "implementation": "ReleaseTitleSpecification",
-      "negate": false,
-      "required": true,
-      "fields": {
-        "value": "\\b(C(runchy)?[ .-]?R(oll)?)\\b"
-      }
     }
   ]
 }
diff --git a/docs/json/sonarr/cf/crav.json b/docs/json/sonarr/cf/crav.json
@@ -3,7 +3,7 @@
   "trash_scores": {
     "default": 50
   },
-  "trash_regex": "https://regex101.com/r/eymcie/1",
+  "trash_regex": "https://regex101.com/r/eymcie/latest",
   "name": "CRAV",
   "includeCustomFormatWhenRenaming": true,
   "specifications": [

diff --git a/docs/json/sonarr/cf/dcu.json b/docs/json/sonarr/cf/dcu.json
@@ -12,7 +12,7 @@
       "negate": false,
       "required": true,
       "fields": {
-        "value": "\\b(dcu|DC Universe)\\b"
+        "value": "\\b(dcu|DC[ ._-]Universe)\\b"
       }
     },
     {

diff --git a/docs/json/sonarr/cf/dsnp.json b/docs/json/sonarr/cf/dsnp.json
@@ -13,7 +13,7 @@
       "negate": false,
       "required": true,
       "fields": {
-        "value": "\\b(dsnp|dsny|disney|Disney\\+)\\b"
+        "value": "\\b((dsnp|dsny|disney)\\b|Disney\\+)[ ._-]web[ ._-]?(dl|rip)?\\b"
       }
     },
     {

diff --git a/docs/json/sonarr/cf/fod.json b/docs/json/sonarr/cf/fod.json
@@ -3,7 +3,7 @@
   "trash_scores": {
     "default": 50
   },
-  "trash_regex": "https://regex101.com/r/CbFoaJ/1",
+  "trash_regex": "https://regex101.com/r/CbFoaJ/latest",
   "name": "FOD",
   "includeCustomFormatWhenRenaming": true,
   "specifications": [

diff --git a/docs/json/sonarr/cf/french-adn.json b/docs/json/sonarr/cf/french-adn.json
@@ -7,6 +7,15 @@
   "name": "ADN",
   "includeCustomFormatWhenRenaming": true,
   "specifications": [
+    {
+      "name": "ADN",
+      "implementation": "ReleaseTitleSpecification",
+      "negate": false,
+      "required": true,
+      "fields": {
+        "value": "\\b(ADN)\\b"
+      }
+    },
     {
       "name": "WEBDL",
       "implementation": "SourceSpecification",
@@ -33,15 +42,6 @@
       "fields": {
         "value": 1
       }
-    },
-    {
-      "name": "ADN",
-      "implementation": "ReleaseTitleSpecification",
-      "negate": false,
-      "required": true,
-      "fields": {
-        "value": "\\b(ADN)\\b"
-      }
     }
   ]
 }