feat：优化季识别

openRenamerBackend/entity/bo/rules/AutoRule.ts

@@ -1,6 +1,7 @@
 import RuleInterface from "./RuleInterface";
 import FileObj from "../../vo/FileObj";
 import path from 'path';
+import {getSeason} from "../../../util/MediaUtil";
 
 
 let pattern = new RegExp(/s(eason)?(\d+)/);
@@ -35,14 +36,12 @@ export default class InsertRule implements RuleInterface {
     deal(file: FileObj): void {
         //识别到的内容
         let getStr = null;
-        let patternRes = path.basename(file.path).replace(/[ ]+/, "").toLocaleLowerCase().match(pattern);
+        let season = getSeason(path.basename(file.path));
         if (this.type === 'season') {
-            if (patternRes && patternRes[2]) {
-                getStr = patternRes[2];
-            }
+            getStr = season;
         } else if (this.type === 'name') {
             let originName = null;
-            if (patternRes && patternRes[2]) {
+            if (season && season.length > 0) {
                 //说明是剧集,取父文件夹的父文件夹名称
                 originName = path.basename(path.resolve(file.path, '..'));
             } else {

openRenamerBackend/entity/bo/rules/InsertRule.ts

@@ -1,9 +1,9 @@
 import RuleInterface from "./RuleInterface";
 import FileObj from "../../vo/FileObj";
 import path from 'path';
+import {getSeason} from "../../../util/MediaUtil";
 
 
-let pattern = new RegExp(/s(eason)?(\d+)/);
 export default class InsertRule implements RuleInterface {
 
     /**
@@ -60,10 +60,7 @@ export default class InsertRule implements RuleInterface {
         let season = '';
 
         if (this.autoSeason) {
-			let patternRes = path.basename(file.path).replace(/[ ]+/, "").toLocaleLowerCase().match(pattern);
-			if (patternRes && patternRes[2]) {
-				season = patternRes[2];
-			}
+            season = getSeason(path.basename(file.path));
         }
         switch (this.type) {
             case "front":

openRenamerBackend/util/MediaUtil.ts

@@ -1,3 +1,4 @@
+const path = require("path")
 const videoSet = new Set(["flv", 'avi', 'wmv', 'dat', 'vob', 'mpg', 'mpeg', 'mp4', '3gp', '3g2', 'mkv', 'rm', 'rmvb', 'mov', 'qt', 'ogg', 'ogv', 'oga', 'mod']);
 
 /**
@@ -34,3 +35,23 @@ export function isNfo(str: string) {
     }
     return "nfo" == str;
 }
+
+let pattern1 = new RegExp(/s(eason)?\.?(\d+)/);
+let pattern2 = new RegExp(/(\d+)/);
+
+/**
+ * 识别季号
+ * @param str
+ */
+export function getSeason(name: string) {
+    name = name.replace(/[ ]+/, "").toLocaleLowerCase();
+    let patternRes = name.match(pattern1);
+    if (patternRes && patternRes[2]) {
+        return patternRes[2];
+    }
+    patternRes = name.match(pattern2);
+    if (patternRes && patternRes[1]) {
+        return patternRes[1];
+    }
+    return "";
+}