Merge complete: resolved conflicts

This commit is contained in:
Profilarr 2025-09-29 22:27:54 -07:00
commit 7a4f074efb
32 changed files with 376 additions and 202 deletions

View File

@ -13,4 +13,9 @@ conditions:
required: true
source: bluray
type: source
- name: Not Remux
type: release_title
required: true
negate: true
pattern: Remux
tests: []

View File

@ -11,11 +11,21 @@ conditions:
required: true
resolution: 1080p
type: resolution
- name: Not WEB-DL
type: source
required: true
- name: Not Remux
negate: true
source: web_dl
pattern: Remux
required: true
type: release_title
- name: Bluray
type: source
required: false
negate: false
source: bluray
- name: WEBRip
negate: false
required: false
source: webrip
type: source
- name: DON
negate: false
pattern: DON

View File

@ -11,10 +11,20 @@ conditions:
required: true
resolution: 1080p
type: resolution
- name: Not WEB-DL
- name: Not Remux
negate: true
pattern: Remux
required: true
source: web_dl
type: release_title
- name: Bluray
type: source
required: false
negate: false
source: bluray
- name: WEBRip
negate: false
required: false
source: webrip
type: source
- name: c0kE
negate: false

View File

@ -11,11 +11,21 @@ conditions:
required: true
resolution: 1080p
type: resolution
- name: Not WEB-DL
type: source
required: true
- name: Not Remux
negate: true
source: web_dl
pattern: Remux
required: true
type: release_title
- name: Bluray
negate: false
required: false
source: bluray
type: source
- name: WEBRip
negate: false
required: false
source: webrip
type: source
- name: CRiSC
negate: false
pattern: CRiSC

View File

@ -11,10 +11,20 @@ conditions:
required: true
resolution: 1080p
type: resolution
- name: Not WEB-DL
- name: Not Remux
negate: true
pattern: Remux
required: true
source: web_dl
type: release_title
- name: Bluray
negate: false
required: false
source: bluray
type: source
- name: WEBRip
negate: false
required: false
source: webrip
type: source
- name: BMF
negate: false

View File

@ -11,21 +11,31 @@ conditions:
required: true
resolution: 1080p
type: resolution
- name: Not WEB-DL
- name: Not Remux
negate: true
pattern: Remux
required: true
source: web_dl
type: release_title
- name: Bluray
negate: false
required: false
source: bluray
type: source
- name: Not DVD
negate: true
required: true
source: dvd
- name: WEBRip
negate: false
required: false
source: webrip
type: source
- name: AJP69
negate: false
pattern: AJP69
required: false
type: release_group
- name: ATELiER
negate: false
pattern: ATELiER
required: false
type: release_group
- name: BV
negate: false
pattern: BV
@ -111,6 +121,11 @@ conditions:
pattern: hdalx
required: false
type: release_group
- name: HDC
negate: false
pattern: HDC
required: false
type: release_group
- name: iON
negate: false
pattern: iON
@ -121,6 +136,11 @@ conditions:
pattern: KASHMiR
required: false
type: release_group
- name: Kitsune
negate: false
pattern: Kitsune
required: false
type: release_group
- name: LEGi0N
negate: false
pattern: LEGi0N
@ -186,6 +206,11 @@ conditions:
pattern: PTer
required: false
type: release_group
- name: REBORN
negate: false
pattern: REBORN
required: false
type: release_group
- name: rightSIZE
negate: false
pattern: rightSIZE
@ -211,11 +236,21 @@ conditions:
pattern: SiMPLE
required: false
type: release_group
- name: SoLaR
negate: false
pattern: SoLaR
required: false
type: release_group
- name: SOP
negate: false
pattern: SOP
required: false
type: release_group
- name: SPHD
negate: false
pattern: SPHD
required: false
type: release_group
- name: TBB
negate: false
pattern: TBB
@ -226,6 +261,16 @@ conditions:
pattern: TDD
required: false
type: release_group
- name: TeamSyndicate
type: release_group
required: false
negate: false
pattern: TeamSyndicate
- name: TnP
negate: false
pattern: TnP
required: false
type: release_group
- name: VLAD
negate: false
pattern: VLAD
@ -236,6 +281,11 @@ conditions:
pattern: W4NK3R
required: false
type: release_group
- name: WiKi
negate: false
pattern: WiKi
required: false
type: release_group
- name: xander
negate: false
pattern: xander

View File

@ -15,21 +15,26 @@ conditions:
required: true
source: bluray
type: source
- name: BV
negate: false
pattern: BV
required: false
type: release_group
- name: Chotab
negate: false
pattern: Chotab
required: false
type: release_group
- name: Kitsune
negate: false
pattern: Kitsune
required: false
type: release_group
- name: REBORN
negate: false
pattern: REBORN
required: false
type: release_group
- name: SoLaR
negate: false
pattern: SoLaR
required: false
type: release_group
- name: W4NK3R
negate: false
pattern: W4NK3R

View File

@ -21,15 +21,25 @@ conditions:
required: false
type: release_group
- name: DEPTH
type: release_group
required: false
negate: false
pattern: DEPTH
required: false
type: release_group
- name: HiDt
negate: false
pattern: HiDt
required: false
type: release_group
- name: iFT
negate: false
pattern: iFT
required: false
type: release_group
- name: Kitsune
type: release_group
required: false
negate: false
pattern: Kitsune
- name: NCmt
negate: false
pattern: NCmt

View File

@ -160,11 +160,6 @@ conditions:
pattern: SMAHAWUG
required: false
type: release_group
- name: SoLaR
negate: false
pattern: SoLaR
required: false
type: release_group
- name: SPECTACLE
negate: false
pattern: SPECTACLE

View File

@ -11,11 +11,16 @@ conditions:
required: true
resolution: 720p
type: resolution
- name: Not WEB-DL
negate: true
required: true
source: web_dl
- name: Bluray
negate: false
required: false
source: bluray
type: source
- name: WEBRip
type: source
required: false
negate: false
source: webrip
- name: DON
negate: false
pattern: DON

View File

@ -11,10 +11,15 @@ conditions:
required: true
resolution: 720p
type: resolution
- name: Not WEB-DL
negate: true
required: true
source: web_dl
- name: Bluray
negate: false
required: false
source: bluray
type: source
- name: WEBRip
negate: false
required: false
source: webrip
type: source
- name: CRiSC
negate: false
@ -56,6 +61,11 @@ conditions:
pattern: VietHD
required: false
type: release_group
- name: ZoroSenpai
type: release_group
required: false
negate: false
pattern: ZoroSenpai
- name: ZQ
negate: false
pattern: ZQ

View File

@ -11,11 +11,16 @@ conditions:
required: true
resolution: 720p
type: resolution
- name: Not WEB-DL
negate: true
required: true
source: web_dl
- name: Bluray
negate: false
required: false
source: bluray
type: source
- name: WEBRip
type: source
required: false
negate: false
source: webrip
- name: BMF
negate: false
pattern: BMF

View File

@ -11,41 +11,46 @@ conditions:
required: true
resolution: 720p
type: resolution
- name: Not WEB-DL
negate: true
required: true
source: web_dl
type: source
- name: Dariush
type: release_group
- name: Bluray
negate: false
required: false
source: bluray
type: source
- name: WEBRip
type: source
required: false
negate: false
source: webrip
- name: Dariush
negate: false
pattern: Dariush
- name: D-ZON3
type: release_group
required: false
type: release_group
- name: D-ZON3
negate: false
pattern: D-Z0N3
required: false
type: release_group
- name: EA
negate: false
pattern: EA
required: false
type: release_group
- name: FoRM
type: release_group
required: false
negate: false
pattern: FoRM
- name: NTb
type: release_group
required: false
type: release_group
- name: NTb
negate: false
pattern: NTb
- name: PTer
type: release_group
required: false
type: release_group
- name: PTer
negate: false
pattern: PTer
required: false
type: release_group
- name: TDD
negate: false
pattern: TDD

View File

@ -11,11 +11,16 @@ conditions:
required: true
resolution: 720p
type: resolution
- name: Not WEB-DL
negate: true
required: true
source: web_dl
- name: Bluray
negate: false
required: false
source: bluray
type: source
- name: WEBRip
type: source
required: false
negate: false
source: webrip
- name: Chotab
negate: false
pattern: Chotab
@ -62,10 +67,10 @@ conditions:
required: false
type: release_group
- name: NyHD
type: release_group
required: false
negate: false
pattern: NyHD
required: false
type: release_group
- name: ORiGEN
negate: false
pattern: ORiGEN

View File

@ -184,11 +184,6 @@ conditions:
pattern: VisionXpert
required: false
type: release_group
- name: WiKi
negate: false
pattern: WiKi
required: false
type: release_group
- name: x0r
negate: false
pattern: x0r

View File

@ -70,10 +70,10 @@ conditions:
required: false
type: release_group
- name: DeViSiVE
type: release_group
required: false
negate: false
pattern: DeViSiVE
required: false
type: release_group
- name: DRX
negate: false
pattern: DRX
@ -204,11 +204,6 @@ conditions:
pattern: VisionXpert
required: false
type: release_group
- name: WiKi
negate: false
pattern: WiKi
required: false
type: release_group
- name: x0r
negate: false
pattern: x0r

View File

@ -0,0 +1,22 @@
name: Banned UHD Bluray
description: Matches UHD Bluray releases that are not from a quality tier
tags:
- Banned
- Release Group
conditions:
- name: UHD Bluray
negate: false
pattern: UHD Bluray
required: true
type: release_title
- name: Not 2160p
type: resolution
required: true
negate: true
resolution: 2160p
- name: Release Groups
negate: true
pattern: UHD Bluray Release Groups
required: true
type: release_group
tests: []

View File

@ -1,8 +1,3 @@
name: Banned WEBRip (Efficient)
description: Matches WEBRip releases that are not from a quality tier
tags:
- Banned
- Release Group
conditions:
- name: WEBRip
negate: false
@ -370,8 +365,13 @@ conditions:
required: true
type: release_group
- name: BTN
type: release_group
required: true
negate: true
pattern: BTN
required: true
type: release_group
description: Matches WEBRip releases that are not from a quality tier
name: Banned WEBRip (Efficient)
tags:
- Banned
- Release Group
tests: []

View File

@ -1,8 +1,3 @@
name: Banned WEBRip
description: Matches WEBRip releases that are not from a quality tier
tags:
- Banned
- Release Group
conditions:
- name: WEBRip
negate: false
@ -365,10 +360,15 @@ conditions:
required: true
type: release_group
- name: BTN
type: release_group
required: true
negate: true
pattern: BTN
required: true
type: release_group
description: Matches WEBRip releases that are not from a quality tier
name: Banned WEBRip
tags:
- Banned
- Release Group
tests:
- conditionResults:
- matches: false

View File

@ -1,5 +1,5 @@
name: HDR10 (Missing) (1080p)
description: Attempts to match HDR10 in 1080p x265 Encodes labelled with x265
name: HDR (Missing)
description: Attempts to match HDR in 1080p x265 Encodes labelled with x265
tags:
- Colour Grade
- HDR
@ -30,15 +30,15 @@ conditions:
required: true
type: release_title
- name: Not PQ
type: release_title
required: true
negate: true
pattern: PQ
- name: Not HLG
type: release_title
required: true
type: release_title
- name: Not HLG
negate: true
pattern: HLG
required: true
type: release_title
- name: Not HDR
negate: true
pattern: HDR

View File

@ -10,16 +10,16 @@ conditions:
required: true
resolution: 2160p
type: resolution
- name: Not WEB-DL
negate: true
- name: Bluray
negate: false
required: true
source: web_dl
source: bluray
type: source
- name: Release Groups
type: release_group
required: true
negate: true
pattern: HDR10 (Negation)
required: true
type: release_group
- name: Not SDR
negate: true
pattern: SDR

View File

@ -27,9 +27,9 @@ conditions:
required: true
type: release_title
- name: Release Groups
negate: true
pattern: UHD Bluray (Negation)
required: false
negate: false
pattern: UHD Bluray Release Groups
required: true
type: release_group
tests:
- conditionResults:

View File

@ -0,0 +1,21 @@
name: x265 (Remux)
description: Matches 'x265' regex pattern.
tags:
- Codec
conditions:
- name: x265
negate: false
pattern: HEVC
required: true
type: release_title
- name: Remux
type: release_title
required: true
negate: false
pattern: Remux
- name: Not 2160p
negate: true
required: true
resolution: 2160p
type: resolution
tests: []

View File

@ -1,19 +1,3 @@
name: 2160p Balanced
description: "2160p Balanced targets consistent & immutable 2160p **WEB-DLs w/ Lossy\
\ Audio**. \n\n- 2160p WEB-DL\n- Fallbacks in Place for Proper Quality Progression\n\
- 2160p WEB-DL > 1080p Bluray > 1080p WEB-DL > 720p Bluray > 720p WEB-DL > 480p\
\ WEB-DL > DVD"
tags:
- 2160p
- Balanced Focused
- HDR
- Lossy Audio
- x264
- h265
upgradesAllowed: true
minCustomFormatScore: 0
upgradeUntilScore: 400000
minScoreIncrement: 1
custom_formats:
- name: UHD Bluray
score: 280000
@ -225,12 +209,20 @@ custom_formats_sonarr:
score: -999999
- name: TV Extras
score: -999999
description: "2160p Balanced targets consistent & immutable 2160p **WEB-DLs w/ Lossy\
\ Audio**. \n\n- 2160p WEB-DL\n- Fallbacks in Place for Proper Quality Progression\n\
- 2160p WEB-DL > 1080p Bluray > 1080p WEB-DL > 720p Bluray > 720p WEB-DL > 480p\
\ WEB-DL > DVD"
language: must_original
minCustomFormatScore: 0
minScoreIncrement: 1
name: 2160p Balanced
qualities:
- id: -1
name: 2160p Balanced
description: Balanced capable releases. Typically WEB-DL would be the overwhelming
- description: Balanced capable releases. Typically WEB-DL would be the overwhelming
majority of releases, but there are occasional streaming optimised encodes that
should be preferred.
id: -1
name: 2160p Balanced
qualities:
- id: 4
name: Bluray-2160p
@ -238,9 +230,9 @@ qualities:
name: WEBDL-2160p
- id: 6
name: WEBRip-2160p
- id: -2
- description: Indistinguishable from source
id: -2
name: 1080p Transparent
description: Indistinguishable from source
qualities:
- id: 10
name: Bluray-1080p
@ -248,9 +240,9 @@ qualities:
name: WEBDL-1080p
- id: 11
name: WEBRip-1080p
- id: -3
- description: Fallback to 720p when 1080p cannot be found.
id: -3
name: 720p Fallback
description: Fallback to 720p when 1080p cannot be found.
qualities:
- id: 13
name: Bluray-720p
@ -262,9 +254,9 @@ qualities:
name: HDTV-1080p
- id: 16
name: HDTV-720p
- id: -4
- description: Standard Definition Fallbacks
id: -4
name: SD Fallback
description: Standard Definition Fallbacks
qualities:
- id: 18
name: Bluray-480p
@ -276,10 +268,18 @@ qualities:
name: DVD
- id: 24
name: SDTV
tags:
- 2160p
- Balanced Focused
- HDR
- Lossy Audio
- x264
- h265
upgradeUntilScore: 400000
upgrade_until:
id: -1
name: 2160p Balanced
description: Balanced capable releases. Typically WEB-DL would be the overwhelming
majority of releases, but there are occasional streaming optimised encodes that
should be preferred.
language: must_original
id: -1
name: 2160p Balanced
upgradesAllowed: true

View File

@ -1,25 +1,3 @@
name: 2160p Quality
description: '2160p Quality utilizes the [**Encode Efficiency Index**](https://dictionarry.dev/wiki/eei)
metric at a 55% target ratio to prioritize **transparent** x265 4k encodes
- 2160p Blurays
- Fallbacks in Place for Proper Quality Progression
- 2160p Bluray > 2160p WEB-DL > 1080p Bluray > 1080p WEB-DL > 720p Bluray > 720p
WEB-DL > 480p WEB-DL > DVD'
tags:
- 2160p
- Quality Focused
- HDR
- Lossless Audio
- x265
- h265
upgradesAllowed: true
minCustomFormatScore: 0
upgradeUntilScore: 400000
minScoreIncrement: 1
custom_formats:
- name: UHD Bluray
score: 280000
@ -237,10 +215,24 @@ custom_formats_sonarr:
score: -999999
- name: TV Extras
score: -999999
description: '2160p Quality utilizes the [**Encode Efficiency Index**](https://dictionarry.dev/wiki/eei)
metric at a 55% target ratio to prioritize **transparent** x265 4k encodes
- 2160p Blurays
- Fallbacks in Place for Proper Quality Progression
- 2160p Bluray > 2160p WEB-DL > 1080p Bluray > 1080p WEB-DL > 720p Bluray > 720p
WEB-DL > 480p WEB-DL > DVD'
language: must_original
minCustomFormatScore: 0
minScoreIncrement: 1
name: 2160p Quality
qualities:
- id: -1
- description: Indistinguishable from source
id: -1
name: 2160p Transparent
description: Indistinguishable from source
qualities:
- id: 4
name: Bluray-2160p
@ -250,17 +242,17 @@ qualities:
name: WEBRip-2160p
- id: 10
name: Bluray-1080p
- id: -2
- description: 1080 web source
id: -2
name: 1080p Web
description: 1080 web source
qualities:
- id: 9
name: WEBDL-1080p
- id: 11
name: WEBRip-1080p
- id: -3
- description: Fallback to 720p when 1080p cannot be found.
id: -3
name: 720p Fallback
description: Fallback to 720p when 1080p cannot be found.
qualities:
- id: 13
name: Bluray-720p
@ -272,9 +264,9 @@ qualities:
name: HDTV-1080p
- id: 16
name: HDTV-720p
- id: -4
- description: Standard Definition Fallbacks
id: -4
name: SD Fallback
description: Standard Definition Fallbacks
qualities:
- id: 18
name: Bluray-480p
@ -286,8 +278,16 @@ qualities:
name: DVD
- id: 24
name: SDTV
tags:
- 2160p
- Quality Focused
- HDR
- Lossless Audio
- x265
- h265
upgradeUntilScore: 400000
upgrade_until:
description: Indistinguishable from source
id: -1
name: 2160p Transparent
description: Indistinguishable from source
language: must_original
upgradesAllowed: true

View File

@ -1,15 +1,3 @@
name: 2160p Remux (Prefer Theatrical)
description: "Copied from 2160p Remux\n\nChanges: \n- Special Edition set to -40000"
tags:
- 2160p
- Remux
- HDR
- Lossless Audio
- h265
upgradesAllowed: true
minCustomFormatScore: 0
upgradeUntilScore: 400000
minScoreIncrement: 1
custom_formats:
- name: 2160p Remux
score: 160000
@ -187,10 +175,15 @@ custom_formats_sonarr:
score: 10
- name: TV Extras
score: -999999
description: "Copied from 2160p Remux\n\nChanges: \n- Special Edition set to -40000"
language: must_original
minCustomFormatScore: 0
minScoreIncrement: 1
name: 2160p Remux (Prefer Theatrical)
qualities:
- id: -2
- description: ''
id: -2
name: 2160p Formats
description: ''
qualities:
- id: 3
name: Remux-2160p
@ -206,9 +199,9 @@ qualities:
name: HDTV-1080p
- id: 16
name: HDTV-720p
- id: -1
- description: Standard Definition Fallbacks
id: -1
name: SD Fallback
description: Standard Definition Fallbacks
qualities:
- id: 22
name: DVD
@ -218,7 +211,14 @@ qualities:
name: WEBRip-480p
- id: 24
name: SDTV
tags:
- 2160p
- Remux
- HDR
- Lossless Audio
- h265
upgradeUntilScore: 400000
upgrade_until:
id: -2
name: 2160p Formats
language: must_original
upgradesAllowed: true

View File

@ -0,0 +1,7 @@
name: ATELiER
pattern: (?<=^|[\s.-])ATELiER\b
description: Matches "ATELiER" when preceded by whitespace, a hyphen or dot
tags:
- Release Group
- Bluray
tests: []

7
regex_patterns/HDC.yml Normal file
View File

@ -0,0 +1,7 @@
name: HDC
pattern: (?<=^|[\s.-])HDC\b
description: ''
tags:
- Release Group
- Bluray
tests: []

View File

@ -0,0 +1,7 @@
name: TeamSyndicate
pattern: (?<=^|[\s.-])TeamSyndicate\b
description: ''
tags:
- Release Group
- Bluray
tests: []

View File

@ -1,21 +0,0 @@
description: Match release groups who should not be categorized as UHD Bluray
name: UHD Bluray (Negation)
pattern: (?<=^|[\s.-])(D0ct0rLew|MALUS|MovieMan|SM737|SQS|WOU|Vialle)\b
tags: []
tests:
- expected: false
id: 1
input: Training Day 2001 1080p BluRay DDP 7 1 HDR x265-LEGi0N
lastRun: '2025-09-07T16:11:11.719322'
matchSpan: null
matchedContent: null
matchedGroups: []
passes: true
- expected: false
id: 2
input: Ahsoka.S01E01.2160p.UHD.BluRay.x265-SEGMENT
lastRun: '2025-09-07T16:11:11.719322'
matchSpan: null
matchedContent: null
matchedGroups: []
passes: true

View File

@ -0,0 +1,6 @@
name: UHD Bluray Release Groups
pattern: (?<=^|[\s.-])(AJP69|ATELiER|BMF|BV|Chotab|CJ|c0kE|CRiSC|CRX|CtrlHD|Dariush|de[42]|
decibel|DON|D-Z0N3|E.N.D|E1|EDPH|EbP|ESiR|EXCiSION|FilmHD|FoRM|FraMeSToR|FTW-HD|GALAXY|Geek|GS88|HANDJOB|hdalx|HDC|HDMaNiAcS|HiDt|HiFi|HiP|IDE|iFT|iON|KASHMiR|Kitsune|LEGi0N|LiNG|LolHD|LoRD|luvBB|MTeam|NCmt|nmd|NTb|NyHD|ORiGEN|P0W4HD|Penumbra|playHD|Positive|PTer|REBORN|rightSIZE|rttr|SA89|SaNcTi|SbR|SiMPLE|SoLaR|SOP|SPHD|TayTo|TBB|TDD|TeamSyndicate|TnP|VLAD|VietHD|W4NK3R|WiKi|WMING|xander|ZIMBO|ZoroSenpai|ZQ)\b
description: Match release groups who should not be categorized as UHD Bluray
tags: []
tests: []

View File

@ -1,6 +1,6 @@
name: WiKi
pattern: (?<=^|[\s.-])WiKi\b
description: Banned for Upscale
description: ''
tags:
- Release Group
- Bluray