From c43c14ad31923f5b66fa542b86fdd2293662bec3 Mon Sep 17 00:00:00 2001
From: wushuo <2725730722@qq.com>
Date: Wed, 27 Nov 2024 01:16:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=87=8D=E5=91=BD=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
UPDATE.md | 4 ++--
pom.xml | 2 +-
src/main/java/ani/rss/util/RenameUtil.java | 22 +++++++++++++---------
3 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/UPDATE.md b/UPDATE.md
index 60e1e655..be19822d 100644
--- a/UPDATE.md
+++ b/UPDATE.md
@@ -1,5 +1,5 @@
-支持批量删除种子缓存
+修复重命名 ${episode} 问题 #97
----------
-`更新依赖于Github, 需要网络环境支持`
\ No newline at end of file
+`更新依赖于Github, 需要网络环境支持`
diff --git a/pom.xml b/pom.xml
index 8d475f6c..14bd48cf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
ani.rss
ani-rss
- 1.1.201
+ 1.1.202
11
diff --git a/src/main/java/ani/rss/util/RenameUtil.java b/src/main/java/ani/rss/util/RenameUtil.java
index 18e6c1b7..964ea753 100644
--- a/src/main/java/ani/rss/util/RenameUtil.java
+++ b/src/main/java/ani/rss/util/RenameUtil.java
@@ -83,28 +83,32 @@ public static Boolean rename(Ani ani, Item item) {
return false;
}
- String episode = ReUtil.get("\\d+(\\.5)?", e, 0);
- if (StrUtil.isBlank(episode)) {
+ String episodeStr = ReUtil.get("\\d+(\\.5)?", e, 0);
+ if (StrUtil.isBlank(episodeStr)) {
return false;
}
Boolean skip5 = config.getSkip5();
if (skip5) {
- if (episode.endsWith(".5")) {
- log.debug("{} 疑似 {} 剧集, 自动跳过", itemTitle, episode + ".5");
+ if (episodeStr.endsWith(".5")) {
return false;
}
}
- boolean is5 = Double.parseDouble(episode) != Double.valueOf(episode).intValue();
-
- item.setEpisode(Double.parseDouble(episode) + offset);
+ double episode = Double.parseDouble(episodeStr) + offset;
+ item.setEpisode(episode);
String seasonFormat = String.format("%02d", season);
- String episodeFormat = String.format("%02d", item.getEpisode().intValue());
+ String episodeFormat = String.format("%02d", (int) episode);
+
+ episodeStr = String.valueOf((int) episode);
+
+ // .5
+ boolean is5 = episode != (int) episode;
if (is5) {
episodeFormat = episodeFormat + ".5";
+ episodeStr = episodeStr + ".5";
}
title = getName(title);
@@ -114,7 +118,7 @@ public static Boolean rename(Ani ani, Item item) {
renameTemplate = renameTemplate.replace("${seasonFormat}", seasonFormat);
renameTemplate = renameTemplate.replace("${episodeFormat}", episodeFormat);
renameTemplate = renameTemplate.replace("${season}", String.valueOf(season));
- renameTemplate = renameTemplate.replace("${episode}", episode);
+ renameTemplate = renameTemplate.replace("${episode}", episodeStr);
renameTemplate = renameTemplate.replace("${subgroup}", subgroup);
renameTemplate = renameTemplate.replace("${itemTitle}", itemTitle);