Merge pull request #1000 from yammes08/master

Add Proper2 condition to v2 repack CFs, update Radarr Repack scores to match Sonarr, update MA score so not trumped by repacks, add PQ to HDR formats in 2160p and SDR CFs

docs/json/radarr/cf/2160p.json

@@ -19,7 +19,7 @@
       "negate": false,
       "required": true,
       "fields": {
-        "value": "\\bHDR(\\b|\\d)|\\b(dv|dovi|dolby[ .]?vision)\\b|\\b(FraMeSToR|HQMUX)\\b"
+        "value": "\\bHDR(\\b|\\d)|\\b(dv|dovi|dolby[ .]?vision)\\b|\\b(FraMeSToR|HQMUX)\\b|\\b(PQ)\\b"
       }
     },
     {

docs/json/radarr/cf/ma.json

@@ -1,6 +1,6 @@
 {
   "trash_id": "2a6039655313bf5dab1e43523b62c374",
-  "trash_score": "10",
+  "trash_score": "15",
   "name": "MA",
   "includeCustomFormatWhenRenaming": true,
   "specifications": [

docs/json/radarr/cf/repack-proper.json

@@ -1,6 +1,6 @@
 {
   "trash_id": "e7718d7a3ce595f289bfee26adc178f5",
-  "trash_score": "5",
+  "trash_score": "11",
   "trash_regex": "https://regex101.com/r/S91wR8/2",
   "name": "Repack/Proper",
   "includeCustomFormatWhenRenaming": false,

docs/json/radarr/cf/repack2.json

@@ -1,6 +1,7 @@
 {
   "trash_id": "ae43b294509409a6a13919dedd4764c4",
-  "trash_score": "6",
+  "trash_score": "12",
+  "trash_regex": "https://regex101.com/r/kQ4oeP/1",
   "name": "Repack2",
   "includeCustomFormatWhenRenaming": false,
   "specifications": [
@@ -12,6 +13,15 @@
       "fields": {
         "value": "\\b(Repack2)\\b"
       }
+    },
+    {
+      "name": "Proper2",
+      "implementation": "ReleaseTitleSpecification",
+      "negate": false,
+      "required": false,
+      "fields": {
+        "value": "\\b(Proper2)\\b"
+      }
     }
   ]
 }

docs/json/radarr/cf/sdr.json

@@ -19,7 +19,7 @@
       "negate": true,
       "required": false,
       "fields": {
-        "value": "\\bHDR(\\b|\\d)|\\b(dv|dovi|dolby[ .]?vision)\\b|\\b(FraMeSToR|HQMUX)\\b"
+        "value": "\\bHDR(\\b|\\d)|\\b(dv|dovi|dolby[ .]?vision)\\b|\\b(FraMeSToR|HQMUX)\\b|\\b(PQ)\\b"
       }
     },
     {

docs/json/sonarr/cf/2160p.json

@@ -19,7 +19,7 @@
       "negate": false,
       "required": true,
       "fields": {
-        "value": "\\bHDR(\\b|\\d)|\\b(dv|dovi|dolby[ .]?vision)\\b|\\b(FraMeSToR|HQMUX)\\b"
+        "value": "\\bHDR(\\b|\\d)|\\b(dv|dovi|dolby[ .]?vision)\\b|\\b(FraMeSToR|HQMUX)\\b|\\b(PQ)\\b"
       }
     },
     {

docs/json/sonarr/cf/repack-v2.json

@@ -12,6 +12,15 @@
       "fields": {
         "value": "\\b(repack2)\\b"
       }
+    },
+    {
+      "name": "Proper v2",
+      "implementation": "ReleaseTitleSpecification",
+      "negate": false,
+      "required": false,
+      "fields": {
+        "value": "\\b(proper2)\\b"
+      }
     }
   ]
 }

docs/json/sonarr/cf/sdr.json

@@ -19,7 +19,7 @@
       "negate": true,
       "required": false,
       "fields": {
-        "value": "\\bHDR(\\b|\\d)|\\b(dv|dovi|dolby[ .]?vision)\\b|\\b(FraMeSToR|HQMUX)\\b"
+        "value": "\\bHDR(\\b|\\d)|\\b(dv|dovi|dolby[ .]?vision)\\b|\\b(FraMeSToR|HQMUX)\\b|\\b(PQ)\\b"
       }
     },
     {