fanxb/open-renamer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 16 Wiki Activity

1 #10

Merged
fanxb merged 6 commits from main into dev 2022-05-26 23:19:41 +08:00
Conversation 0 Commits 6 Files Changed - +176 -99
6 changed files with 176 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit ae9a2d53c5 - Show all commits

17
openRenamerBackend/entity/bo/rules/SerializationRule.ts
View File

@ -10,7 +10,7 @@ export default class InsertRule implements RuleInterface {
/**
* 记录当前的值是多少
*/
currentIndex: number;
currentIndexMap: Map<string, number>;
/**
* 增量
*/
@ -35,21 +35,28 @@ export default class InsertRule implements RuleInterface {
* 忽略拓展名
*/
ignorePostfix: boolean;
/**
* 拓展名分组
*/
postfixGroup: boolean;
constructor(data: any) {
this.start = data.start;
this.currentIndex = 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 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":
@ -62,7 +69,7 @@ export default class InsertRule implements RuleInterface {
str = str.substring(0, this.insertValue - 1) + numStr + str.substring(this.insertValue - 1);
break;
}
this.currentIndex += this.increment;
this.currentIndexMap.set(expand, currentIndex + this.increment);
if (this.ignorePostfix) {
file.realName = str;

31
openRenamerBackend/util/MediaUtil.ts
View File

@ -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 "";
}

2
openRenamerFront/public/index.html
View File

@ -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>

31
openRenamerFront/src/App.vue
View File

@ -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">

16
openRenamerFront/src/components/rules/RuleBlock.vue
View File

@ -24,8 +24,12 @@
</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,7 +42,8 @@
<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">
<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%">
@ -52,6 +57,7 @@ import Rule from "@/components/Rule";
import ApplicationRuleList from "./ApplicationRuleList";
import HttpUtil from "@/utils/HttpUtil";
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;
},

18
openRenamerFront/src/components/rules/SerializationRule.vue
View File

@ -24,7 +24,9 @@
<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>
@ -33,12 +35,23 @@
<div class="left">忽略拓展名:</div>
<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
},
},
};