update(cf/repack-proper): separate repack and proper cfs in sonarr/ra…

…darr
TRaSH-Guides · Jan 6, 2024 · 43270ba · 43270ba
1 parent b8a27df
commit 43270ba
Show file tree

Hide file tree

Showing 10 changed files with 139 additions and 89 deletions.
diff --git a/docs/Radarr/Radarr-collection-of-custom-formats.md b/docs/Radarr/Radarr-collection-of-custom-formats.md
@@ -16,9 +16,9 @@ I also made 3 guides related to this one.
 
 !!! tip
 
-    I also suggest to change the Propers and Repacks settings in Radarr
+    I also suggest changing the Propers and Repacks settings in Radarr
 
-    `Media Management` => `File Management` to `Do Not Prefer` and use the [Repack/Proper](#repackproper) Custom Format.
+    `Media Management` => `File Management` to `Do Not Prefer` and use the [Repack and Proper](#proper) Custom Format.
 
     ![!cf-mm-propers-repacks-disable](images/cf-mm-propers-repacks-disable.png)
 
@@ -74,25 +74,25 @@ I also made 3 guides related to this one.
 
 ------
 
-| Misc                           | Optional                            | French Audio Version          | French Source Groups                            |
-| ------------------------------ | ----------------------------------- | ----------------------------- | ----------------------------------------------- |
-| [Dutch Groups](#dutch-groups)  | [AV1](#av1)                         | [Multi-French](#multi-french) | [FR Remux Tier 01](#fr-remux-tier-01)           |
-| [FreeLeech](#freeleech)        | [Bad Dual Groups](#bad-dual-groups) | [Multi-Audio](#multi-audio)   | [FR Remux Tier 02](#fr-remux-tier-02)           |
-| [MPEG2](#mpeg2)                | [DV (Disk)](#dv-disk)               | [French Audio](#french-audio) | [FR UHD Bluray Tier 01](#fr-uhd-bluray-tier-01) |
-| [Multi](#multi)                | [DV (WEBDL)](#dv-webdl)             | [VFF](#vff)                   | [FR UHD Bluray Tier 02](#fr-uhd-bluray-tier-02) |
-| [Repack/Proper](#repackproper) | [EVO (no WEBDL)](#evo-no-webdl)     | [VOF](#vof)                   | [FR HD Bluray Tier 01](#fr-hd-bluray-tier-01)   |
-| [Repack2](#repack2)            | [HDR10+ Boost](#hdr10plus-boost)    | [VFI](#vfi)                   | [FR HD Bluray Tier 02](#fr-hd-bluray-tier-02)   |
-| [x264](#x264)                  | [HFR](#hfr)                         | [VF2](#vf2)                   | [FR WEB Tier 01](#fr-web-tier-01)               |
-| [x265](#x265)                  | [Internal](#internal)               | [VFQ](#vfq)                   | [FR WEB Tier 02](#fr-web-tier-02)               |
-|                                | [Line/Mic Dubbed](#linemic-dubbed)  | [VOQ](#voq)                   | [FR Scene Groups](#fr-scene-groups)             |
-|                                | [No-RlsGroup](#no-rlsgroup)         | [VQ](#vq)                     | [FR LQ](#fr-lq)                                 |
-|                                | [Obfuscated](#obfuscated)           | [VFB](#vfb)                   |                                                 |
-|                                | [Retags](#retags)                   | [VOSTFR](#vostfr)             |                                                 |
-|                                | [Scene](#scene)                     | [FanSUB](#fansub)             |                                                 |
-|                                | [SDR (no WEBDL)](#sdr-no-webdl)     | [FastSUB](#fastsub)           |                                                 |
-|                                | [SDR](#sdr)                         |                               |                                                 |
-|                                | [VP9](#vp9)                         |                               |                                                 |
-|                                | [x265 (no HDR/DV)](#x265-no-hdrdv)  |                               |                                                 |
+| Misc                          | Optional                            | French Audio Version          | French Source Groups                            |
+| ----------------------------- | ----------------------------------- | ----------------------------- | ----------------------------------------------- |
+| [Dutch Groups](#dutch-groups) | [AV1](#av1)                         | [Multi-French](#multi-french) | [FR Remux Tier 01](#fr-remux-tier-01)           |
+| [FreeLeech](#freeleech)       | [Bad Dual Groups](#bad-dual-groups) | [Multi-Audio](#multi-audio)   | [FR Remux Tier 02](#fr-remux-tier-02)           |
+| [MPEG2](#mpeg2)               | [DV (Disk)](#dv-disk)               | [French Audio](#french-audio) | [FR UHD Bluray Tier 01](#fr-uhd-bluray-tier-01) |
+| [Multi](#multi)               | [DV (WEBDL)](#dv-webdl)             | [VFF](#vff)                   | [FR UHD Bluray Tier 02](#fr-uhd-bluray-tier-02) |
+| [Proper](#proper)             | [EVO (no WEBDL)](#evo-no-webdl)     | [VOF](#vof)                   | [FR HD Bluray Tier 01](#fr-hd-bluray-tier-01)   |
+| [Repack](#repack)             | [HDR10+ Boost](#hdr10plus-boost)    | [VFI](#vfi)                   | [FR HD Bluray Tier 02](#fr-hd-bluray-tier-02)   |
+| [Repack2](#repack2)           | [HFR](#hfr)                         | [VF2](#vf2)                   | [FR WEB Tier 01](#fr-web-tier-01)               |
+| [x264](#x264)                 | [Internal](#internal)               | [VFQ](#vfq)                   | [FR WEB Tier 02](#fr-web-tier-02)               |
+| [x265](#x265)                 | [Line/Mic Dubbed](#linemic-dubbed)  | [VOQ](#voq)                   | [FR Scene Groups](#fr-scene-groups)             |
+|                               | [No-RlsGroup](#no-rlsgroup)         | [VQ](#vq)                     | [FR LQ](#fr-lq)                                 |
+|                               | [Obfuscated](#obfuscated)           | [VFB](#vfb)                   |                                                 |
+|                               | [Retags](#retags)                   | [VOSTFR](#vostfr)             |                                                 |
+|                               | [Scene](#scene)                     | [FanSUB](#fansub)             |                                                 |
+|                               | [SDR (no WEBDL)](#sdr-no-webdl)     | [FastSUB](#fastsub)           |                                                 |
+|                               | [SDR](#sdr)                         |                               |                                                 |
+|                               | [VP9](#vp9)                         |                               |                                                 |
+|                               | [x265 (no HDR/DV)](#x265-no-hdrdv)  |                               |                                                 |
 
 ------
 
@@ -1393,13 +1393,24 @@ I also made 3 guides related to this one.
 ## Misc
 
 ------
+### Proper
 
-### Repack/Proper
+??? example "JSON - [Click to show/hide]"
+
+    ```json
+    [[% filter indent(width=4) %]][[% include 'json/radarr/cf/proper.json' %]][[% endfilter %]]
+    ```
+
+<sub><sup>[TOP](#index)</sup>
+
+------
+
+### Repack
 
 ??? example "JSON - [Click to show/hide]"
 
     ```json
-    [[% filter indent(width=4) %]][[% include 'json/radarr/cf/repack-proper.json' %]][[% endfilter %]]
+    [[% filter indent(width=4) %]][[% include 'json/radarr/cf/repack.json' %]][[% endfilter %]]
     ```
 
 <sub><sup>[TOP](#index)</sup>

diff --git a/docs/Radarr/radarr-setup-quality-profiles.md b/docs/Radarr/radarr-setup-quality-profiles.md
@@ -295,9 +295,9 @@ The following custom format groups should be combined with the Quality Profiles
 
 ??? tip "Proper and Repacks - [Click to show/hide]"
 
-    I also suggest that you change the Propers and Repacks settings in Radarr
+    I also suggest changing the Propers and Repacks settings in Radarr
 
-    `Media Management` => `File Management` to `Do Not Prefer` and use the [Repack/Proper](/Radarr/Radarr-collection-of-custom-formats/#repackproper) Custom Format.
+    `Media Management` => `File Management` to `Do Not Prefer` and use the [Repack and Proper](/Radarr/Radarr-collection-of-custom-formats/#proper) Custom Format.
 
     ![!cf-mm-propers-repacks-disable](images/cf-mm-propers-repacks-disable.png)
 

diff --git a/docs/Sonarr/sonarr-collection-of-custom-formats.md b/docs/Sonarr/sonarr-collection-of-custom-formats.md
@@ -14,9 +14,9 @@ I also made 3 guides related to this one.
 
 !!! tip
 
-    I also suggest to change the Propers and Repacks settings in Sonarr
+    I also suggest changing the Propers and Repacks settings in Sonarr
 
-    `Media Management` => `File Management` to `Do Not Prefer` and use the [Repack/Proper](#repackproper) Custom Format.
+    `Media Management` => `File Management` to `Do Not Prefer` and use the [Repack and Proper](#proper) Custom Format.
 
     ![!cf-mm-propers-repacks-disable](images/cf-mm-propers-repacks-disable.png)
 
@@ -83,25 +83,25 @@ I also made 3 guides related to this one.
 
 ------
 
-| Misc                           | Optional                            | French Audio Version          | French Source Groups                          |
-| ------------------------------ | ----------------------------------- | ----------------------------- | --------------------------------------------- |
-| [MPEG2](#mpeg2)                | [AV1](#av1)                         | [Multi-French](#multi-french) | [FR Remux Tier 01](#fr-remux-tier-01)         |
-| [Multi](#multi)                | [Bad Dual Groups](#bad-dual-groups) | [Multi-Audio](#multi-audio)   | [FR HD Bluray Tier 01](#fr-hd-bluray-tier-01) |
-| [Repack v2](#repack-v2)        | [DV (Disk)](#dv-disk)               | [French Audio](#french-audio) | [FR WEB Tier 01](#fr-web-tier-01)             |
-| [Repack v3](#repack-v3)        | [DV (WEBDL)](#dv-webdl)             | [VFF](#vff)                   | [FR WEB Tier 02](#fr-web-tier-02)             |
-| [Repack/Proper](#repackproper) | [HDR10+ Boost](#hdr10plus-boost)    | [VOF](#vof)                   | [FR WEB Tier 03](#fr-web-tier-03)             |
-| [x264](#x264)                  | [HFR](#hfr)                         | [VFI](#vfi)                   | [FR Anime Tier 01](#fr-anime-tier-01)         |
-| [x265](#x265)                  | [Internal](#internal)               | [VF2](#vf2)                   | [FR Anime Tier 02](#fr-anime-tier-02)         |
-|                                | [No-RlsGroup](#no-rlsgroup)         | [VFQ](#vfq)                   | [FR Anime Tier 03](#fr-anime-tier-03)         |
-|                                | [Obfuscated](#obfuscated)           | [VOQ](#voq)                   | [FR Anime FanSub](#fr-anime-fansub)           |
-|                                | [Retags](#retags)                   | [VQ](#vq)                     | [FR Scene Groups](#fr-scene-groups)           |
-|                                | [Scene](#scene)                     | [VFB](#vfb)                   | [FR LQ](#fr-lq)                               |
-|                                | [SDR (no WEBDL)](#sdr-no-webdl)     | [VOSTFR](#vostfr)             |                                               |
-|                                | [SDR](#sdr)                         | [FanSUB](#fansub)             |                                               |
-|                                | [Season Packs](#season-pack)        | [FastSUB](#fastsub)           |                                               |
-|                                | [VP9](#vp9)                         |                               |                                               |
-|                                | [x265 (no HDR/DV)](#x265-no-hdrdv)  |                               |                                               |
-|                                | [x265 (no HDR/DV)](#x265-no-hdrdv)  |                               |                                               |
+| Misc                     | Optional                            | French Audio Version          | French Source Groups                          |
+| ------------------------ | ----------------------------------- | ----------------------------- | --------------------------------------------- |
+| [MPEG2](#mpeg2)          | [AV1](#av1)                         | [Multi-French](#multi-french) | [FR Remux Tier 01](#fr-remux-tier-01)         |
+| [Multi](#multi)          | [Bad Dual Groups](#bad-dual-groups) | [Multi-Audio](#multi-audio)   | [FR HD Bluray Tier 01](#fr-hd-bluray-tier-01) |
+| [Proper](#proper)        | [DV (Disk)](#dv-disk)               | [French Audio](#french-audio) | [FR WEB Tier 01](#fr-web-tier-01)             |
+| [Repack](#repack)        | [DV (WEBDL)](#dv-webdl)             | [VFF](#vff)                   | [FR WEB Tier 02](#fr-web-tier-02)             |
+| [Repack v2](#repack-v2)  | [HDR10+ Boost](#hdr10plus-boost)    | [VOF](#vof)                   | [FR WEB Tier 03](#fr-web-tier-03)             |
+| [Repack v3](#repack-v3)  | [HFR](#hfr)                         | [VFI](#vfi)                   | [FR Anime Tier 01](#fr-anime-tier-01)         |
+| [x264](#x264)            | [Internal](#internal)               | [VF2](#vf2)                   | [FR Anime Tier 02](#fr-anime-tier-02)         |
+| [x265](#x265)            | [No-RlsGroup](#no-rlsgroup)         | [VFQ](#vfq)                   | [FR Anime Tier 03](#fr-anime-tier-03)         |
+|                          | [Obfuscated](#obfuscated)           | [VOQ](#voq)                   | [FR Anime FanSub](#fr-anime-fansub)           |
+|                          | [Retags](#retags)                   | [VQ](#vq)                     | [FR Scene Groups](#fr-scene-groups)           |
+|                          | [Scene](#scene)                     | [VFB](#vfb)                   | [FR LQ](#fr-lq)                               |
+|                          | [SDR (no WEBDL)](#sdr-no-webdl)     | [VOSTFR](#vostfr)             |                                               |
+|                          | [SDR](#sdr)                         | [FanSUB](#fansub)             |                                               |
+|                          | [Season Packs](#season-pack)        | [FastSUB](#fastsub)           |                                               |
+|                          | [VP9](#vp9)                         |                               |                                               |
+|                          | [x265 (no HDR/DV)](#x265-no-hdrdv)  |                               |                                               |
+|                          | [x265 (no HDR/DV)](#x265-no-hdrdv)  |                               |                                               |
 
 ------
 
@@ -907,12 +907,23 @@ I also made 3 guides related to this one.
 
 ------
 
-### Repack/Proper
+### Proper
 
 ??? example "JSON - [Click to show/hide]"
 
     ```json
-    [[% filter indent(width=4) %]][[% include 'json/sonarr/cf/repack-proper.json' %]][[% endfilter %]]
+    [[% filter indent(width=4) %]][[% include 'json/sonarr/cf/proper.json' %]][[% endfilter %]]
+    ```
+
+<sub><sup>[TOP](#index)</sup>
+
+------
+### Repack
+
+??? example "JSON - [Click to show/hide]"
+
+    ```json
+    [[% filter indent(width=4) %]][[% include 'json/sonarr/cf/repack.json' %]][[% endfilter %]]
     ```
 
 <sub><sup>[TOP](#index)</sup>

diff --git a/docs/json/radarr/cf/proper.json b/docs/json/radarr/cf/proper.json
@@ -0,0 +1,20 @@
+{
+  "trash_id": "28ebdc2cdf002d9458e41f9f60e216a2",
+  "trash_scores": {
+    "default": 8
+  },
+  "trash_regex": "https://regex101.com/r/S91wR8/2",
+  "name": "Proper",
+  "includeCustomFormatWhenRenaming": false,
+  "specifications": [
+      {
+          "name": "Proper",
+          "implementation": "ReleaseTitleSpecification",
+          "negate": false,
+          "required": false,
+          "fields": {
+              "value": "\\b(Proper)\\b"
+          }
+      }
+  ]
+}
diff --git a/docs/json/radarr/cf/repack-proper.json → docs/json/radarr/cf/repack.json b/docs/json/radarr/cf/repack-proper.json → docs/json/radarr/cf/repack.json
@@ -1,10 +1,10 @@
 {
-  "trash_id": "e7718d7a3ce595f289bfee26adc178f5",
+  "trash_id": "a06f27e686bda44e19515ccf51af279f",
   "trash_scores": {
     "default": 5
   },
-  "trash_regex": "https://regex101.com/r/S91wR8/2",
-  "name": "Repack/Proper",
+  "trash_regex": "https://regex101.com/r/S91wR8/3",
+  "name": "Repack",
   "includeCustomFormatWhenRenaming": false,
   "specifications": [{
           "name": "Repack",
@@ -15,15 +15,6 @@
               "value": "\\b(Repack)\\b"
           }
       },
-      {
-          "name": "Proper",
-          "implementation": "ReleaseTitleSpecification",
-          "negate": false,
-          "required": false,
-          "fields": {
-              "value": "\\b(Proper)\\b"
-          }
-      },
       {
           "name": "Rerip",
           "implementation": "ReleaseTitleSpecification",

diff --git a/docs/json/sonarr/cf/proper.json b/docs/json/sonarr/cf/proper.json
@@ -0,0 +1,20 @@
+{
+  "trash_id": "003262633471ef9477b1d685a73b5e93",
+  "trash_scores": {
+    "default": 7
+  },
+  "trash_regex": "https://regex101.com/r/S91wR8/2",
+  "name": "Proper",
+  "includeCustomFormatWhenRenaming": false,
+  "specifications": [
+      {
+          "name": "Proper",
+          "implementation": "ReleaseTitleSpecification",
+          "negate": false,
+          "required": false,
+          "fields": {
+              "value": "\\b(Proper)\\b"
+          }
+      }
+  ]
+}
diff --git a/docs/json/sonarr/cf/repack-proper.json → docs/json/sonarr/cf/repack.json b/docs/json/sonarr/cf/repack-proper.json → docs/json/sonarr/cf/repack.json
@@ -1,10 +1,10 @@
 {
-  "trash_id": "ec8fa7296b64e8cd390a1600981f3923",
+  "trash_id": "f11b533d6db941b84f36cab756b29ea5",
   "trash_scores": {
     "default": 5
   },
-  "trash_regex": "https://regex101.com/r/S91wR8/2",
-  "name": "Repack/Proper",
+  "trash_regex": "https://regex101.com/r/S91wR8/3",
+  "name": "Repack",
   "includeCustomFormatWhenRenaming": false,
   "specifications": [{
           "name": "Repack",
@@ -15,15 +15,6 @@
               "value": "\\b(Repack)\\b"
           }
       },
-      {
-          "name": "Proper",
-          "implementation": "ReleaseTitleSpecification",
-          "negate": false,
-          "required": false,
-          "fields": {
-              "value": "\\b(Proper)\\b"
-          }
-      },
       {
           "name": "Rerip",
           "implementation": "ReleaseTitleSpecification",

diff --git a/includes/cf/radarr-misc.md b/includes/cf/radarr-misc.md
@@ -1,12 +1,14 @@
 ??? abstract "Misc - [Click to show/hide]"
-    | Custom Format                                                                                            |                             Score                              | Trash ID                                        |
-    | -------------------------------------------------------------------------------------------------------- | :------------------------------------------------------------: | ----------------------------------------------- |
-    | [{{ radarr['cf']['repack-proper']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#repackproper) | {{ radarr['cf']['repack-proper']['trash_scores']['default'] }} | {{ radarr['cf']['repack-proper']['trash_id'] }} |
-    | [{{ radarr['cf']['repack2']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#repack2)            |    {{ radarr['cf']['repack2']['trash_scores']['default'] }}    | {{ radarr['cf']['repack2']['trash_id'] }}       |
+| Custom Format | Score                                                                                         | Trash ID                                                 |                                           |
+| ------------- | --------------------------------------------------------------------------------------------- | -------------------------------------------------------- | ----------------------------------------- |
+|               | [{{ radarr['cf']['proper']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#proper)   | {{ radarr['cf']['proper']['trash_scores']['default'] }}  | {{ radarr['cf']['proper']['trash_id'] }}  |
+|               | [{{ radarr['cf']['repack']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#repack)   | {{ radarr['cf']['repack']['trash_scores']['default'] }}  | {{ radarr['cf']['repack']['trash_id'] }}  |
+|               | [{{ radarr['cf']['repack2']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#repack2) | {{ radarr['cf']['repack2']['trash_scores']['default'] }} | {{ radarr['cf']['repack2']['trash_id'] }} |
+|               |                                                                                               |                                                          |                                           |
 
     ??? tip "Proper and Repacks - [Click to show/hide]"
 
-        I also suggest to change the Propers and Repacks settings in Radarr
+        I also suggest changing the Propers and Repacks settings in Radarr
 
         `Media Management` => `File Management` to `Do Not Prefer` and use the [Repack/Proper](/Radarr/Radarr-collection-of-custom-formats/#repackproper) Custom Format.