From a3140ff23a9425992c607b9d2d3e7448e3a832db Mon Sep 17 00:00:00 2001
From: "Gao, Ruiyuan" <905370712@qq.com>
Date: Thu, 17 Oct 2024 11:36:48 +0800
Subject: [PATCH] fix: remove_id3_tags return None if no id3 tag (#238)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix: remove_id3_tags return None if no id3 tag

* Auto-format code 🧹🌟🤖

---------

Co-authored-by: Formatter [BOT] <runner@fv-az885-171.m43iyx0u3v4e1h2pvvlabjukza.cx.internal.cloudapp.net>
---
 xiaomusic/utils.py | 34 ++++++++++++++++++----------------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/xiaomusic/utils.py b/xiaomusic/utils.py
index aff1ecf..3df7123 100644
--- a/xiaomusic/utils.py
+++ b/xiaomusic/utils.py
@@ -416,6 +416,15 @@ def get_temp_dir(music_path: str):
 
 
 def remove_id3_tags(input_file: str, config) -> str:
+    audio = MP3(input_file, ID3=ID3)
+
+    # 检查是否存在ID3 v2.3或v2.4标签
+    if not (
+        audio.tags
+        and (audio.tags.version == (2, 3, 0) or audio.tags.version == (2, 4, 0))
+    ):
+        return None
+
     music_path = config.music_path
     temp_dir = get_temp_dir(music_path)
 
@@ -436,22 +445,15 @@ def remove_id3_tags(input_file: str, config) -> str:
         log.info(f"File {out_file_path} already exists. Skipping remove_id3_tags.")
         return relative_path
 
-    audio = MP3(input_file, ID3=ID3)
-
-    # 检查是否存在ID3 v2.3或v2.4标签
-    if audio.tags and (
-        audio.tags.version == (2, 3, 0) or audio.tags.version == (2, 4, 0)
-    ):
-        # 拷贝文件
-        shutil.copy(input_file, out_file_path)
-        outaudio = MP3(out_file_path, ID3=ID3)
-        # 删除ID3标签
-        outaudio.delete()
-        # 保存修改后的文件
-        outaudio.save(padding=no_padding)
-        log.info(f"File {out_file_path} remove_id3_tags ok.")
-        return relative_path
-
+    # 开始去除（不再需要检查）
+    # 拷贝文件
+    shutil.copy(input_file, out_file_path)
+    outaudio = MP3(out_file_path, ID3=ID3)
+    # 删除ID3标签
+    outaudio.delete()
+    # 保存修改后的文件
+    outaudio.save(padding=no_padding)
+    log.info(f"File {out_file_path} remove_id3_tags ok.")
     return relative_path