fix(regex, format): Improve regex boundary matching and remove duplicates (#36)

* tweak(regex):  Improve SM737 boundary matching

* remove(regex): Duplicate patterns created by group tiers

* tweak(group_tiers): Prevent creation of duplicate patterns

* tweak(regex): Use `THREESOME` instead of `threesome`

* tweak(regex): Rename `Colour` to `Colourisation`

* tweak(regex): Improve `Colourisation` description
This commit is contained in:
Brandon
2025-03-10 14:36:53 -04:00
committed by GitHub
parent 35aebee89f
commit b53c97a343
19 changed files with 98 additions and 166 deletions

View File

@@ -12,13 +12,13 @@ conditions:
resolution: 1080p resolution: 1080p
type: resolution type: resolution
- name: Not WEB-DL - name: Not WEB-DL
type: source
required: true
negate: true negate: true
required: true
source: web_dl source: web_dl
- name: c0ke type: source
- name: c0kE
negate: false negate: false
pattern: c0ke pattern: c0kE
required: false required: false
type: release_group type: release_group
- name: CtrlHD - name: CtrlHD

View File

@@ -82,7 +82,7 @@ conditions:
type: release_group type: release_group
- name: whiterhino - name: whiterhino
negate: false negate: false
pattern: whiterhino pattern: WhiteRhino
required: false required: false
type: release_group type: release_group
- name: ReaLHD - name: ReaLHD
@@ -135,11 +135,6 @@ conditions:
pattern: SPECTACLE pattern: SPECTACLE
required: false required: false
type: release_group type: release_group
- name: spectacle
negate: false
pattern: spectacle
required: false
type: release_group
- name: HD77 - name: HD77
negate: false negate: false
pattern: HD77 pattern: HD77
@@ -215,11 +210,6 @@ conditions:
pattern: AAAUHD pattern: AAAUHD
required: false required: false
type: release_group type: release_group
- name: guhzer
negate: false
pattern: guhzer
required: false
type: release_group
- name: GUHZER - name: GUHZER
negate: false negate: false
pattern: GUHZER pattern: GUHZER

View File

@@ -25,16 +25,6 @@ conditions:
pattern: BOREDOR pattern: BOREDOR
required: false required: false
type: release_group type: release_group
- name: threesome
negate: false
pattern: threesome
required: false
type: release_group
- name: Blzt
negate: false
pattern: Blzt
required: false
type: release_group
- name: LittleBakas - name: LittleBakas
negate: false negate: false
pattern: LittleBakas pattern: LittleBakas
@@ -75,11 +65,6 @@ conditions:
pattern: UHDCLUBREMUX pattern: UHDCLUBREMUX
required: false required: false
type: release_group type: release_group
- name: invandraren
negate: false
pattern: invandraren
required: false
type: release_group
- name: dkore - name: dkore
negate: false negate: false
pattern: dkore pattern: dkore
@@ -90,4 +75,9 @@ conditions:
pattern: Lucifer pattern: Lucifer
required: false required: false
type: release_group type: release_group
- name: THREESOME
type: release_group
required: false
negate: false
pattern: THREESOME
tests: [] tests: []

View File

@@ -12,7 +12,7 @@ conditions:
type: release_title type: release_title
- name: Colour - name: Colour
negate: true negate: true
pattern: Colour pattern: Colourisation
required: true required: true
type: release_title type: release_title
tests: tests:

View File

@@ -13,7 +13,7 @@ conditions:
type: source type: source
- name: TBB - name: TBB
negate: false negate: false
pattern: c0ke pattern: TBB
required: false required: false
type: release_group type: release_group
- name: Dariush - name: Dariush

View File

@@ -412,7 +412,7 @@
}, },
{ {
"tier": 5, "tier": 5,
"name": "whiterhino", "name": "WhiteRhino",
"score": 45, "score": 45,
"efficiency": 41.0, "efficiency": 41.0,
"releases": 74, "releases": 74,
@@ -653,15 +653,6 @@
"std_dev": 0.0, "std_dev": 0.0,
"efficiency_delta": 27.0 "efficiency_delta": 27.0
}, },
{
"tier": 5,
"name": "guhzer",
"score": 8.99,
"efficiency": 41.0,
"releases": 1,
"std_dev": 0,
"efficiency_delta": 14.000000000000007
},
{ {
"tier": 5, "tier": 5,
"name": "GUHZER", "name": "GUHZER",
@@ -709,7 +700,7 @@
}, },
{ {
"tier": 6, "tier": 6,
"name": "threesome", "name": "THREESOME",
"score": 5.03, "score": 5.03,
"efficiency": 38.0, "efficiency": 38.0,
"releases": 1, "releases": 1,

View File

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

View File

@@ -1,72 +0,0 @@
name: Colour
pattern: \bcolou?r(i[sz]ed?|ed)?\b
description: '- Matches `colour`, `coloured`, `colourize`, `colourized`.
- Handles both American ("color") and British ("colour") spellings.'
tags:
- Colour Grade
- Enhancement
tests:
- expected: true
id: 1
input: colour
lastRun: '2025-02-13T13:29:13.301346'
matchSpan:
end: 6
start: 0
matchedContent: colour
matchedGroups:
- null
passes: true
- expected: true
id: 3
input: coloured
lastRun: '2025-02-13T13:29:13.301346'
matchSpan:
end: 8
start: 0
matchedContent: coloured
matchedGroups:
- ed
passes: true
- expected: true
id: 4
input: colourize
lastRun: '2025-02-13T13:29:13.301346'
matchSpan:
end: 9
start: 0
matchedContent: colourize
matchedGroups:
- ize
passes: true
- expected: true
id: 7
input: colourized
lastRun: '2025-02-13T13:29:13.301346'
matchSpan:
end: 10
start: 0
matchedContent: colourized
matchedGroups:
- ized
passes: true
- expected: true
id: 8
input: colored
lastRun: '2025-02-13T13:29:13.301346'
matchSpan:
end: 7
start: 0
matchedContent: colored
matchedGroups:
- ed
passes: true
- expected: false
id: 9
input: discolor
lastRun: '2025-02-13T13:29:13.301346'
matchSpan: null
matchedContent: null
matchedGroups: []
passes: true

View File

@@ -0,0 +1,81 @@
name: Colourisation
pattern: \bcolou?r(i[sz]ed?|ed)?\b
description: 'Colourisation (or colorization in American English) is the process of
adding colour to black-and-white, sepia, or other monochrome images. Matches variations
of `color` in both American and British spellings, including:
- **Base forms:** `color`, `colour`
- **Past tense/adjective forms:** `colored`, `coloured`
- **Verb forms:** `colorize`, `colourize`, `colorise`, `colourise`
- **Past participles:** `colorized`, `coloured`, `colourized`, `colourised`'
tags:
- Colour Grade
- Enhancement
tests:
- expected: true
id: 1
input: colour
lastRun: '2025-02-22T19:10:06.067266'
matchSpan:
end: 6
start: 0
matchedContent: colour
matchedGroups:
- null
passes: true
- expected: true
id: 3
input: coloured
lastRun: '2025-02-22T19:10:06.067266'
matchSpan:
end: 8
start: 0
matchedContent: coloured
matchedGroups:
- ed
passes: true
- expected: true
id: 4
input: colourise
lastRun: '2025-02-22T19:10:06.067266'
matchSpan:
end: 9
start: 0
matchedContent: colourise
matchedGroups:
- ise
passes: true
- expected: true
id: 7
input: colourised
lastRun: '2025-02-22T19:10:06.067266'
matchSpan:
end: 10
start: 0
matchedContent: colourised
matchedGroups:
- ised
passes: true
- expected: true
id: 8
input: colored
lastRun: '2025-02-22T19:10:06.067266'
matchSpan:
end: 7
start: 0
matchedContent: colored
matchedGroups:
- ed
passes: true
- expected: false
id: 9
input: discolor
lastRun: '2025-02-22T19:10:06.067266'
matchSpan: null
matchedContent: null
matchedGroups: []
passes: true

View File

@@ -1,5 +1,5 @@
name: SM737 name: SM737
pattern: SM737 pattern: (?<=^|[\s.-])SM737\b
description: '' description: ''
tags: tags:
- Release Group - Release Group

View File

@@ -3,4 +3,4 @@ pattern: (?<=^|[\s.-])THREESOME\b
description: '' description: ''
tags: tags:
- Release Group - Release Group
tests: null tests: []

View File

@@ -3,4 +3,4 @@ pattern: (?<=^|[\s.-])WhiteRhino\b
description: '' description: ''
tags: tags:
- Release Group - Release Group
tests: null tests: []

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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