Skip to content

Commit 6583acc

Browse files
LuckyPuppy514LuckyPuppy514
committed
v3.4.8 文件重命名优化
1 parent 4762050 commit 6583acc

File tree

4 files changed

+34
-54
lines changed

4 files changed

+34
-54
lines changed

‎.gitignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@ logs
33
target
44
.classpath
55
.factorypath
6-
.project
6+
.project
7+
.idea

‎src/main/java/com/lckp/jproxy/constant/Common.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public class Common {
4747
// 标题主规则 ID
4848
public static final String MOST_IMPORTANT_TITLE_RULE_ID = "00000000000000000000000000000000";
4949
// 视频文件扩展名正则表达式
50-
public static final String VIDEO_AND_SUBTITLE_EXTENSION_REGEX = "(\\.(mp4|avi|wmv|flv|mov|mkv|webm|mpg|mpeg|3gp|iso|ts|ass|srt|ssa|idx|sub))$";
50+
public static final String VIDEO_AND_SUBTITLE_EXTENSION_REGEX = "(\\.(mp4|avi|wmv|flv|mov|mkv|webm|mpg|mpeg|3gp|iso|ts|([-_a-zA-Z]{2,5}\\.|)ass|([-_a-zA-Z]{2,5}\\.|)srt|([-_a-zA-Z]{2,5}\\.|)ssa|([-_a-zA-Z]{2,5}\\.|)idx|([-_a-zA-Z]{2,5}\\.|)sub))$";
5151
// 字幕文件扩展名正则表达式
5252
public static final String SUBTITLE_EXTENSION_REGEX = "(\\.(ass|srt|ssa|idx|sub))$";
5353
// 时间格式

‎src/main/java/com/lckp/jproxy/task/RadarrRenameTask.java‎

Lines changed: 16 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,28 @@
11
package com.lckp.jproxy.task;
22

3-
import java.text.SimpleDateFormat;
4-
import java.time.ZoneId;
5-
import java.util.Calendar;
6-
import java.util.List;
7-
import java.util.TimeZone;
8-
import java.util.regex.Matcher;
9-
import java.util.regex.Pattern;
10-
11-
import org.apache.commons.lang3.StringUtils;
12-
import org.springframework.beans.factory.annotation.Value;
13-
import org.springframework.scheduling.annotation.EnableScheduling;
14-
import org.springframework.scheduling.annotation.Scheduled;
15-
import org.springframework.stereotype.Component;
16-
import org.springframework.web.client.RestTemplate;
17-
183
import com.alibaba.fastjson2.JSON;
194
import com.alibaba.fastjson2.JSONArray;
205
import com.alibaba.fastjson2.JSONObject;
21-
import com.lckp.jproxy.constant.ApiField;
22-
import com.lckp.jproxy.constant.Common;
23-
import com.lckp.jproxy.constant.Downloader;
24-
import com.lckp.jproxy.constant.Messages;
25-
import com.lckp.jproxy.constant.SystemConfigKey;
6+
import com.lckp.jproxy.constant.*;
267
import com.lckp.jproxy.service.IQbittorrentService;
278
import com.lckp.jproxy.service.ISystemConfigService;
289
import com.lckp.jproxy.service.ITransmissionService;
29-
3010
import lombok.RequiredArgsConstructor;
3111
import lombok.extern.slf4j.Slf4j;
12+
import org.apache.commons.lang3.StringUtils;
13+
import org.springframework.beans.factory.annotation.Value;
14+
import org.springframework.scheduling.annotation.EnableScheduling;
15+
import org.springframework.scheduling.annotation.Scheduled;
16+
import org.springframework.stereotype.Component;
17+
import org.springframework.web.client.RestTemplate;
18+
19+
import java.text.SimpleDateFormat;
20+
import java.time.ZoneId;
21+
import java.util.Calendar;
22+
import java.util.List;
23+
import java.util.TimeZone;
24+
import java.util.regex.Matcher;
25+
import java.util.regex.Pattern;
3226

3327
/**
3428
* <p>
@@ -120,7 +114,7 @@ public synchronized void run() {
120114
newFileName = sourceTitle;
121115
String extension = extensionMatcher.group(1);
122116
if (extension.matches(Common.SUBTITLE_EXTENSION_REGEX)) {
123-
newFileName = newFileName + "." + subtitleNo++;
117+
extension = "." + subtitleNo++ + extension;
124118
}
125119
int index = sourceTitle.indexOf(" [");
126120
newFileName = newFileName

‎src/main/java/com/lckp/jproxy/task/SonarrRenameTask.java‎

Lines changed: 15 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,26 @@
11
package com.lckp.jproxy.task;
22

3-
import java.text.SimpleDateFormat;
4-
import java.time.ZoneId;
5-
import java.util.Calendar;
6-
import java.util.HashMap;
7-
import java.util.List;
8-
import java.util.Map;
9-
import java.util.TimeZone;
10-
import java.util.concurrent.ConcurrentHashMap;
11-
import java.util.regex.Matcher;
12-
import java.util.regex.Pattern;
13-
3+
import com.alibaba.fastjson2.JSON;
4+
import com.alibaba.fastjson2.JSONArray;
5+
import com.alibaba.fastjson2.JSONObject;
6+
import com.lckp.jproxy.constant.*;
7+
import com.lckp.jproxy.entity.SonarrRule;
8+
import com.lckp.jproxy.service.*;
9+
import lombok.RequiredArgsConstructor;
10+
import lombok.extern.slf4j.Slf4j;
1411
import org.apache.commons.lang3.StringUtils;
1512
import org.springframework.beans.factory.annotation.Value;
1613
import org.springframework.scheduling.annotation.EnableScheduling;
1714
import org.springframework.scheduling.annotation.Scheduled;
1815
import org.springframework.stereotype.Component;
1916
import org.springframework.web.client.RestTemplate;
2017

21-
import com.alibaba.fastjson2.JSON;
22-
import com.alibaba.fastjson2.JSONArray;
23-
import com.alibaba.fastjson2.JSONObject;
24-
import com.lckp.jproxy.constant.ApiField;
25-
import com.lckp.jproxy.constant.Common;
26-
import com.lckp.jproxy.constant.Downloader;
27-
import com.lckp.jproxy.constant.Messages;
28-
import com.lckp.jproxy.constant.SystemConfigKey;
29-
import com.lckp.jproxy.constant.Token;
30-
import com.lckp.jproxy.entity.SonarrRule;
31-
import com.lckp.jproxy.service.IQbittorrentService;
32-
import com.lckp.jproxy.service.ISonarrRuleService;
33-
import com.lckp.jproxy.service.ISonarrTitleService;
34-
import com.lckp.jproxy.service.ISystemConfigService;
35-
import com.lckp.jproxy.service.ITransmissionService;
36-
37-
import lombok.RequiredArgsConstructor;
38-
import lombok.extern.slf4j.Slf4j;
18+
import java.text.SimpleDateFormat;
19+
import java.time.ZoneId;
20+
import java.util.*;
21+
import java.util.concurrent.ConcurrentHashMap;
22+
import java.util.regex.Matcher;
23+
import java.util.regex.Pattern;
3924

4025
/**
4126
* <p>
@@ -147,7 +132,7 @@ public synchronized void run() {
147132
newFileName = oldFileName;
148133
} else {
149134
if (extension.matches(Common.SUBTITLE_EXTENSION_REGEX)) {
150-
newFileName = newFileName + "." + subtitleNo++;
135+
extension = "." + subtitleNo++ + extension;
151136
}
152137
int index = sourceTitle.indexOf(" [");
153138
newFileName = newFileName

0 commit comments

Comments
 (0)