fix: 🐛 fix incorrect prior merges

Signed-off-by: Eric Nemchik <eric@nemchik.com>
pull/1410/head
Eric Nemchik 3 weeks ago
parent 889a2914e9
commit 481d16958c
No known key found for this signature in database

@ -32,7 +32,7 @@
"negate": true,
"required": true,
"fields": {
"value": "\\bDD[P+]|\\b(e[-_. ]?ac3)\\b"
"value": "\\bDD[P+]|\\b(e[-_. ]?ac-?3)\\b"
}
},
{
@ -41,7 +41,7 @@
"negate": true,
"required": true,
"fields": {
"value": "\\bDD[^a-z+]|(?<!e)ac3"
"value": "\\bDD[^a-z+]|(?<!e-)\\b(ac-?3)\\b"
}
},
{

@ -30,7 +30,7 @@
"negate": false,
"required": false,
"fields": {
"value": "\\[AC\\]|-AC\\b"
"value": "\\[AC\\]|-AC$"
}
},
{

@ -57,7 +57,7 @@
"negate": false,
"required": false,
"fields": {
"value": "\\b(ANE)\\b"
"value": "\\[ANE\\]|-ANE$"
}
},
{

@ -165,7 +165,7 @@
"negate": false,
"required": false,
"fields": {
"value": "\\[tenshi\\]|-tenshi\\b"
"value": "\\[tenshi\\]|-tenshi$"
}
}
]

@ -32,7 +32,7 @@
"negate": true,
"required": true,
"fields": {
"value": "\\bDD[^a-z+]|(?<!e)ac3"
"value": "\\bDD[^a-z+]|(?<!e-)\\b(ac-?3)\\b"
}
},
{
@ -41,7 +41,7 @@
"negate": true,
"required": true,
"fields": {
"value": "\\bDD[P+]|\\b(e[-_. ]?ac3)\\b"
"value": "\\bDD[P+]|\\b(e[-_. ]?ac-?3)\\b"
}
},
{

@ -14,7 +14,7 @@
"negate": false,
"required": true,
"fields": {
"value": "\\bDD[^a-z+]|(?<!e)ac3"
"value": "\\bDD[^a-z+]|(?<!e-)\\b(ac-?3)\\b"
}
},
{
@ -23,7 +23,7 @@
"negate": true,
"required": true,
"fields": {
"value": "\\bDD[P+]|\\b(e[-_. ]?ac3)\\b"
"value": "\\bDD[P+]|\\b(e[-_. ]?ac-?3)\\b"
}
},
{

@ -14,7 +14,7 @@
"negate": false,
"required": true,
"fields": {
"value": "\\bDD[P+]|\\b(e[-_. ]?ac3)\\b"
"value": "\\bDD[P+]|\\b(e[-_. ]?ac-?3)\\b"
}
},
{
@ -50,7 +50,7 @@
"negate": true,
"required": true,
"fields": {
"value": "\\bDD[^a-z+]|(?<!e)ac3"
"value": "\\bDD[^a-z+]|(?<!e-)\\b(ac-?3)\\b"
}
},
{

@ -14,7 +14,7 @@
"negate": false,
"required": true,
"fields": {
"value": "\\bDD[P+](?!A)|\\b(e[-_. ]?ac3)\\b"
"value": "\\bDD[P+](?!A)|\\b(e[-_. ]?ac-?3)\\b"
}
},
{
@ -23,7 +23,7 @@
"negate": true,
"required": true,
"fields": {
"value": "True[ .-]?HD|\\bATMOS(\\b|\\d)"
"value": "\\b(True[ .-]?HD|ATMOS|DDPA)(\\b|\\d)"
}
},
{

@ -32,7 +32,7 @@
"negate": true,
"required": true,
"fields": {
"value": "\\bDD[P+]|\\b(e[-_. ]?ac3)\\b"
"value": "\\bDD[P+]|\\b(e[-_. ]?ac-?3)\\b"
}
},
{
@ -50,7 +50,7 @@
"negate": true,
"required": true,
"fields": {
"value": "\\bDD[^a-z+]|(?<!e)ac3"
"value": "\\bDD[^a-z+]|(?<!e-)\\b(ac-?3)\\b"
}
},
{
@ -59,7 +59,7 @@
"negate": true,
"required": true,
"fields": {
"value": "\\b(dts[-_. ]?x)\\b(?!\\d)"
"value": "\\b(dts[-_.: ]?x7?)\\b(?![-_. ]?(26[456]))"
}
},
{

@ -33,7 +33,7 @@
"negate": true,
"required": true,
"fields": {
"value": "\\bDD[P+]|\\b(e[-_. ]?ac3)\\b"
"value": "\\bDD[P+]|\\b(e[-_. ]?ac-?3)\\b"
}
},
{
@ -51,7 +51,7 @@
"negate": true,
"required": true,
"fields": {
"value": "\\bDD[^a-z+]|(?<!e)ac3"
"value": "\\bDD[^a-z+]|(?<!e-)\\b(ac-?3)\\b"
}
},
{
@ -60,7 +60,7 @@
"negate": true,
"required": true,
"fields": {
"value": "\\b(dts[-_. ]?x)\\b(?!\\d)"
"value": "\\b(dts[-_.: ]?x7?)\\b(?![-_. ]?(26[456]))"
}
},
{

@ -33,7 +33,7 @@
"negate": true,
"required": true,
"fields": {
"value": "\\bDD[P+]|\\b(e[-_. ]?ac3)\\b"
"value": "\\bDD[P+]|\\b(e[-_. ]?ac-?3)\\b"
}
},
{
@ -42,7 +42,7 @@
"negate": true,
"required": true,
"fields": {
"value": "\\bDD[^a-z+]|(?<!e)ac3"
"value": "\\bDD[^a-z+]|(?<!e-)\\b(ac-?3)\\b"
}
},
{
@ -51,7 +51,7 @@
"negate": true,
"required": true,
"fields": {
"value": "\\b(dts[-_. ]?x)\\b(?!\\d)"
"value": "\\b(dts[-_.: ]?x7?)\\b(?![-_. ]?(26[456]))"
}
},
{

@ -5,6 +5,7 @@
"sqp-1-1080p": -10000,
"sqp-1-2160p": -10000
},
"trash_regex": "https://regex101.com/r/VWCW8c/1",
"name": "DTS X",
"includeCustomFormatWhenRenaming": false,
"specifications": [
@ -14,7 +15,7 @@
"negate": false,
"required": true,
"fields": {
"value": "\\b(dts[-_. ]?x)\\b(?!\\d)"
"value": "\\b(dts[-_.: ]?x7?)\\b(?![-_. ]?(26[456]))"
}
},
{
@ -32,7 +33,7 @@
"negate": true,
"required": true,
"fields": {
"value": "\\bDD[^a-z+]|(?<!e)ac3"
"value": "\\bDD[^a-z+]|(?<!e-)\\b(ac-?3)\\b"
}
},
{
@ -41,7 +42,7 @@
"negate": true,
"required": true,
"fields": {
"value": "\\bDD[P+]|\\b(e[-_. ]?ac3)\\b"
"value": "\\bDD[P+]|\\b(e[-_. ]?ac-?3)\\b"
}
},
{

@ -42,7 +42,7 @@
"negate": true,
"required": true,
"fields": {
"value": "\\bDD[P+]|\\b(e[-_. ]?ac3)\\b"
"value": "\\bDD[P+]|\\b(e[-_. ]?ac-?3)\\b"
}
},
{
@ -60,7 +60,7 @@
"negate": true,
"required": true,
"fields": {
"value": "\\bDD[^a-z+]|(?<!e)ac3"
"value": "\\bDD[^a-z+]|(?<!e-)\\b(ac-?3)\\b"
}
},
{
@ -69,7 +69,7 @@
"negate": true,
"required": true,
"fields": {
"value": "\\b(dts[-_. ]?x)\\b(?!\\d)"
"value": "\\b(dts[-_.: ]?x7?)\\b(?![-_. ]?(26[456]))"
}
},
{

@ -48,7 +48,7 @@
"negate": false,
"required": false,
"fields": {
"value": "^(?!.*Dual[-_. ]?Audio).*\\bKS\\b"
"value": "^(?!.*(dual[ ._-]?audio|[\\[(]dual[\\]]|(JA|ZH)\\+EN|EN\\+(JA|ZH))).*\\bKS\\b"
}
},
{

@ -59,7 +59,7 @@
"negate": true,
"required": true,
"fields": {
"value": "\\bDD[^a-z+]|(?<!e)ac3"
"value": "\\bDD[^a-z+]|(?<!e-)\\b(ac-?3)\\b"
}
},
{
@ -68,7 +68,7 @@
"negate": true,
"required": true,
"fields": {
"value": "\\bDD[P+]|\\b(e[-_. ]?ac3)\\b"
"value": "\\bDD[P+]|\\b(e[-_. ]?ac-?3)\\b"
}
}
]

@ -9,7 +9,7 @@
"negate": false,
"required": true,
"fields": {
"value": "\\b(hmax|hbom|hbo[ ._-]max)\\b(?=[ ._-]web[ ._-]?(dl|rip)\\b)"
"value": "\\b(hmax|hbom|hbo[ ._-]?max)\\b(?=[ ._-]web[ ._-]?(dl|rip)\\b)"
}
},
{

@ -59,7 +59,7 @@
"negate": true,
"required": true,
"fields": {
"value": "\\bDD[^a-z+]|(?<!e)ac3"
"value": "\\bDD[^a-z+]|(?<!e-)\\b(ac-?3)\\b"
}
},
{
@ -68,7 +68,7 @@
"negate": true,
"required": true,
"fields": {
"value": "\\bDD[P+]|\\b(e[-_. ]?ac3)\\b"
"value": "\\bDD[P+]|\\b(e[-_. ]?ac-?3)\\b"
}
}
]

@ -32,7 +32,7 @@
"negate": true,
"required": true,
"fields": {
"value": "\\bDD[^a-z+]|(?<!e)ac3"
"value": "\\bDD[^a-z+]|(?<!e-)\\b(ac-?3)\\b"
}
},
{
@ -41,7 +41,7 @@
"negate": true,
"required": true,
"fields": {
"value": "\\bDD[P+]|\\b(e[-_. ]?ac3)\\b"
"value": "\\bDD[P+]|\\b(e[-_. ]?ac-?3)\\b"
}
},
{
@ -59,7 +59,7 @@
"negate": true,
"required": true,
"fields": {
"value": "\\b(dts[-_. ]?x)\\b(?!\\d)"
"value": "\\b(dts[-_.: ]?x7?)\\b(?![-_. ]?(26[456]))"
}
},
{

@ -32,7 +32,7 @@
"negate": true,
"required": true,
"fields": {
"value": "\\bDD[P+]|\\b(e[-_. ]?ac3)\\b"
"value": "\\bDD[P+]|\\b(e[-_. ]?ac-?3)\\b"
}
},
{
@ -59,7 +59,7 @@
"negate": true,
"required": true,
"fields": {
"value": "\\bDD[^a-z+]|(?<!e)ac3"
"value": "\\bDD[^a-z+]|(?<!e-)\\b(ac-?3)\\b"
}
},
{

@ -31,7 +31,7 @@
"negate": false,
"required": false,
"fields": {
"value": "\\b(The[ ._-]Upscaler)\\b"
"value": "\\b(The[ ._-]?Upscaler)\\b"
}
},
{

@ -30,7 +30,7 @@
"negate": true,
"required": true,
"fields": {
"value": "\\bDD[P+]|\\b(e[-_. ]?ac3)\\b"
"value": "\\bDD[P+]|\\b(e[-_. ]?ac-?3)\\b"
}
},
{
@ -39,7 +39,7 @@
"negate": true,
"required": true,
"fields": {
"value": "\\bDD[^a-z+]|(?<!e)ac3"
"value": "\\bDD[^a-z+]|(?<!e-)\\b(ac-?3)\\b"
}
},
{

@ -39,7 +39,7 @@
"negate": false,
"required": false,
"fields": {
"value": "\\[AC\\]|-AC\\b"
"value": "\\[AC\\]|-AC$"
}
},
{

@ -66,7 +66,7 @@
"negate": false,
"required": false,
"fields": {
"value": "\\b(ANE)\\b"
"value": "\\[ANE\\]|-ANE$"
}
},
{

@ -174,7 +174,7 @@
"negate": false,
"required": false,
"fields": {
"value": "\\[tenshi\\]|-tenshi\\b"
"value": "\\[tenshi\\]|-tenshi$"
}
}
]

@ -30,7 +30,7 @@
"negate": true,
"required": true,
"fields": {
"value": "\\bDD[^a-z+]|(?<!e)ac3"
"value": "\\bDD[^a-z+]|(?<!e-)\\b(ac-?3)\\b"
}
},
{
@ -39,7 +39,7 @@
"negate": true,
"required": true,
"fields": {
"value": "\\bDD[P+]|\\b(e[-_. ]?ac3)\\b"
"value": "\\bDD[P+]|\\b(e[-_. ]?ac-?3)\\b"
}
},
{

@ -12,7 +12,7 @@
"negate": false,
"required": true,
"fields": {
"value": "\\bDD[^a-z+]|(?<!e)ac3"
"value": "\\bDD[^a-z+]|(?<!e-)\\b(ac-?3)\\b"
}
},
{
@ -21,7 +21,7 @@
"negate": true,
"required": true,
"fields": {
"value": "\\bDD[P+]|\\b(e[-_. ]?ac3)\\b"
"value": "\\bDD[P+]|\\b(e[-_. ]?ac-?3)\\b"
}
},
{

@ -12,7 +12,7 @@
"negate": false,
"required": true,
"fields": {
"value": "\\bDD[P+]|\\b(e[-_. ]?ac3)\\b"
"value": "\\bDD[P+]|\\b(e[-_. ]?ac-?3)\\b"
}
},
{
@ -48,7 +48,7 @@
"negate": true,
"required": true,
"fields": {
"value": "\\bDD[^a-z+]|(?<!e)ac3"
"value": "\\bDD[^a-z+]|(?<!e-)\\b(ac-?3)\\b"
}
},
{

@ -12,7 +12,7 @@
"negate": false,
"required": true,
"fields": {
"value": "\\bDD[P+](?!A)|\\b(e[-_. ]?ac3)\\b"
"value": "\\bDD[P+](?!A)|\\b(e[-_. ]?ac-?3)\\b"
}
},
{
@ -21,7 +21,7 @@
"negate": true,
"required": true,
"fields": {
"value": "True[ .-]?HD|\\bATMOS(\\b|\\d)"
"value": "\\b(True[ .-]?HD|ATMOS|DDPA)(\\b|\\d)"
}
},
{

@ -30,7 +30,7 @@
"negate": true,
"required": true,
"fields": {
"value": "\\bDD[P+]|\\b(e[-_. ]?ac3)\\b"
"value": "\\bDD[P+]|\\b(e[-_. ]?ac-?3)\\b"
}
},
{
@ -48,7 +48,7 @@
"negate": true,
"required": true,
"fields": {
"value": "\\bDD[^a-z+]|(?<!e)ac3"
"value": "\\bDD[^a-z+]|(?<!e-)\\b(ac-?3)\\b"
}
},
{
@ -57,7 +57,7 @@
"negate": true,
"required": true,
"fields": {
"value": "\\b(dts[-_. ]?x)\\b(?!\\d)"
"value": "\\b(dts[-_.: ]?x7?)\\b(?![-_. ]?(26[456]))"
}
},
{

@ -31,7 +31,7 @@
"negate": true,
"required": true,
"fields": {
"value": "\\bDD[P+]|\\b(e[-_. ]?ac3)\\b"
"value": "\\bDD[P+]|\\b(e[-_. ]?ac-?3)\\b"
}
},
{
@ -49,7 +49,7 @@
"negate": true,
"required": true,
"fields": {
"value": "\\bDD[^a-z+]|(?<!e)ac3"
"value": "\\bDD[^a-z+]|(?<!e-)\\b(ac-?3)\\b"
}
},
{
@ -58,7 +58,7 @@
"negate": true,
"required": true,
"fields": {
"value": "\\b(dts[-_. ]?x)\\b(?!\\d)"
"value": "\\b(dts[-_.: ]?x7?)\\b(?![-_. ]?(26[456]))"
}
},
{

@ -31,7 +31,7 @@
"negate": true,
"required": true,
"fields": {
"value": "\\bDD[P+]|\\b(e[-_. ]?ac3)\\b"
"value": "\\bDD[P+]|\\b(e[-_. ]?ac-?3)\\b"
}
},
{
@ -40,7 +40,7 @@
"negate": true,
"required": true,
"fields": {
"value": "\\bDD[^a-z+]|(?<!e)ac3"
"value": "\\bDD[^a-z+]|(?<!e-)\\b(ac-?3)\\b"
}
},
{
@ -49,7 +49,7 @@
"negate": true,
"required": true,
"fields": {
"value": "\\b(dts[-_. ]?x)\\b(?!\\d)"
"value": "\\b(dts[-_.: ]?x7?)\\b(?![-_. ]?(26[456]))"
}
},
{

@ -3,6 +3,7 @@
"trash_scores": {
"default": 4500
},
"trash_regex": "https://regex101.com/r/VWCW8c/1",
"name": "DTS X",
"includeCustomFormatWhenRenaming": false,
"specifications": [
@ -12,7 +13,7 @@
"negate": false,
"required": true,
"fields": {
"value": "\\b(dts[-_. ]?x)\\b(?!\\d)"
"value": "\\b(dts[-_.: ]?x7?)\\b(?![-_. ]?(26[456]))"
}
},
{
@ -30,7 +31,7 @@
"negate": true,
"required": true,
"fields": {
"value": "\\bDD[^a-z+]|(?<!e)ac3"
"value": "\\bDD[^a-z+]|(?<!e-)\\b(ac-?3)\\b"
}
},
{
@ -39,7 +40,7 @@
"negate": true,
"required": true,
"fields": {
"value": "\\bDD[P+]|\\b(e[-_. ]?ac3)\\b"
"value": "\\bDD[P+]|\\b(e[-_. ]?ac-?3)\\b"
}
},
{

@ -40,7 +40,7 @@
"negate": true,
"required": true,
"fields": {
"value": "\\bDD[P+]|\\b(e[-_. ]?ac3)\\b"
"value": "\\bDD[P+]|\\b(e[-_. ]?ac-?3)\\b"
}
},
{
@ -58,7 +58,7 @@
"negate": true,
"required": true,
"fields": {
"value": "\\bDD[^a-z+]|(?<!e)ac3"
"value": "\\bDD[^a-z+]|(?<!e-)\\b(ac-?3)\\b"
}
},
{
@ -67,7 +67,7 @@
"negate": true,
"required": true,
"fields": {
"value": "\\b(dts[-_. ]?x)\\b(?!\\d)"
"value": "\\b(dts[-_.: ]?x7?)\\b(?![-_. ]?(26[456]))"
}
},
{

@ -48,7 +48,7 @@
"negate": false,
"required": false,
"fields": {
"value": "^(?!.*Dual[-_. ]?Audio).*\\bKS\\b"
"value": "^(?!.*(dual[ ._-]?audio|[\\[(]dual[\\]]|(JA|ZH)\\+EN|EN\\+(JA|ZH))).*\\bKS\\b"
}
},
{

@ -57,7 +57,7 @@
"negate": true,
"required": true,
"fields": {
"value": "\\bDD[^a-z+]|(?<!e)ac3"
"value": "\\bDD[^a-z+]|(?<!e-)\\b(ac-?3)\\b"
}
},
{
@ -66,7 +66,7 @@
"negate": true,
"required": true,
"fields": {
"value": "\\bDD[P+]|\\b(e[-_. ]?ac3)\\b"
"value": "\\bDD[P+]|\\b(e[-_. ]?ac-?3)\\b"
}
}
]

@ -12,7 +12,7 @@
"negate": false,
"required": true,
"fields": {
"value": "\\b(hmax|hbom|hbo[ ._-]max)\\b(?=[ ._-]web[ ._-]?(dl|rip)\\b)"
"value": "\\b(hmax|hbom|hbo[ ._-]?max)\\b(?=[ ._-]web[ ._-]?(dl|rip)\\b)"
}
},
{

@ -114,15 +114,6 @@
"value": "^(MeGusta)$"
}
},
{
"name": "NERO",
"implementation": "ReleaseGroupSpecification",
"negate": false,
"required": false,
"fields": {
"value": "^(NERO)$"
}
},
{
"name": "nhanc3",
"implementation": "ReleaseGroupSpecification",

@ -57,7 +57,7 @@
"negate": true,
"required": true,
"fields": {
"value": "\\bDD[^a-z+]|(?<!e)ac3"
"value": "\\bDD[^a-z+]|(?<!e-)\\b(ac-?3)\\b"
}
},
{
@ -66,7 +66,7 @@
"negate": true,
"required": true,
"fields": {
"value": "\\bDD[P+]|\\b(e[-_. ]?ac3)\\b"
"value": "\\bDD[P+]|\\b(e[-_. ]?ac-?3)\\b"
}
}
]

@ -5,11 +5,11 @@
"specifications": [
{
"name": "Season Packs",
"implementation": "ReleaseTitleSpecification",
"implementation": "ReleaseTypeSpecification",
"negate": false,
"required": false,
"fields": {
"value": "\\bS\\d+\\b(?!E\\d+\\b)"
"value": 3
}
}
]

@ -30,7 +30,7 @@
"negate": true,
"required": true,
"fields": {
"value": "\\bDD[^a-z+]|(?<!e)ac3"
"value": "\\bDD[^a-z+]|(?<!e-)\\b(ac-?3)\\b"
}
},
{
@ -39,7 +39,7 @@
"negate": true,
"required": true,
"fields": {
"value": "\\bDD[P+]|\\b(e[-_. ]?ac3)\\b"
"value": "\\bDD[P+]|\\b(e[-_. ]?ac-?3)\\b"
}
},
{
@ -57,7 +57,7 @@
"negate": true,
"required": true,
"fields": {
"value": "\\b(dts[-_. ]?x)\\b(?!\\d)"
"value": "\\b(dts[-_.: ]?x7?)\\b(?![-_. ]?(26[456]))"
}
},
{

@ -30,7 +30,7 @@
"negate": true,
"required": true,
"fields": {
"value": "\\bDD[P+]|\\b(e[-_. ]?ac3)\\b"
"value": "\\bDD[P+]|\\b(e[-_. ]?ac-?3)\\b"
}
},
{
@ -57,7 +57,7 @@
"negate": true,
"required": true,
"fields": {
"value": "\\bDD[^a-z+]|(?<!e)ac3"
"value": "\\bDD[^a-z+]|(?<!e-)\\b(ac-?3)\\b"
}
}
]

@ -21,7 +21,7 @@
"negate": false,
"required": false,
"fields": {
"value": "\\b(hmax|hbom|hbo[ ._-]max)\\b(?=[ ._-]web[ ._-]?(dl|rip)\\b)"
"value": "\\b(hmax|hbom|hbo[ ._-]?max)\\b(?=[ ._-]web[ ._-]?(dl|rip)\\b)"
}
},
{

@ -31,7 +31,7 @@
"negate": false,
"required": false,
"fields": {
"value": "\\b(The[ ._-]Upscaler)\\b"
"value": "\\b(The[ ._-]?Upscaler)\\b"
}
},
{

@ -20,7 +20,7 @@
{
"score": 80,
"terms": [
"/\\b(hmax|hbom|hbo[ ._-]max)\\b(?=[ ._-]web[ ._-]?(dl|rip)\\b)/i",
"/\\b(hmax|hbom|hbo[ ._-]?max)\\b(?=[ ._-]web[ ._-]?(dl|rip)\\b)/i",
"/\\b(qibi|quibi)\\b(?=[ ._-]web[ ._-]?(dl|rip)\\b)/i"
]
},

Loading…
Cancel
Save