From a499fabf0ebd4cc93bd0d7da40927a7a58a75c3b Mon Sep 17 00:00:00 2001 From: santiagosayshey Date: Mon, 27 Jan 2025 00:33:39 +1050 Subject: [PATCH] tweak(format): Extra tags for language / source / groups / flags --- custom_formats/1080p Balanced Tier 1.yml | 4 +++- custom_formats/1080p Balanced Tier 2.yml | 4 +++- custom_formats/2160p Balanced Tier 1.yml | 9 ++++---- custom_formats/2160p Balanced Tier 2.yml | 9 ++++---- custom_formats/2160p Quality Tier 1.yml | 4 +++- custom_formats/2160p Quality Tier 2.yml | 4 +++- custom_formats/2160p Quality Tier 3.yml | 4 +++- custom_formats/2160p Quality Tier 4.yml | 4 +++- custom_formats/2160p Quality Tier 5.yml | 4 +++- custom_formats/2160p Quality Tier 6.yml | 4 +++- custom_formats/B&W.yml | 1 + custom_formats/Blu-ray Remux.yml | 11 +++++----- custom_formats/Extras.yml | 1 + custom_formats/Free100.yml | 1 + custom_formats/Free25.yml | 9 ++++---- custom_formats/Free50.yml | 1 + custom_formats/Free75.yml | 1 + custom_formats/Not English.yml | 3 ++- custom_formats/Not Only English (Missing).yml | 7 ++++--- custom_formats/Not Only English.yml | 3 ++- custom_formats/SD Bluray Encodes.yml | 21 ++++++++++--------- custom_formats/Scene.yml | 11 +++++----- custom_formats/UHDBits.yml | 1 + custom_formats/x265 (Missing 2160p).yml | 9 ++++---- custom_formats/x265 (Missing).yml | 1 + 25 files changed, 82 insertions(+), 49 deletions(-) diff --git a/custom_formats/1080p Balanced Tier 1.yml b/custom_formats/1080p Balanced Tier 1.yml index fcb18ab..f24b0f3 100644 --- a/custom_formats/1080p Balanced Tier 1.yml +++ b/custom_formats/1080p Balanced Tier 1.yml @@ -1,7 +1,9 @@ name: 1080p Balanced Tier 1 description: Matches release groups who fall under 1080p Balanced Tier 1 tags: -- Release Group +- Release Group Tier +- Balanced +- 1080p conditions: - name: Not WEB-DL negate: true diff --git a/custom_formats/1080p Balanced Tier 2.yml b/custom_formats/1080p Balanced Tier 2.yml index 4083fcf..92b8053 100644 --- a/custom_formats/1080p Balanced Tier 2.yml +++ b/custom_formats/1080p Balanced Tier 2.yml @@ -1,7 +1,9 @@ name: 1080p Balanced Tier 2 description: Matches release groups who fall under 1080p Balanced Tier 2 tags: -- Release Group +- Release Group Tier +- Balanced +- 1080p conditions: - name: Not WEB-DL negate: true diff --git a/custom_formats/2160p Balanced Tier 1.yml b/custom_formats/2160p Balanced Tier 1.yml index b7eb64a..0e7807e 100644 --- a/custom_formats/2160p Balanced Tier 1.yml +++ b/custom_formats/2160p Balanced Tier 1.yml @@ -1,8 +1,9 @@ name: 2160p Balanced Tier 1 description: Matches release groups who fall under 2160p Balanced Tier 1 tags: -- Release Group -- Tier +- Release Group Tier +- Balanced +- 2160p conditions: - name: Not WEB-DL negate: true @@ -15,10 +16,10 @@ conditions: resolution: 2160p type: resolution - name: HONE - type: release_title - required: false negate: false pattern: HONE + required: false + type: release_title tests: - conditionResults: - matches: true diff --git a/custom_formats/2160p Balanced Tier 2.yml b/custom_formats/2160p Balanced Tier 2.yml index 234deec..bf635fe 100644 --- a/custom_formats/2160p Balanced Tier 2.yml +++ b/custom_formats/2160p Balanced Tier 2.yml @@ -1,8 +1,9 @@ name: 2160p Balanced Tier 2 description: Matches release groups who fall under 2160p Balanced Tier 2 tags: -- Release Group -- Tier +- Release Group Tier +- Balanced +- 2160p conditions: - name: Not WEB-DL negate: true @@ -15,10 +16,10 @@ conditions: resolution: 2160p type: resolution - name: hallowed - type: release_group - required: false negate: false pattern: hallowed + required: false + type: release_group - name: BHDStudio negate: false pattern: BHDStudio diff --git a/custom_formats/2160p Quality Tier 1.yml b/custom_formats/2160p Quality Tier 1.yml index 083e51a..fc60e84 100644 --- a/custom_formats/2160p Quality Tier 1.yml +++ b/custom_formats/2160p Quality Tier 1.yml @@ -1,7 +1,9 @@ name: 2160p Quality Tier 1 description: Matches release groups who fall under 2160p Quality Tier 1 tags: -- Release Group +- Release Group Tier +- Quality +- 2160p conditions: - name: Not WEB-DL negate: true diff --git a/custom_formats/2160p Quality Tier 2.yml b/custom_formats/2160p Quality Tier 2.yml index 566fb27..667f7a5 100644 --- a/custom_formats/2160p Quality Tier 2.yml +++ b/custom_formats/2160p Quality Tier 2.yml @@ -1,7 +1,9 @@ name: 2160p Quality Tier 2 description: Matches release groups who fall under 2160p Quality Tier 2 tags: -- Release Group +- Release Group Tier +- Quality +- 2160p conditions: - name: Not WEB-DL negate: true diff --git a/custom_formats/2160p Quality Tier 3.yml b/custom_formats/2160p Quality Tier 3.yml index f743bd8..c93ea0a 100644 --- a/custom_formats/2160p Quality Tier 3.yml +++ b/custom_formats/2160p Quality Tier 3.yml @@ -1,7 +1,9 @@ name: 2160p Quality Tier 3 description: Matches release groups who fall under 2160p Quality Tier 3 tags: -- Release Group +- Release Group Tier +- Quality +- 2160p conditions: - name: Not WEB-DL negate: true diff --git a/custom_formats/2160p Quality Tier 4.yml b/custom_formats/2160p Quality Tier 4.yml index d9da59a..1ebc143 100644 --- a/custom_formats/2160p Quality Tier 4.yml +++ b/custom_formats/2160p Quality Tier 4.yml @@ -1,7 +1,9 @@ name: 2160p Quality Tier 4 description: Matches release groups who fall under 2160p Quality Tier 4 tags: -- Release Group +- Release Group Tier +- Quality +- 2160p conditions: - name: Not WEB-DL negate: true diff --git a/custom_formats/2160p Quality Tier 5.yml b/custom_formats/2160p Quality Tier 5.yml index 775f121..ff444f9 100644 --- a/custom_formats/2160p Quality Tier 5.yml +++ b/custom_formats/2160p Quality Tier 5.yml @@ -1,7 +1,9 @@ name: 2160p Quality Tier 5 description: Matches release groups who fall under 2160p Quality Tier 5 tags: -- Release Group +- Release Group Tier +- Quality +- 2160p conditions: - name: Not WEB-DL negate: true diff --git a/custom_formats/2160p Quality Tier 6.yml b/custom_formats/2160p Quality Tier 6.yml index 0cfb17c..9b2f5e3 100644 --- a/custom_formats/2160p Quality Tier 6.yml +++ b/custom_formats/2160p Quality Tier 6.yml @@ -1,7 +1,9 @@ name: 2160p Quality Tier 6 description: Matches release groups who fall under 2160p Quality Tier 6 tags: -- Release Group +- Release Group Tier +- Quality +- 2160p conditions: - name: Not WEB-DL negate: true diff --git a/custom_formats/B&W.yml b/custom_formats/B&W.yml index 786ec79..644ed3c 100644 --- a/custom_formats/B&W.yml +++ b/custom_formats/B&W.yml @@ -3,6 +3,7 @@ description: Matches the 'B&W' Regex Pattern tags: - Unwanted - Colour Grade +- Enhancement conditions: - name: B&W negate: false diff --git a/custom_formats/Blu-ray Remux.yml b/custom_formats/Blu-ray Remux.yml index 8734faa..fa0a609 100644 --- a/custom_formats/Blu-ray Remux.yml +++ b/custom_formats/Blu-ray Remux.yml @@ -5,17 +5,18 @@ description: A Blu-ray Remux is a direct rip of a Blu-ray's content without any to the source. tags: - Lossless +- Source conditions: - name: Blu-ray - type: source - required: true negate: false - source: bluray -- name: Remux - type: release_title required: true + source: bluray + type: source +- name: Remux negate: false pattern: Remux + required: true + type: release_title tests: - conditionResults: - matches: true diff --git a/custom_formats/Extras.yml b/custom_formats/Extras.yml index 1214f08..b48611b 100644 --- a/custom_formats/Extras.yml +++ b/custom_formats/Extras.yml @@ -3,6 +3,7 @@ description: Matches the 'Extras' Regex Pattern tags: - Unwanted - Extras +- Enhancement conditions: - name: Extras negate: false diff --git a/custom_formats/Free100.yml b/custom_formats/Free100.yml index 1e2b5ff..651c72c 100644 --- a/custom_formats/Free100.yml +++ b/custom_formats/Free100.yml @@ -3,6 +3,7 @@ description: Matches releases with 100% Freeleech tags: - Freeleech - Tweak +- Flag conditions: - flag: freeleech name: Free100 diff --git a/custom_formats/Free25.yml b/custom_formats/Free25.yml index d1f4cac..f89308c 100644 --- a/custom_formats/Free25.yml +++ b/custom_formats/Free25.yml @@ -3,10 +3,11 @@ description: Matches releases with 25% Freeleech tags: - Freeleech - Tweak +- Flag conditions: -- name: Free25 - type: indexer_flag - required: true +- flag: freeleech_25 + name: Free25 negate: false - flag: freeleech_25 + required: true + type: indexer_flag tests: [] diff --git a/custom_formats/Free50.yml b/custom_formats/Free50.yml index 63fff5f..857d56a 100644 --- a/custom_formats/Free50.yml +++ b/custom_formats/Free50.yml @@ -3,6 +3,7 @@ description: Matches releases with 50% Freeleech tags: - Freeleech - Tweak +- Flag conditions: - flag: halfleech name: Free50 diff --git a/custom_formats/Free75.yml b/custom_formats/Free75.yml index 0c46169..8c0b0c1 100644 --- a/custom_formats/Free75.yml +++ b/custom_formats/Free75.yml @@ -3,6 +3,7 @@ description: Matches releases with 75% Freeleech tags: - Freeleech - Tweak +- Flag conditions: - flag: freeleech_75 name: Free75 diff --git a/custom_formats/Not English.yml b/custom_formats/Not English.yml index 72204cb..816352a 100644 --- a/custom_formats/Not English.yml +++ b/custom_formats/Not English.yml @@ -1,7 +1,8 @@ name: Not English description: Matches releases that don't include an English language track. Dual audio is allowed. -tags: [] +tags: +- Language conditions: - exceptLanguage: true language: english diff --git a/custom_formats/Not Only English (Missing).yml b/custom_formats/Not Only English (Missing).yml index b74c33c..65344bb 100644 --- a/custom_formats/Not Only English (Missing).yml +++ b/custom_formats/Not Only English (Missing).yml @@ -2,7 +2,8 @@ name: Not Only English (Missing) description: "Attempts to matches releases with mutliple audio tracks but are not\ \ parsed as \"Multi Langauge\". Instead, attempts to find regular expressions which\ \ imply the release has dual audio. \n " -tags: [] +tags: +- Language conditions: - exceptLanguage: false language: english @@ -11,8 +12,8 @@ conditions: required: true type: language - name: Dual Audio Regex - type: release_title - required: true negate: false pattern: Dual Audio + required: true + type: release_title tests: [] diff --git a/custom_formats/Not Only English.yml b/custom_formats/Not Only English.yml index 69c1078..17777ab 100644 --- a/custom_formats/Not Only English.yml +++ b/custom_formats/Not Only English.yml @@ -1,7 +1,8 @@ name: Not Only English description: Matches releases that don't include an English language track. Dual audio is NOT allowed. -tags: [] +tags: +- Language conditions: - exceptLanguage: true language: english diff --git a/custom_formats/SD Bluray Encodes.yml b/custom_formats/SD Bluray Encodes.yml index d255af4..6bb4c60 100644 --- a/custom_formats/SD Bluray Encodes.yml +++ b/custom_formats/SD Bluray Encodes.yml @@ -3,30 +3,31 @@ description: 'Matches SD Encodes that were encoded from a Blu-ray source. Existe implies the existence of HD encodes. ' tags: - Encode +- Source conditions: - name: Bluray - type: source + negate: false required: true - negate: false source: bluray + type: source - name: 576p - type: resolution - required: false negate: false + required: false resolution: 576p + type: resolution - name: 540p - type: resolution - required: false negate: false + required: false resolution: 540p + type: resolution - name: 480p - type: resolution - required: false negate: false + required: false resolution: 480p -- name: 360p type: resolution - required: false +- name: 360p negate: false + required: false resolution: 360p + type: resolution tests: [] diff --git a/custom_formats/Scene.yml b/custom_formats/Scene.yml index 205bcbb..1123636 100644 --- a/custom_formats/Scene.yml +++ b/custom_formats/Scene.yml @@ -1,15 +1,16 @@ name: Scene description: Matches Scene regex patterns, negates any WEB-DLs. -tags: [] +tags: +- Release Group conditions: - name: Scene - type: release_title - required: true negate: false pattern: Scene + required: true + type: release_title - name: WEB-DL - type: source - required: false negate: true + required: false source: web_dl + type: source tests: [] diff --git a/custom_formats/UHDBits.yml b/custom_formats/UHDBits.yml index 4fbaf08..e1a1d04 100644 --- a/custom_formats/UHDBits.yml +++ b/custom_formats/UHDBits.yml @@ -3,6 +3,7 @@ description: Matches patterns unique to the UHDBits indexer. Needed to remove re based releases due to bad parsing tags: - Private Tracker +- Release Group conditions: - name: Year in Brackets negate: false diff --git a/custom_formats/x265 (Missing 2160p).yml b/custom_formats/x265 (Missing 2160p).yml index f8f1ace..59a470d 100644 --- a/custom_formats/x265 (Missing 2160p).yml +++ b/custom_formats/x265 (Missing 2160p).yml @@ -3,6 +3,7 @@ description: 'Attempts to match 2160p x265 encodes that aren''t labelled with an codec. ' tags: - x265 +- Codec conditions: - name: 2160p negate: false @@ -15,20 +16,20 @@ conditions: source: bluray type: source - name: Not REMUX - type: release_title - required: true negate: true pattern: Remux + required: true + type: release_title - name: Not x265 negate: true pattern: x265 required: true type: release_title - name: Not x264 - type: release_title - required: true negate: true pattern: x264 + required: true + type: release_title tests: - conditionResults: - matches: false diff --git a/custom_formats/x265 (Missing).yml b/custom_formats/x265 (Missing).yml index 707ac5e..c675acc 100644 --- a/custom_formats/x265 (Missing).yml +++ b/custom_formats/x265 (Missing).yml @@ -2,6 +2,7 @@ name: x265 (Missing) description: 'Attempts to match 1080p x265 encodes that are mislabeled as h265. ' tags: - x265 +- Codec conditions: - name: 1080p negate: false