Merge pull request 'dev' (#52) from dev into main

Reviewed-on: #52

electron/package.json

@@ -1,6 +1,6 @@
 {
-  "name": "electron",
-  "version": "1.1.0",
+  "name": "renamer",
+  "version": "1.8.0",
   "description": "",
   "main": "main.js",
   "scripts": {

openRenamerBackend/entity/bo/rules/DeleteRule.ts

@@ -1,92 +1,99 @@
 import RuleInterface from "./RuleInterface";
+import {dealFileName} from "./RuleInterface";
 import FileObj from "../../vo/FileObj";
 import path from 'path';
 
 export default class DeleteRule implements RuleInterface {
-	/**
-	 * 类别：deletePart:部分删除，deleteAll:全部删除
-	 */
-	type: string;
-	/**
-	 * 部分删除时的开始信息
-	 */
-	start: DeleteRuleItem;
-	/**
-	 * 部分删除时的结束信息
+    /**
+     * 类别：deletePart:部分删除，deleteAll:全部删除
+     */
+    type: string;
+    /**
+     * 部分删除时的开始信息
+     */
+    start: DeleteRuleItem;
+    /**
+     * 部分删除时的结束信息
 
-	 */
-	end: DeleteRuleItem;
-	/**
-	 * 忽略拓展名，true:忽略，false：不忽略
-	 */
-	ignorePostfix: boolean;
+     */
+    end: DeleteRuleItem;
+    /**
+     * 忽略拓展名，true:忽略，false：不忽略
+     */
+    ignorePostfix: boolean;
+    /*
+     * 是否区分大小写
+     */
+    regI: boolean;
 
-	constructor(data: any) {
-		this.type = data.type;
-		this.start = new DeleteRuleItem(data.start);
-		this.end = new DeleteRuleItem(data.end);
-		this.ignorePostfix = data.ignorePostfix;
-	}
+    constructor(data: any) {
+        this.type = data.type;
+        this.regI = data.regI != undefined && data.regI;
+        this.start = new DeleteRuleItem(data.start, this.regI);
+        this.end = new DeleteRuleItem(data.end, this.regI);
+        this.ignorePostfix = data.ignorePostfix;
+    }
 
 
-
-	deal(file: FileObj): void {
-		if (this.type === 'deleteAll') {
-			file.realName = "";
-			if (!this.ignorePostfix) {
-				file.expandName = "";
-			}
-		} else {
-			let str = file.realName + (this.ignorePostfix ? "" : file.expandName);
-			let startIndex = this.start.calIndex(str);
-			let endIndex = this.end.calIndex(str);
-			if (startIndex < 0 || endIndex < 0) {
-				return;
-			}
-			str = str.substring(0, startIndex) + str.substring(endIndex + 1);
-			if (this.ignorePostfix) {
-				file.realName = str;
-			} else {
-				file.expandName = path.extname(str);
-				if (file.expandName.length > 0) {
-					file.realName = str.substring(0, str.lastIndexOf("."));
-				} else {
-					file.realName = str;
-				}
-			}
-		}
-
-		file.name = file.realName + file.expandName;
-	}
+    deal(file: FileObj): void {
+        let target = "";
+        if (this.type === 'deleteAll') {
+            target = "";
+        } else {
+            let str = file.realName + (this.ignorePostfix ? "" : file.expandName);
+            let startIndex = this.start.calIndex(str, false);
+            let endIndex = this.end.calIndex(str, true);
+            if (startIndex < 0 || endIndex < 0 || startIndex > endIndex) {
+                return;
+            }
+            str = str.substring(0, startIndex) + str.substring(endIndex + 1);
+            target = str;
+        }
+        dealFileName(file, target, this.ignorePostfix);
+    }
 
 }
 
 class DeleteRuleItem {
-	/**
-	 * location:位置，text:文本，end:直到末尾
-	 */
-	type: string;
-	/**
-	 * 对应的值
-	 */
-	value: string;
+    /**
+     * location:位置，text:文本，end:直到末尾
+     */
+    type: string;
+    /**
+     * 对应的值
+     */
+    value: string;
+    /**
+     * 正则对象
+     */
+    reg: RegExp;
 
-	constructor(data: any) {
-		this.type = data.type;
-		this.value = data.value;
-	}
+    constructor(data: any, regI: boolean) {
+        this.type = data.type;
+        this.value = data.value;
+        if (this.type === 'reg') {
+            this.reg = regI ? new RegExp(this.value) : new RegExp(this.value, 'i');
+        }
+    }
 
-	/**
-	 * 计算位置
-	 */
-	calIndex(str: string): number {
-		if (this.type === 'location') {
-			return parseInt(this.value) - 1;
-		} else if (this.type === 'text') {
-			return str.indexOf(this.value);
-		} else if (this.type === 'end') {
-			return str.length - 1;
-		}
-		return -1;
-	}
+    /**
+     * 计算位置
+     * @param str 字符串
+     * @param end 是否末尾计算
+     */
+    calIndex(str: string, end: boolean): number {
+        if (this.type === 'location') {
+            let val = parseInt(this.value);
+            return val > 0 ? val - 1 : str.length + val;
+        } else if (this.type === 'text') {
+            let index = str.indexOf(this.value);
+            return index + (end ? this.value.length - 1 : 0);
+        } else if (this.type === 'end') {
+            return str.length - 1;
+        } else if (this.type === 'reg') {
+            let res = this.reg.exec(str);
+            return res == null ? -1 : (res.index + (end ? res[0].length - 1 : 0));
+        }
+        return -1;
+    }
 }

openRenamerBackend/entity/bo/rules/ReplaceRule.ts

@@ -1,5 +1,7 @@
 import RuleInterface from "./RuleInterface";
+import * as ValUtil from "../../../util/ValUtil";
 import FileObj from "../../vo/FileObj";
+import {dealFileName} from './RuleInterface';
 import path from 'path';
 
 
@@ -10,45 +12,101 @@ export default class ReplaceRule implements RuleInterface {
      */
     type: number;
     /**
-     * 前面追加
+     * 源
      */
     source: string;
     /**
-     * 后面追加
+     * 目标
      */
     target: string;
+    /**
+     * 是否正则模式
+     */
+    regFlag: boolean;
+    /**
+     * 是否区分大小写
+     */
+    regI: boolean;
+    /**
+     * 是否护理拓展名
+     */
+    ignorePostfix: boolean;
 
     constructor(data: any) {
         this.type = data.type;
         this.source = data.source;
         this.target = data.target;
+        this.regFlag = ValUtil.nullToDefault(data.regFlag, false);
+        this.regI = ValUtil.nullToDefault(data.regI, false);
+        this.ignorePostfix = ValUtil.nullToDefault(data.ignorePostfix, false);
     }
 
 
     deal(file: FileObj): void {
+        let targetStr = this.ignorePostfix ? file.realName : file.name;
+        let res = this.regFlag ? this.dealReg(targetStr) : this.dealNoReg(targetStr);
+        dealFileName(file, res, this.ignorePostfix);
+    }
+
+    private dealNoReg(targetStr: string): string {
         let start = 0;
-        let changed = false;
-        for (; ;) {
-            let index = this.type == 1 || this.type == 3 ? file.name.indexOf(this.source, start) : file.name.lastIndexOf(this.source);
-            if (index > -1) {
-                file.name = file.name.substring(0, index) + this.target + file.name.substring(index + this.source.length);
-                start = index + this.target.length;
-                changed = true;
-                if (this.type != 3) {
-                    break;
-                }
-            } else {
+        let arr: number[] = [];
+        for (let i = 0; i < (this.type == 1 ? 1 : 1000); i++) {
+            let one = targetStr.indexOf(this.source, start);
+            if (one == -1) {
                 break;
             }
+            arr.push(one);
+            start = one + this.source.length;
         }
-        if (changed) {
-            file.originName = file.name;
-            file.expandName = path.extname(file.name);
-            if (file.expandName && file.expandName.length > 0) {
-                file.realName = file.name.substring(0, file.name.lastIndexOf("."));
-            } else {
-                file.realName = file.name;
+        if (arr.length == 0) {
+            return targetStr;
+        }
+        let res = "";
+        let needDealArr: number[] = this.type === 1 ? [arr[0]] : this.type === 2 ? [arr[arr.length - 1]] : arr;
+        let lastIndex = 0;
+        for (let i = 0; i < needDealArr.length; i++) {
+            res += targetStr.substring(lastIndex, needDealArr[i]) + this.target;
+            lastIndex = needDealArr[i] + this.source.length;
+        }
+        res += targetStr.substring(lastIndex);
+        return res;
+    }
+
+    private dealReg(targetStr: string): string {
+        let templateReg = new RegExp("#\{group(\\d+\)}", "g");
+        let templateArr: string[][] = [];
+        while (true) {
+            let one = templateReg.exec(this.target);
+            if (one == null) {
+                break;
             }
+            templateArr.push([one[0], one[1]]);
         }
+
+        let reg = new RegExp(this.source, this.regI ? "g" : "ig");
+        let arr: RegExpExecArray[] = [];
+        for (let i = 0; i < (this.type == 1 ? 1 : 1000); i++) {
+            let one = reg.exec(targetStr);
+            if (one == null) {
+                break;
+            }
+            arr.push(one);
+        }
+        if (arr.length == 0) {
+            return targetStr;
+        }
+        let res = "";
+        let needDealReg: RegExpExecArray[] = this.type === 1 ? [arr[0]] : this.type === 2 ? [arr[arr.length - 1]] : arr;
+        let lastIndex = 0;
+        for (let i = 0; i < needDealReg.length; i++) {
+            let reg = needDealReg[i];
+            let target = this.target;
+            templateArr.forEach(item => target = target.replace(item[0], ValUtil.nullToDefault(reg[parseInt(item[1])], '')));
+            res += targetStr.substring(lastIndex, reg.index) + target;
+            lastIndex = reg.index + reg[0].length;
+        }
+        res += targetStr.substring(lastIndex);
+        return res;
     }
 }

openRenamerBackend/entity/bo/rules/RuleInterface.ts

@@ -1,6 +1,27 @@
 import FileObj from "../../vo/FileObj";
+import * as path from 'path';
 
 export default interface RuleInterface {
 
-	deal(file: FileObj): void;
+    deal(file: FileObj): void;
+}
+
+/**
+ * 重新处理文件名
+ * @param file
+ * @param newFileName
+ * @param ignorePostfix
+ */
+export function dealFileName(file: FileObj, newFileName: string, ignorePostfix: boolean) {
+    if (ignorePostfix) {
+        file.realName = newFileName;
+    } else {
+        file.expandName = path.extname(newFileName);
+        if (file.expandName.length > 0) {
+            file.realName = newFileName.substring(0, newFileName.lastIndexOf("."));
+        } else {
+            file.realName = newFileName;
+        }
+    }
+    file.name = file.realName + file.expandName;
 }

openRenamerBackend/entity/vo/FileObj.ts

@@ -3,21 +3,22 @@ import {isVideo, isSub, isNfo} from "../../util/MediaUtil"
 
 export default class FileObj {
     /**
-     * 文件名
+     * 变更后的文件名(包含拓展名)
      */
     name: string;
     /**
-     原始名字
+     * 去掉拓展名后的名字(不包含拓展名)
+     */
+    realName: string;
+    /**
+     原始文件名(不变)
      */
     originName: string;
     /**
-     * 拓展名
+     * 拓展名(最新的拓展名，每次应用规则后重新计算)
      */
     expandName: string;
-    /**
-     * 去掉拓展名后的名字
-     */
-    realName: string;
+
     /**
      * 所属路径
      */

openRenamerBackend/util/ValUtil.ts

@@ -0,0 +1,8 @@
+/**
+ * null to default
+ * @param value
+ * @param defaultVal
+ */
+export function nullToDefault(value: any, defaultVal: any): any {
+    return value === undefined || value == null ? defaultVal : value;
+}

openRenamerFront/src/App.vue

@@ -42,7 +42,7 @@ export default {
   name: "Home",
   data() {
     return {
-      version: "1.7.1",
+      version: "1.8.0",
       latestVersion: null,
       activeIndex: location.pathname,
       showNewVersion: false

openRenamerFront/src/components/rules/DeleteRule.vue

@@ -6,22 +6,30 @@
         <div>开始</div>
         <div class="line">
           <el-radio v-model="ruleObj.data.start.type" label="location" :disabled="deleteAll">位置：</el-radio>
-          <el-input-number :min="1" size="small" :disabled="deleteAll" v-model="startIndex" />
+          <el-input-number :min="1" size="small" :disabled="deleteAll" v-model="startIndex"/>
         </div>
         <div class="line">
           <el-radio v-model="ruleObj.data.start.type" label="text" :disabled="deleteAll">文本:</el-radio>
-          <el-input v-model="startText" size="small" :disabled="deleteAll" />
+          <el-input v-model="startText" size="small" :disabled="deleteAll"/>
+        </div>
+        <div class="line">
+          <el-radio v-model="ruleObj.data.start.type" label="reg" :disabled="deleteAll">正则:</el-radio>
+          <el-input v-model="startReg" size="small" :disabled="deleteAll"/>
         </div>
       </div>
       <div style="margin-left: 4em">
         <div>结束</div>
         <div class="line">
           <el-radio v-model="ruleObj.data.end.type" label="location" :disabled="deleteAll">位置：</el-radio>
-          <el-input-number size="small" :disabled="deleteAll" v-model="endIndex" />
+          <el-input-number size="small" :disabled="deleteAll" v-model="endIndex"/>
         </div>
         <div class="line">
           <el-radio v-model="ruleObj.data.end.type" label="text" :disabled="deleteAll">文本:</el-radio>
-          <el-input v-model="endText" size="small" :disabled="deleteAll" />
+          <el-input v-model="endText" size="small" :disabled="deleteAll"/>
+        </div>
+        <div class="line">
+          <el-radio v-model="ruleObj.data.end.type" label="reg" :disabled="deleteAll">正则:</el-radio>
+          <el-input v-model="endReg" size="small" :disabled="deleteAll"/>
         </div>
         <div class="line">
           <el-radio v-model="ruleObj.data.end.type" label="end" :disabled="deleteAll">直到末尾</el-radio>
@@ -29,14 +37,18 @@
       </div>
     </div>
   </div>
+  <div v-if="ruleObj.data.start.type==='reg' || ruleObj.data.end.type==='reg'" class="flex">
+    <div class="left">区分大小写:</div>
+    <el-switch v-model="ruleObj.data.regI"/>
+  </div>
   <div class="flex">
     <div class="left">全部删除:</div>
-    <el-switch v-model="deleteAll" @change="allDeleteChange" />
+    <el-switch v-model="deleteAll" @change="allDeleteChange"/>
   </div>
 
   <div class="flex">
     <div class="left">忽略拓展名:</div>
-    <el-switch v-model="ruleObj.data.ignorePostfix" />
+    <el-switch v-model="ruleObj.data.ignorePostfix"/>
   </div>
 </template>
 
@@ -60,28 +72,36 @@ export default {
             value: "",
           },
           ignorePostfix: true,
+          regI: false,//reg是否区分大小写
         },
       },
       startIndex: 1,
       endIndex: 1,
       startText: "",
+      startReg: "",
       endText: "",
+      endReg: "",
       deleteAll: false,
     };
   },
   created() {
     if (this.editRule) {
       this.ruleObj = JSON.parse(JSON.stringify(this.editRule));
-      if (this.ruleObj.data.type == "deletePart") {
-        if (this.ruleObj.data.start.type == "location") {
+      if (this.ruleObj.data.type === "deletePart") {
+        if (this.ruleObj.data.start.type === "location") {
           this.startIndex = parseInt(this.ruleObj.data.start.value);
-        } else {
+        } else if (this.ruleObj.data.start.type === "text") {
           this.startText = this.ruleObj.data.start.value;
-        }
-        if (this.ruleObj.data.end.type == "location") {
-          this.endIndex = parseInt(this.ruleObj.data.end.value);
         } else {
+          this.startReg = this.ruleObj.data.start.value;
+        }
+
+        if (this.ruleObj.data.end.type === "location") {
+          this.endIndex = parseInt(this.ruleObj.data.end.value);
+        } else if (this.ruleObj.data.end.type === "text") {
           this.endText = this.ruleObj.data.end.value;
+        } else {
+          this.endReg = this.ruleObj.data.end.value;
         }
       } else {
         this.deleteAll = true;
@@ -91,13 +111,15 @@ export default {
   methods: {
     exportObj() {
       if (this.ruleObj.data.type.length == 0) {
-        this.$message({ message: "请填写完整", type: "warning" });
+        this.$message({message: "请填写完整", type: "warning"});
         return null;
       }
-      if (this.ruleObj.data.type == "deletePart") {
+      if (this.ruleObj.data.type === "deletePart") {
         if (
-          (this.ruleObj.data.start.type == "text" && this.startText.length == 0) ||
-          (this.ruleObj.data.start.type == "text" && this.startText.length == 0)
+            ('text' === this.ruleObj.data.start.type && this.startText.length === 0) ||
+            ('text' === this.ruleObj.data.end.type && this.endText.length === 0) ||
+            ('reg' === this.ruleObj.data.start.type && this.startReg.length === 0) ||
+            ('reg' === this.ruleObj.data.end.type && this.endReg.length === 0)
         ) {
           this.$message({
             message: "开始或者结束文本不能为空",
@@ -106,19 +128,20 @@ export default {
           return null;
         }
       }
-      this.ruleObj.data.start.value = this.ruleObj.data.start.type == "location" ? this.startIndex.toString() : this.startText;
-      this.ruleObj.data.end.value = this.ruleObj.data.end.type == "location" ? this.endIndex.toString() : this.endText;
+      let startType = this.ruleObj.data.start.type;
+      this.ruleObj.data.start.value = startType === "location" ? this.startIndex.toString() : startType === 'text' ? this.startText : this.startReg;
+      let endType = this.ruleObj.data.end.type;
+      this.ruleObj.data.end.value = endType === "location" ? this.endIndex.toString() : endType === 'text' ? this.endText : this.endReg;
       let message = `删除:`;
       if (this.deleteAll) {
         message += "全部删除";
       } else {
-        message += `从"${this.ruleObj.data.start.value}"到"${this.ruleObj.data.end.type == "untilEnd" ? "末尾" : this.ruleObj.data.end.value}"`;
+        message += `从"${this.ruleObj.data.start.value}"到"${this.ruleObj.data.end.type === "end" ? "末尾" : this.ruleObj.data.end.value}"`;
       }
       this.ruleObj.message = message;
       return this.ruleObj;
     },
     allDeleteChange(val) {
-      console.log(val);
       this.deleteAll = val;
       this.ruleObj.data.type = val ? "deleteAll" : "deletePart";
     },

openRenamerFront/src/components/rules/ReplaceRule.vue

@@ -1,11 +1,24 @@
 <template>
   <div class="flex">
     <span class="left">源：</span>
-    <el-input style="width:20em" v-model="ruleObj.data.source"/>
+    <el-input style="width:20em" v-model="ruleObj.data.source" />
   </div>
   <div class="flex">
     <span class="left">目标：</span>
-    <el-input style="width:20em" v-model="ruleObj.data.target"/>
+    <el-input style="width:20em" v-model="ruleObj.data.target" />
+  </div>
+  <div class="flex">
+    <div class="left">正则模式:</div>
+    <el-switch v-model="ruleObj.data.regFlag" />
+    <el-tooltip effect="dark" :content="regTip" placement="right">
+      <el-icon>
+        <InfoFilled />
+      </el-icon>
+    </el-tooltip>
+  </div>
+  <div class="flex">
+    <div class="left">区分大小写:</div>
+    <el-switch v-model="ruleObj.data.regI" />
   </div>
   <div class="flex">
     <span class="left">替换选项：</span>
@@ -13,31 +26,38 @@
       <el-radio v-for="item in radioList" :key="item.code" v-model="ruleObj.data.type" :label="item.code"
       >{{ item.label }}
       </el-radio>
-
     </div>
   </div>
+  <div class="flex">
+    <div class="left">忽略拓展名:</div>
+    <el-switch v-model="ruleObj.data.ignorePostfix"/>
+  </div>
 </template>
 
 <script>
+import { InfoFilled } from "@element-plus/icons-vue";
+import { nullToDefault } from "@/utils/ValUtil";
 
 export default {
   name: "ReplaceRule",
+  components: { InfoFilled },
   props: ["editRule"],
   data() {
     return {
+      regTip: `开启支持js正则匹配，支持分组匹配,目标字符串支持模板#{groupN},N表示匹配到的第几组。比如#{group1}将被替换为匹配到的第一组数据`,
       radioList: [
         {
           label: "替换第一个",
-          code: 1,
+          code: 1
         },
         {
           label: "替换最后一个",
-          code: 2,
+          code: 2
         },
         {
           label: "全部替换",
-          code: 3,
-        },
+          code: 3
+        }
       ],
       ruleObj: {
         type: "replace",
@@ -46,31 +66,37 @@ export default {
           source: "",
           target: "",
           type: 1, //1:替换第一个，2：替换最后一个，3：全部替换
-        },
-      },
+          ignorePostfix: true,  //忽略拓展名
+          regFlag: false,  //正则模式
+          regI: false  //是否区分大小写
+        }
+      }
     };
   },
   created() {
     if (this.editRule) {
       console.log(this.editRule);
       this.ruleObj = JSON.parse(JSON.stringify(this.editRule));
+      //兼容历史数据
+      this.ruleObj.data.ignorePostfix = nullToDefault(this.ruleObj.data.ignorePostfix, true);
+      this.ruleObj.data.regFlag = nullToDefault(this.ruleObj.data.regFlag, false);
     }
   },
   methods: {
     exportObj() {
       if (!this.ruleObj.data.source) {
-        this.$message({message: "源不能为空", type: "warning"});
+        this.$message({ message: "源不能为空", type: "warning" });
         return null;
       }
       if (!this.ruleObj.data.type) {
-        this.$message({message: "请选择替换选项", type: "warning"});
+        this.$message({ message: "请选择替换选项", type: "warning" });
         return null;
       }
       this.ruleObj.message = `替换:将${this.ruleObj.data.source}替换为${this.ruleObj.data.target};`
-          + this.radioList.filter(item => item.code === this.ruleObj.data.type)[0].label;
+        + this.radioList.filter(item => item.code === this.ruleObj.data.type)[0].label;
       return this.ruleObj;
-    },
-  },
+    }
+  }
 };
 </script>
 

openRenamerFront/src/utils/ValUtil.js

@@ -0,0 +1,9 @@
+/**
+ * 空转default
+ * @param val
+ * @param defaultVal
+ * @returns {*}
+ */
+export function nullToDefault(val, defaultVal) {
+  return val === undefined || val == null ? defaultVal : val;
+}