From 243a09dbac458135aa659ab2635033c2590b72a0 Mon Sep 17 00:00:00 2001 From: fanxb Date: Sat, 3 Dec 2022 22:52:13 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat:=E5=8E=BB=E6=8E=89=E6=89=80=E6=9C=89?= =?UTF-8?q?=E7=A9=BA=E6=A0=BC=E4=BB=A5=E5=90=8E=E6=8F=90=E5=8F=96=E9=9B=86?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- openRenamerBackend/entity/bo/rules/AutoRule.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openRenamerBackend/entity/bo/rules/AutoRule.ts b/openRenamerBackend/entity/bo/rules/AutoRule.ts index 75799aa..a965ac4 100644 --- a/openRenamerBackend/entity/bo/rules/AutoRule.ts +++ b/openRenamerBackend/entity/bo/rules/AutoRule.ts @@ -57,7 +57,7 @@ export default class InsertRule implements RuleInterface { getStr += char; } } else if (this.type === 'eNum') { - let lowName = file.originName.toLocaleLowerCase(); + let lowName = file.originName.toLocaleLowerCase().replace(/ /g, ''); for (let i in eNumPatternArr) { let patternRes = lowName.match(eNumPatternArr[i]); if (patternRes && patternRes.length > 1) { From b3df96855f429005aed31badc7363c89411e16ed Mon Sep 17 00:00:00 2001 From: fanxb Date: Sun, 4 Dec 2022 12:48:08 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat:=E8=A7=84=E5=88=99=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- openRenamerBackend/entity/bo/rules/AutoRule.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openRenamerBackend/entity/bo/rules/AutoRule.ts b/openRenamerBackend/entity/bo/rules/AutoRule.ts index a965ac4..81b008c 100644 --- a/openRenamerBackend/entity/bo/rules/AutoRule.ts +++ b/openRenamerBackend/entity/bo/rules/AutoRule.ts @@ -5,7 +5,7 @@ import path from 'path'; let pattern = new RegExp(/s(eason)?(\d+)/); let eNumPatternArr = [new RegExp(/e(\d+)/), new RegExp(/\((\d+)\)/), new RegExp(/（(\d+)）/), new RegExp(/\.(\d+)\./), new RegExp(/-(\d+)-/), new RegExp(/(\d+)/)]; -let resolutionPattern = new RegExp(/(\d+[pP])/); +let resolutionPattern = new RegExp(/(\d{3,}[pP])/); let resolutionArr = ['1k', '1K', '2k', '2K', '4k', '4K', '8k', '8K']; let charSet = new Set([' ', '[', '.', '(', '（']); export default class InsertRule implements RuleInterface {