v3.3.6 优化匹配逻辑

LuckyPuppy514 · Aug 6, 2023 · 3d2cf02 · 3d2cf02
1 parent 07eec32
commit 3d2cf02
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 18 deletions.
diff --git a/changelog.en_US.md b/changelog.en_US.md
@@ -3,6 +3,10 @@
 
 # Change Logs
 
+## v3.3.6 2023-08-06
+
+1. Optimize matching logic
+
 ## v3.3.5 2023-08-06
 
 1. Optimize language matching logic

diff --git a/changelog.md b/changelog.md
@@ -3,6 +3,10 @@
 
 # 变更日志
 
+## v3.3.6 2023-08-06
+
+1. 优化匹配逻辑
+
 ## v3.3.5 2023-08-06
 
 1. 优化语言匹配逻辑

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

diff --git a/src/main/java/com/lckp/jproxy/service/impl/RadarrIndexerServiceImpl.java b/src/main/java/com/lckp/jproxy/service/impl/RadarrIndexerServiceImpl.java
@@ -133,14 +133,11 @@ public String executeFormatRule(String xml) {
 					log.debug("索引器格式化失败：{} ==> 未匹配到标题", text);
 					continue;
 				}
-				// 从 description 提取语言信息
 				Element descriptionElement = item.element(ApiField.INDEXER_DESCRIPTION);
-				if (descriptionElement != null && StringUtils.isNotBlank(descriptionElement.getText())) {
+				if (descriptionElement != null) {
 					String description = descriptionElement.getText();
-					String language = radarrTitleService.format(description, "{" + Token.LANGUAGE + "}",
-							tokenRuleMap);
-					if (StringUtils.isNotBlank(language)) {
-						newText = FormatUtil.replaceToken(Token.LANGUAGE, language, newText);
+					if (StringUtils.isNotBlank(description)) {
+						text = text + " " + FormatUtil.PLACEHOLDER_SEPARATOR + " " + description;
 					}
 				}
 				newText = radarrTitleService.format(text, newText, tokenRuleMap);

diff --git a/src/main/java/com/lckp/jproxy/service/impl/SonarrIndexerServiceImpl.java b/src/main/java/com/lckp/jproxy/service/impl/SonarrIndexerServiceImpl.java
@@ -128,19 +128,11 @@ public String executeFormatRule(String xml) {
 					log.debug("索引器格式化失败：{} ==> 未匹配到标题", text);
 					continue;
 				}
-				// 从 description 提取语言和集数信息
 				Element descriptionElement = item.element(ApiField.INDEXER_DESCRIPTION);
-				if (descriptionElement != null && StringUtils.isNotBlank(descriptionElement.getText())) {
+				if (descriptionElement != null) {
 					String description = descriptionElement.getText();
-					String language = sonarrTitleService.format(description, "{" + Token.LANGUAGE + "}",
-							tokenRuleMap);
-					String episode = sonarrTitleService.format(description, "{" + Token.EPISODE + "}",
-							tokenRuleMap);
-					if (StringUtils.isNotBlank(language)) {
-						newText = FormatUtil.replaceToken(Token.LANGUAGE, language, newText);
-					}
-					if (StringUtils.isNotBlank(episode)) {
-						newText = FormatUtil.replaceToken(Token.EPISODE, episode, newText);
+					if (StringUtils.isNotBlank(description)) {
+						text = text + " " + FormatUtil.PLACEHOLDER_SEPARATOR + " " + description;
 					}
 				}
 				newText = sonarrTitleService.format(text, newText, tokenRuleMap);