Merge branch 'master' into fix/add-varyg-anime-dual-audio

TRaSH-Guides · Jul 4, 2024 · 370a931 · 370a931
2 parents 33a4fa1 + 2a351ba
commit 370a931
Show file tree

Hide file tree

Showing 13 changed files with 55 additions and 34 deletions.
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
@@ -75,14 +75,14 @@
       <b><a href="https://github.com/rcdailey" style="color: #ffa500;">rcdailey</a></b>
     </div>
 <div style="flex: 1 1 20%; background-color: #1e2129; border: 1px solid #373a42; padding: 10px; text-align: center;">
-      <img src="https://avatars.githubusercontent.com/u/6703012?v=4&v=4" style="width: 50px; border-radius: 50%;" alt="quorn23">
+      <img src="https://avatars.githubusercontent.com/u/140897249?v=4&v=4" style="width: 50px; border-radius: 50%;" alt="kantjer01">
       <br>
-      <b><a href="https://github.com/quorn23" style="color: #ffa500;">quorn23</a></b>
+      <b><a href="https://github.com/kantjer01" style="color: #ffa500;">kantjer01</a></b>
     </div>
 <div style="flex: 1 1 20%; background-color: #303850; border: 1px solid #373a42; padding: 10px; text-align: center;">
-      <img src="https://avatars.githubusercontent.com/u/140897249?v=4&v=4" style="width: 50px; border-radius: 50%;" alt="kantjer01">
+      <img src="https://avatars.githubusercontent.com/u/6703012?v=4&v=4" style="width: 50px; border-radius: 50%;" alt="quorn23">
       <br>
-      <b><a href="https://github.com/kantjer01" style="color: #ffa500;">kantjer01</a></b>
+      <b><a href="https://github.com/quorn23" style="color: #ffa500;">quorn23</a></b>
     </div>
 <div style="flex: 1 1 20%; background-color: #303850; border: 1px solid #373a42; padding: 10px; text-align: center;">
       <img src="https://avatars.githubusercontent.com/u/108864960?v=4&v=4" style="width: 50px; border-radius: 50%;" alt="4l3-X">
@@ -125,24 +125,24 @@
       <b><a href="https://github.com/SeiyaGame" style="color: #ffa500;">SeiyaGame</a></b>
     </div>
 <div style="flex: 1 1 20%; background-color: #1e2129; border: 1px solid #373a42; padding: 10px; text-align: center;">
-      <img src="https://avatars.githubusercontent.com/u/7110194?v=4&v=4" style="width: 50px; border-radius: 50%;" alt="Roxedus">
+      <img src="https://avatars.githubusercontent.com/u/246550?v=4&v=4" style="width: 50px; border-radius: 50%;" alt="foux">
       <br>
-      <b><a href="https://github.com/Roxedus" style="color: #ffa500;">Roxedus</a></b>
+      <b><a href="https://github.com/foux" style="color: #ffa500;">foux</a></b>
     </div>
 <div style="flex: 1 1 20%; background-color: #303850; border: 1px solid #373a42; padding: 10px; text-align: center;">
-      <img src="https://avatars.githubusercontent.com/u/22099779?v=4&v=4" style="width: 50px; border-radius: 50%;" alt="keliansb">
+      <img src="https://avatars.githubusercontent.com/u/12141407?v=4&v=4" style="width: 50px; border-radius: 50%;" alt="jasonla">
       <br>
-      <b><a href="https://github.com/keliansb" style="color: #ffa500;">keliansb</a></b>
+      <b><a href="https://github.com/jasonla" style="color: #ffa500;">jasonla</a></b>
     </div>
 <div style="flex: 1 1 20%; background-color: #303850; border: 1px solid #373a42; padding: 10px; text-align: center;">
-      <img src="https://avatars.githubusercontent.com/u/12141407?v=4&v=4" style="width: 50px; border-radius: 50%;" alt="jasonla">
+      <img src="https://avatars.githubusercontent.com/u/22099779?v=4&v=4" style="width: 50px; border-radius: 50%;" alt="keliansb">
       <br>
-      <b><a href="https://github.com/jasonla" style="color: #ffa500;">jasonla</a></b>
+      <b><a href="https://github.com/keliansb" style="color: #ffa500;">keliansb</a></b>
     </div>
 <div style="flex: 1 1 20%; background-color: #303850; border: 1px solid #373a42; padding: 10px; text-align: center;">
-      <img src="https://avatars.githubusercontent.com/u/246550?v=4&v=4" style="width: 50px; border-radius: 50%;" alt="foux">
+      <img src="https://avatars.githubusercontent.com/u/7110194?v=4&v=4" style="width: 50px; border-radius: 50%;" alt="Roxedus">
       <br>
-      <b><a href="https://github.com/foux" style="color: #ffa500;">foux</a></b>
+      <b><a href="https://github.com/Roxedus" style="color: #ffa500;">Roxedus</a></b>
     </div>
 <div style="flex: 1 1 20%; background-color: #303850; border: 1px solid #373a42; padding: 10px; text-align: center;">
       <img src="https://avatars.githubusercontent.com/u/6587950?v=4&v=4" style="width: 50px; border-radius: 50%;" alt="saltydk">
@@ -389,6 +389,11 @@
       <br>
       <b><a href="https://github.com/s0up4200" style="color: #ffa500;">s0up4200</a></b>
     </div>
+<div style="flex: 1 1 20%; background-color: #303850; border: 1px solid #373a42; padding: 10px; text-align: center;">
+      <img src="https://avatars.githubusercontent.com/u/169086384?v=4&v=4" style="width: 50px; border-radius: 50%;" alt="wheat4714">
+      <br>
+      <b><a href="https://github.com/wheat4714" style="color: #ffa500;">wheat4714</a></b>
+    </div>
 <div style="flex: 1 1 20%; background-color: #303850; border: 1px solid #373a42; padding: 10px; text-align: center;">
       <img src="https://avatars.githubusercontent.com/u/72708798?v=4&v=4" style="width: 50px; border-radius: 50%;" alt="nickavem">
       <br>
@@ -399,7 +404,7 @@
       <br>
       <b><a href="https://github.com/AvAars" style="color: #ffa500;">AvAars</a></b>
     </div>
-<div style="flex: 1 1 20%; background-color: #303850; border: 1px solid #373a42; padding: 10px; text-align: center;">
+<div style="flex: 1 1 20%; background-color: #1e2129; border: 1px solid #373a42; padding: 10px; text-align: center;">
       <img src="https://avatars.githubusercontent.com/u/18447002?v=4&v=4" style="width: 50px; border-radius: 50%;" alt="BernCarney">
       <br>
       <b><a href="https://github.com/BernCarney" style="color: #ffa500;">BernCarney</a></b>
@@ -424,7 +429,7 @@
       <br>
       <b><a href="https://github.com/ColinHebert" style="color: #ffa500;">ColinHebert</a></b>
     </div>
-<div style="flex: 1 1 20%; background-color: #1e2129; border: 1px solid #373a42; padding: 10px; text-align: center;">
+<div style="flex: 1 1 20%; background-color: #303850; border: 1px solid #373a42; padding: 10px; text-align: center;">
       <img src="https://avatars.githubusercontent.com/u/8067383?v=4&v=4" style="width: 50px; border-radius: 50%;" alt="dako98">
       <br>
       <b><a href="https://github.com/dako98" style="color: #ffa500;">dako98</a></b>
@@ -449,11 +454,16 @@
       <br>
       <b><a href="https://github.com/fryfrog" style="color: #ffa500;">fryfrog</a></b>
     </div>
-<div style="flex: 1 1 20%; background-color: #303850; border: 1px solid #373a42; padding: 10px; text-align: center;">
+<div style="flex: 1 1 20%; background-color: #1e2129; border: 1px solid #373a42; padding: 10px; text-align: center;">
       <img src="https://avatars.githubusercontent.com/u/9016208?v=4&v=4" style="width: 50px; border-radius: 50%;" alt="Seros">
       <br>
       <b><a href="https://github.com/Seros" style="color: #ffa500;">Seros</a></b>
     </div>
+<div style="flex: 1 1 20%; background-color: #1e2129; border: 1px solid #373a42; padding: 10px; text-align: center;">
+      <img src="https://avatars.githubusercontent.com/u/48860738?v=4&v=4" style="width: 50px; border-radius: 50%;" alt="washedszn">
+      <br>
+      <b><a href="https://github.com/washedszn" style="color: #ffa500;">washedszn</a></b>
+    </div>
 <div style="flex: 1 1 20%; background-color: #1e2129; border: 1px solid #373a42; padding: 10px; text-align: center;">
       <img src="https://avatars.githubusercontent.com/u/2633890?v=4&v=4" style="width: 50px; border-radius: 50%;" alt="JackGameer">
       <br>
@@ -469,12 +479,12 @@
       <br>
       <b><a href="https://github.com/jwoodhouse" style="color: #ffa500;">jwoodhouse</a></b>
     </div>
-<div style="flex: 1 1 20%; background-color: #1e2129; border: 1px solid #373a42; padding: 10px; text-align: center;">
+<div style="flex: 1 1 20%; background-color: #303850; border: 1px solid #373a42; padding: 10px; text-align: center;">
       <img src="https://avatars.githubusercontent.com/u/10259118?v=4&v=4" style="width: 50px; border-radius: 50%;" alt="jonasgeiler">
       <br>
       <b><a href="https://github.com/jonasgeiler" style="color: #ffa500;">jonasgeiler</a></b>
     </div>
-<div style="flex: 1 1 20%; background-color: #1e2129; border: 1px solid #373a42; padding: 10px; text-align: center;">
+<div style="flex: 1 1 20%; background-color: #303850; border: 1px solid #373a42; padding: 10px; text-align: center;">
       <img src="https://avatars.githubusercontent.com/u/9055441?v=4&v=4" style="width: 50px; border-radius: 50%;" alt="KaitoKid">
       <br>
       <b><a href="https://github.com/KaitoKid" style="color: #ffa500;">KaitoKid</a></b>

diff --git a/docs/Radarr/images/cfa-complete.png b/docs/Radarr/images/cfa-complete.png
diff --git a/docs/Radarr/images/cfa-default-scoring.png b/docs/Radarr/images/cfa-default-scoring.png
diff --git a/docs/Sonarr/images/cfa-complete.png b/docs/Sonarr/images/cfa-complete.png
diff --git a/docs/Sonarr/images/cfa-default-scoring.png b/docs/Sonarr/images/cfa-default-scoring.png
diff --git a/docs/json/radarr/cf/amzn.json b/docs/json/radarr/cf/amzn.json
@@ -9,7 +9,7 @@
       "negate": false,
       "required": true,
       "fields": {
-        "value": "\\b(amzn|amazon(hd)?)\\b[ ._-]web[ ._-]?(dl|rip)?\\b"
+        "value": "\\b(amzn|amazon(hd)?)\\b"
       }
     },
     {

diff --git a/docs/json/radarr/cf/av1.json b/docs/json/radarr/cf/av1.json
@@ -2,7 +2,8 @@
   "trash_id": "cae4ca30163749b891686f95532519bd",
   "trash_scores": {
     "default": -10000,
-    "sqp-1-2160p": -10000
+    "sqp-1-2160p": -10000,
+    "anime-radarr": -10000
   },
   "name": "AV1",
   "includeCustomFormatWhenRenaming": false,

diff --git a/docs/json/radarr/cf/hybrid.json b/docs/json/radarr/cf/hybrid.json
@@ -25,12 +25,12 @@
       }
     },
     {
-      "name": "Remux",
-      "implementation": "QualityModifierSpecification",
+      "name": "Bluray",
+      "implementation": "SourceSpecification",
       "negate": false,
-      "required": true,
+      "required": false,
       "fields": {
-        "value": 5
+        "value": 9
       }
     }
   ]

diff --git a/docs/json/radarr/cf/remux-tier-02.json b/docs/json/radarr/cf/remux-tier-02.json
@@ -25,15 +25,6 @@
         "value": "^(Flights)$"
       }
     },
-    {
-      "name": "KRaLiMaRKo",
-      "implementation": "ReleaseGroupSpecification",
-      "negate": false,
-      "required": false,
-      "fields": {
-        "value": "^(KRaLiMaRKo)$"
-      }
-    },
     {
       "name": "NCmt",
       "implementation": "ReleaseGroupSpecification",

diff --git a/docs/json/radarr/cf/remux-tier-03.json b/docs/json/radarr/cf/remux-tier-03.json
@@ -52,6 +52,15 @@
         "value": "^(iFT)$"
       }
     },
+    {
+      "name": "KRaLiMaRKo",
+      "implementation": "ReleaseGroupSpecification",
+      "negate": false,
+      "required": false,
+      "fields": {
+        "value": "^(KRaLiMaRKo)$"
+      }
+    },
     {
       "name": "NTb",
       "implementation": "ReleaseGroupSpecification",

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

diff --git a/docs/json/sonarr/cf/hybrid.json b/docs/json/sonarr/cf/hybrid.json
@@ -28,10 +28,19 @@
       "name": "Remux",
       "implementation": "SourceSpecification",
       "negate": false,
-      "required": true,
+      "required": false,
       "fields": {
         "value": 7
       }
+    },
+    {
+      "name": "Bluray",
+      "implementation": "SourceSpecification",
+      "negate": false,
+      "required": false,
+      "fields": {
+        "value": 6
+      }
     }
   ]
 }
diff --git a/includes/cf/radarr-anime.md b/includes/cf/radarr-anime.md
@@ -35,5 +35,6 @@
     | [{{ radarr['cf']['anime-dual-audio']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#anime-dual-audio)                                     |                                            0                                            | {{ radarr['cf']['anime-dual-audio']['trash_id'] }}                   |
     | [{{ radarr['cf']['dubs-only']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#dubs-only)                                                   |               {{ radarr['cf']['dubs-only']['trash_scores']['default'] }}                | {{ radarr['cf']['dubs-only']['trash_id'] }}                          |
     | [{{ radarr['cf']['french-vostfr']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#vostfr)                                                  |           {{ radarr['cf']['french-vostfr']['trash_scores']['anime-radarr'] }}           | {{ radarr['cf']['french-vostfr']['trash_id'] }}                      |
+    | [{{ radarr['cf']['av1']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#av1)                                                               |                {{ radarr['cf']['av1']['trash_scores']['anime-radarr'] }}                | {{ radarr['cf']['av1']['trash_id'] }}                                |
 
     !!! warning "Scores marked with a :warning: warning :warning: are different to those used in the main guide"