v3.2.3 优化下载器文件重命名逻辑

LuckyPuppy514 · May 28, 2023 · f7110fd · f7110fd
1 parent 54321fa
commit f7110fd
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 6 deletions.
diff --git a/changelog.en_US.md b/changelog.en_US.md
@@ -3,6 +3,10 @@
 
 # Change Logs
 
+## v3.2.3 2023-05-28
+
+1. Optimize downloader file rename logic
+
 ## v3.2.2 2023-05-23
 
 1. Optimize search logic

diff --git a/changelog.md b/changelog.md
@@ -3,6 +3,10 @@
 
 # 变更日志
 
+## v3.2.3 2023-05-28
+
+1. 优化下载器文件重命名逻辑
+
 ## v3.2.2 2023-05-23
 
 1. 优化查询逻辑

diff --git a/pom.xml b/pom.xml
@@ -11,7 +11,7 @@
 	<!-- 项目信息 -->
 	<groupId>com.lckp</groupId>
 	<artifactId>jproxy</artifactId>
-	<version>3.2.2</version>
+	<version>3.2.3</version>
 	<name>JProxy</name>
 	<description>介于 Sonarr/Radarr 和 Jackett/Prowlarr 之间的代理，主要用于优化查询和提升识别率</description>
 	<!-- 依赖版本 -->

diff --git a/src/main/java/com/lckp/jproxy/constant/Common.java b/src/main/java/com/lckp/jproxy/constant/Common.java
@@ -47,7 +47,7 @@ public class Common {
 	// 标题主规则 ID
 	public static final String MOST_IMPORTANT_TITLE_RULE_ID = "00000000000000000000000000000000";
 	// 视频文件扩展名正则表达式
-	public static final String VIDEO_EXTENSION_REGEX = "(\\.(mp4|avi|wmv|flv|mov|mkv|webm|mpg|mpeg|3gp|iso))$";
+	public static final String VIDEO_AND_SUBTITLE_EXTENSION_REGEX = "(\\.(mp4|avi|wmv|flv|mov|mkv|webm|mpg|mpeg|3gp|iso|ass|srt|ssa|idx|sub))$";
 	// 时间格式
 	public static final String DATE_TIME_FORMAT = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'";
 }
diff --git a/src/main/java/com/lckp/jproxy/service/impl/TransmissionServiceImpl.java b/src/main/java/com/lckp/jproxy/service/impl/TransmissionServiceImpl.java
@@ -143,7 +143,7 @@ public boolean rename(String hash, String name) {
 			log.debug("Transmission 种子暂时无法重命名：{}", oldName);
 			return false;
 		}
-		Matcher matcher = Pattern.compile(Common.VIDEO_EXTENSION_REGEX).matcher(oldName);
+		Matcher matcher = Pattern.compile(Common.VIDEO_AND_SUBTITLE_EXTENSION_REGEX).matcher(oldName);
 		if (matcher.find()) {
 			String extension = matcher.group(1);
 			name = name + extension;

diff --git a/src/main/java/com/lckp/jproxy/task/RadarrRenameTask.java b/src/main/java/com/lckp/jproxy/task/RadarrRenameTask.java
@@ -113,7 +113,7 @@ public synchronized void run() {
 											String oldFileName = oldFilePath.substring(startIndex);
 											String newFileName = oldFileName;
 											Matcher extensionMatcher = Pattern
-													.compile(Common.VIDEO_EXTENSION_REGEX)
+													.compile(Common.VIDEO_AND_SUBTITLE_EXTENSION_REGEX)
 													.matcher(oldFileName);
 											if (extensionMatcher.find()) {
 												String extension = extensionMatcher.group(1);

diff --git a/src/main/java/com/lckp/jproxy/task/SonarrRenameTask.java b/src/main/java/com/lckp/jproxy/task/SonarrRenameTask.java
@@ -133,7 +133,7 @@ public synchronized void run() {
 											String oldFileName = oldFilePath.substring(startIndex);
 											String newFileName = oldFileName;
 											Matcher extensionMatcher = Pattern
-													.compile(Common.VIDEO_EXTENSION_REGEX)
+													.compile(Common.VIDEO_AND_SUBTITLE_EXTENSION_REGEX)
 													.matcher(oldFileName);
 											if (extensionMatcher.find()) {
 												String extension = extensionMatcher.group(1);

diff --git a/src/main/resources/rule/[email protected] b/src/main/resources/rule/[email protected]