v3.2.1 TMDB 新增标题新增功能；优化查询逻辑

changelog.en_US.md

@@ -3,6 +3,11 @@
 
 # Change Logs
 
+## v3.2.1 2023-04-30
+
+1. TMDB added title add function
+2. Optimize search logic
+
 ## v3.2.0 2023-04-30
 
 1. Optimize clean title logic

changelog.md

@@ -3,6 +3,11 @@
 
 # 变更日志
 
+## v3.2.1 2023-04-30
+
+1. TMDB 新增标题新增功能
+2. 优化查询逻辑
+
 ## v3.2.0 2023-04-30
 
 1. 优化净标题逻辑

pom.xml

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

src/main/java/com/lckp/jproxy/controller/TmdbTitleController.java

@@ -16,6 +16,7 @@
 import com.lckp.jproxy.constant.CacheName;
 import com.lckp.jproxy.constant.Messages;
 import com.lckp.jproxy.constant.SystemConfigKey;
+import com.lckp.jproxy.constant.TableField;
 import com.lckp.jproxy.entity.TmdbTitle;
 import com.lckp.jproxy.model.request.TmdbTitleQueryRequest;
 import com.lckp.jproxy.model.response.PageResponse;
@@ -93,7 +94,14 @@ public ResponseEntity<Void> remove(@RequestBody List<Integer> idList) {
 	@CacheEvict(cacheNames = { CacheName.SONARR_SEARCH_TITLE, CacheName.INDEXER_SEARCH_OFFSET,
 			CacheName.SONARR_RESULT_TITLE }, allEntries = true)
 	public ResponseEntity<Void> save(@RequestBody TmdbTitle tmdbTitle) {
-		tmdbTitleService.updateById(tmdbTitle);
+		if (tmdbTitle.getTmdbId() == null) {
+			List<TmdbTitle> tmdbTitleList = tmdbTitleService.query()
+					.eq(TableField.TVDB_ID, tmdbTitle.getTvdbId()).list();
+			if (!tmdbTitleList.isEmpty()) {
+				tmdbTitle.setTmdbId(tmdbTitleList.get(0).getTmdbId());
+			}
+		}
+		tmdbTitleService.saveOrUpdate(tmdbTitle);
 		return ResponseEntity.ok().build();
 	}
 }

src/main/java/com/lckp/jproxy/util/FormatUtil.java

@@ -55,7 +55,7 @@ public static String cleanTitle(String title, String regex) {
 	 */
 	public static String removeYear(String title) {
 		if (StringUtils.isNotBlank(title)) {
-			return title.replaceAll(" \\d{4}$", "");
+			return title.replaceAll(" (19|20)\\d{2}$", "");
 		}
 		return "";
 	}
@@ -69,7 +69,7 @@ public static String removeYear(String title) {
 	 */
 	public static String removeEpisode(String title) {
 		if (StringUtils.isNotBlank(title)) {
-			return title.replaceAll(" \\d+$", "");
+			return title.replaceAll(" 0*(\\d{1,3}|1[0-8]\\d{2})$", "");
 		}
 		return "";
 	}