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

Reviewed-on: #42
2023-04-13 20:48:22 +08:00 · 2023-04-13 20:48:22 +08:00 · f643044fb5
commit f643044fb5
parent 85f614f414 6c8184fb1c
6 changed files with 176 additions and 99 deletions
--- a/openRenamerBackend/entity/bo/rules/SerializationRule.ts
+++ b/openRenamerBackend/entity/bo/rules/SerializationRule.ts
@ -3,78 +3,85 @@ import FileObj from "../../vo/FileObj";
 import path from 'path';

 export default class InsertRule implements RuleInterface {
-	/**
-	 * 开始位置
-	 */
-	start: number;
-	/**
-	 * 记录当前的值是多少
-	 */
-	currentIndex: number;
-	/**
-	 * 增量
-	 */
-	increment: number;
-	/**
-	 * 是否填充0
-	 */
-	addZero: boolean;
-	/**
-	 * 填充后长度
-	 */
-	numLength: number;
-	/**
-	 * 插入位置,front:前缀，backend：后缀，at：位置
-	 */
-	insertType: string;
-	/**
-	 * 插入的位置
-	 */
-	insertValue: number;
-	/**
-	 * 忽略拓展名
-	 */
-	ignorePostfix: boolean;
+    /**
+     * 开始位置
+     */
+    start: number;
+    /**
+     * 记录当前的值是多少
+     */
+    currentIndexMap: Map<string, number>;
+    /**
+     * 增量
+     */
+    increment: number;
+    /**
+     * 是否填充0
+     */
+    addZero: boolean;
+    /**
+     * 填充后长度
+     */
+    numLength: number;
+    /**
+     * 插入位置,front:前缀，backend：后缀，at：位置
+     */
+    insertType: string;
+    /**
+     * 插入的位置
+     */
+    insertValue: number;
+    /**
+     * 忽略拓展名
+     */
+    ignorePostfix: boolean;
+    /**
+     * 拓展名分组
+     */
+    postfixGroup: boolean;

-	constructor(data: any) {
-		this.start = data.start;
-		this.currentIndex = data.start;
-		this.increment = data.increment;
-		this.addZero = data.addZero;
-		this.numLength = data.numLength;
-		this.insertType = data.insertType;
-		this.insertValue = data.insertValue;
-		this.ignorePostfix = data.ignorePostfix;
-	}
+    constructor(data: any) {
+        this.start = data.start;
+        this.currentIndexMap = new Map<string, number>();
+        this.increment = data.increment;
+        this.addZero = data.addZero;
+        this.numLength = data.numLength;
+        this.insertType = data.insertType;
+        this.insertValue = data.insertValue;
+        this.ignorePostfix = data.ignorePostfix;
+        this.postfixGroup = data.postfixGroup;
+    }

-	deal(file: FileObj): void {
-		let length = this.currentIndex.toString().length;
-		let numStr = (this.addZero && this.numLength > length ? "0".repeat(this.numLength - length) : "") + this.currentIndex;
-		let str = this.ignorePostfix ? file.realName : file.name;
-		switch (this.insertType) {
-			case "front":
-				str = numStr + str;
-				break;
-			case "backend":
-				str = str + numStr;
-				break;
-			case "at":
-				str = str.substring(0, this.insertValue - 1) + numStr + str.substring(this.insertValue - 1);
-				break;
-		}
-		this.currentIndex += this.increment;
+    deal(file: FileObj): void {
+        let expand = this.postfixGroup ? file.expandName : "";
+        let currentIndex = this.currentIndexMap.has(expand) ? this.currentIndexMap.get(expand) : this.start;
+        let length = currentIndex.toString().length;
+        let numStr = (this.addZero && this.numLength > length ? "0".repeat(this.numLength - length) : "") + currentIndex;
+        let str = this.ignorePostfix ? file.realName : file.name;
+        switch (this.insertType) {
+            case "front":
+                str = numStr + str;
+                break;
+            case "backend":
+                str = str + numStr;
+                break;
+            case "at":
+                str = str.substring(0, this.insertValue - 1) + numStr + str.substring(this.insertValue - 1);
+                break;
+        }
+        this.currentIndexMap.set(expand, currentIndex + this.increment);

-		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;
-			}
-		}
+        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;
-	}
+        file.name = file.realName + file.expandName;
+    }
 }
--- a/openRenamerBackend/util/MediaUtil.ts
+++ b/openRenamerBackend/util/MediaUtil.ts
@ -38,12 +38,26 @@ export function isNfo(str: string) {

 let pattern1 = new RegExp(/s(eason)?\.?(\d+)/);
 let pattern2 = new RegExp(/(\d+)/);
+let pattern3 = new RegExp(/([一二三四五六七八九十]+)/);
+let chineseNumMap = {
+    "一": "1",
+    "二": "2",
+    "三": "3",
+    "四": "4",
+    "五": "5",
+    "六": "6",
+    "七": "7",
+    "八": "8",
+    "九": "9",
+    "十": "1"
+
+}

 /**
 * 识别季号
- * @param str
+ * @param name
 */
-export function getSeason(name: string) {
+export function getSeason(name: string): string {
    name = name.replace(/[ ]+/, "").toLocaleLowerCase();
    let patternRes = name.match(pattern1);
    if (patternRes && patternRes[2]) {
@ -53,5 +67,18 @@ export function getSeason(name: string) {
    if (patternRes && patternRes[1]) {
        return patternRes[1];
    }
+    //中文支持
+    patternRes = name.match(pattern3);
+    if (patternRes && patternRes[1]) {
+        let str = patternRes[1];
+        let strs = str.split("");
+        if (strs.length == 1) {
+            return str == '十' ? "10" : chineseNumMap[str];
+        } else if (strs.length == 2) {
+            return strs[0] == '十' ? ("1" + chineseNumMap[strs[1]]) : chineseNumMap[strs[0]] + "0";
+        } else if (strs.length == 3) {
+            return chineseNumMap[strs[0]] + chineseNumMap[strs[2]];
+        }
+    }
    return "";
 }
--- a/openRenamerFront/public/index.html
+++ b/openRenamerFront/public/index.html
@ -35,6 +35,6 @@
    //设置上一节获取到的key
    window.qieziStatisticKey = "13ec82dd91294ae4a88b0d2cc6cbdf76";
 </script>
-<script src="https://qiezi.fleyx.com/qiezijs/1.0/qiezi_statistic.min.js" type="text/javascript"></script>
+<script src="https://qiezi.fleyx.com/qiezijs/1.0/qiezi_statistic.min.js" type="text/javascript" defer></script>
 </body>
 </html>
--- a/openRenamerFront/src/App.vue
+++ b/openRenamerFront/src/App.vue
@ -14,15 +14,17 @@
      <router-view/>
    </div>
    <div class="footer">版本：
-      <el-tooltip effect="dark" content="点击查看更新内容" placement="top">
-        <a href="https://blog.fleyx.com/blog/detail/20221130/#13" target="_blank">
+      <el-tooltip effect="dark" content="点击查看更新记录" placement="top">
+        <a href="https://blog.fleyx.com/blog/detail/20221130/#%E7%89%88%E6%9C%AC%E6%9B%B4%E6%96%B0%E8%AE%B0%E5%BD%95"
+           target="_blank">
          {{ version }}</a>
      </el-tooltip>
      &nbsp;&nbsp;
-      <template v-if="latestVersion && latestVersion>version">
+      <template v-if="latestVersion && showNewVersion">
        最新版本:
        <el-tooltip effect="dark" content="点击查看更新文档" placement="top">
-          <a href="https://blog.fleyx.com/blog/detail/20221130/#%e5%8d%87%e7%ba%a7" target="_blank">
+          <a href="https://blog.fleyx.com/blog/detail/20221130/#%E7%89%88%E6%9C%AC%E6%9B%B4%E6%96%B0%E8%AE%B0%E5%BD%95"
+             target="_blank">
            {{ latestVersion }}</a>
        </el-tooltip>
        &nbsp;&nbsp;
@ -40,9 +42,10 @@ export default {
  name: "Home",
  data() {
    return {
-      version: 1.4,
+      version: "1.5",
      latestVersion: null,
      activeIndex: location.pathname,
+      showNewVersion: false
    };
  },
  async beforeCreate() {
@ -53,12 +56,30 @@ export default {
    //获取最新版本
    let config = await httpUtil.get("https://s3.fleyx.com/picbed/openRenamer/config.json");
    this.latestVersion = config.version;
+    this.showNewVersion = checkVersion(this.version, this.latestVersion);
+
  },
  async mounted() {
    console.log(this.$route);
    console.log(location);
  },
 };
+
+function checkVersion(version, latestVersion) {
+  let versions = version.split(".");
+  let latestVersions = latestVersion.split('.');
+  for (let i = 0; i < versions.length; i++) {
+    if (i >= latestVersions.length) {
+      return false;
+    }
+    let versionNum = parseInt(versions[i]);
+    let latestVersionNum = parseInt(latestVersions[i]);
+    if (versionNum !== latestVersionNum) {
+      return versionNum < latestVersionNum;
+    }
+  }
+  return false;
+}
 </script>

 <style lang="less">
--- a/openRenamerFront/src/components/rules/RuleBlock.vue
+++ b/openRenamerFront/src/components/rules/RuleBlock.vue
@ -11,21 +11,25 @@
        <el-button type="primary" size="small" @click="editClick">
          <el-tooltip effect="dark" content="编辑规则" placement="top">
            <el-icon>
-              <edit />
+              <edit/>
            </el-icon>
          </el-tooltip>
        </el-button>
        <el-button type="primary" size="small" @click="move('top')">
          <el-tooltip effect="dark" content="上移规则" placement="top">
            <el-icon>
-              <top />
+              <top/>
            </el-icon>
          </el-tooltip>
        </el-button>
        <el-button type="primary" size="small" @click="move('bottom')">
          <el-tooltip effect="dark" content="下移规则" placement="top"
-            ><el-icon> <bottom /> </el-icon
-          ></el-tooltip>
+          >
+            <el-icon>
+              <bottom/>
+            </el-icon
+            >
+          </el-tooltip>
        </el-button>
      </template>
    </div>
@ -38,11 +42,12 @@
        <el-button type="primary" size="small" text @click="addRuleDialogShow = true">+ 新增规则</el-button>
      </div>
    </div>
-    <el-dialog :title="editRule ? '编辑规则' : '新增规则'" v-model="addRuleDialogShow" width="70%" @close="ruleDialogClose">
-      <rule :editRule="editRule" @ruleAdd="ruleAdd" v-if="addRuleDialogShow" :isAutoPlan="rules != undefined" />
+    <el-dialog :title="editRule ? '编辑规则' : '新增规则'" v-model="addRuleDialogShow" width="70%"
+               @close="ruleDialogClose">
+      <rule :editRule="editRule" @ruleAdd="ruleAdd" v-if="addRuleDialogShow" :isAutoPlan="rules != undefined"/>
    </el-dialog>
    <el-dialog title="模板管理" v-model="ruleTemplateShow" width="70%">
-      <application-rule-list v-if="ruleTemplateShow" :curId="chosedTemplate.id" @templateUpdate="templateUpdate" />
+      <application-rule-list v-if="ruleTemplateShow" :curId="chosedTemplate.id" @templateUpdate="templateUpdate"/>
    </el-dialog>
  </div>
 </template>
@ -51,7 +56,8 @@
 import Rule from "@/components/Rule";
 import ApplicationRuleList from "./ApplicationRuleList";
 import HttpUtil from "@/utils/HttpUtil";
-import { Top, Bottom, Edit } from "@element-plus/icons-vue";
+import {Top, Bottom, Edit} from "@element-plus/icons-vue";
+
 export default {
  name: "RuleBlock",
  props: ["rules"],
@ -79,7 +85,7 @@ export default {
  },
  async created() {
    //如果外部传入了规则
-    if (this.rules != undefined) {
+    if (this.rules !== undefined) {
      this.ruleList = JSON.parse(JSON.stringify(this.rules));
    } else {
      this.chosedTemplate = await HttpUtil.get("/applicationRule/default");
@ -107,7 +113,9 @@ export default {
    },
    //切换模板
    async templateUpdate(newVal) {
+      console.debug("新的模板:", newVal);
      this.ruleList = JSON.parse(newVal.content);
+      this.chosedTemplate = newVal;
      this.ruleUpdate();
      this.ruleTemplateShow = false;
    },
@ -127,11 +135,11 @@ export default {
    //禁用/启用
    async block() {
      this.ruleList
-        .filter((item) => item.checked)
-        .forEach((item) => {
-          item.blocked = !item.blocked;
-          item.checked = false;
-        });
+          .filter((item) => item.checked)
+          .forEach((item) => {
+            item.blocked = !item.blocked;
+            item.checked = false;
+          });
      await this.ruleUpdate();
    },
    //删除规则
--- a/openRenamerFront/src/components/rules/SerializationRule.vue
+++ b/openRenamerFront/src/components/rules/SerializationRule.vue
@ -2,20 +2,20 @@
  <div class="flex">
    <span class="left">起始数：</span>
    <div class="right">
-      <el-input-number :min="1" size="small" v-model="ruleObj.data.start" />
+      <el-input-number :min="1" size="small" v-model="ruleObj.data.start"/>
    </div>
  </div>
  <div class="flex">
    <span class="left">增量：</span>
    <div class="right">
-      <el-input-number :min="1" size="small" v-model="ruleObj.data.increment" />
+      <el-input-number :min="1" size="small" v-model="ruleObj.data.increment"/>
    </div>
  </div>
  <div class="flex">
    <span class="left">填充0补足：</span>
    <div class="right">
-      <el-switch v-model="ruleObj.data.addZero" />
-      <el-input-number size="small" :min="1" :disabled="!ruleObj.data.addZero" v-model="ruleObj.data.numLength" />
+      <el-switch v-model="ruleObj.data.addZero"/>
+      <el-input-number size="small" :min="1" :disabled="!ruleObj.data.addZero" v-model="ruleObj.data.numLength"/>
    </div>
  </div>
  <div class="flex">
@ -24,21 +24,34 @@
      <el-radio style="margin-top: 1em" v-model="ruleObj.data.insertType" label="front">前缀</el-radio>
      <el-radio style="margin-top: 1em" v-model="ruleObj.data.insertType" label="backend">后缀</el-radio>
      <el-radio style="margin-top: 1em" v-model="ruleObj.data.insertType" label="at"
-        >位置:<el-input-number size="small" :min="1" :disabled="ruleObj.data.insertType !== 'at'" v-model="ruleObj.data.insertValue" />
+      >位置:
+        <el-input-number size="small" :min="1" :disabled="ruleObj.data.insertType !== 'at'"
+                         v-model="ruleObj.data.insertValue"/>
      </el-radio>
    </div>
  </div>

  <div class="flex">
    <div class="left">忽略拓展名:</div>
-    <el-switch v-model="ruleObj.data.ignorePostfix" />
+    <el-switch v-model="ruleObj.data.ignorePostfix"/>
+  </div>
+  <div class="flex">
+    <div class="left">拓展名分组:</div>
+    <el-switch v-model="ruleObj.data.postfixGroup"/>
+    <el-tooltip effect="dark" content="按照文件拓展名分别计数,方便多种类型文件同时生成序列" placement="right">
+      <el-icon>
+        <InfoFilled/>
+      </el-icon>
+    </el-tooltip>
  </div>
 </template>

 <script>
+import {InfoFilled} from "@element-plus/icons-vue";
+
 export default {
  name: "SerializationRule",
-
+  components: {InfoFilled},
  props: ["editRule"],
  data() {
    return {
@ -53,6 +66,7 @@ export default {
          ignorePostfix: true,
          insertType: "front",
          insertValue: 1,
+          postfixGroup: true
        },
      },
    };