From 6467eac4ed7fa3f49009efea8bfd16425b31ed7c Mon Sep 17 00:00:00 2001
From: N1KO <tangjiyang@yinshantech.cn>
Date: Fri, 13 Dec 2024 16:11:43 +0800
Subject: [PATCH] bug fix

---
 .../top/baogutang/music/client/NetEaseMusicClient.java    | 2 +-
 .../java/top/baogutang/music/client/QQMusicClient.java    | 2 +-
 .../top/baogutang/music/dao/entity/MusicRecordEntity.java | 2 +-
 .../top/baogutang/music/processor/Mp3AudioProcessor.java  | 6 +++---
 .../music/service/impl/MusicRecordServiceImpl.java        | 7 ++++++-
 src/main/resources/application.yml                        | 8 ++++----
 6 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/src/main/java/top/baogutang/music/client/NetEaseMusicClient.java b/src/main/java/top/baogutang/music/client/NetEaseMusicClient.java
index ced6e83..a4ad39e 100644
--- a/src/main/java/top/baogutang/music/client/NetEaseMusicClient.java
+++ b/src/main/java/top/baogutang/music/client/NetEaseMusicClient.java
@@ -98,7 +98,7 @@ public class NetEaseMusicClient implements ChannelClient<MusicSearchReq, MusicSe
         if (Objects.isNull(res) || Objects.isNull(res.getName()) || Objects.isNull(res.getUrl())) {
             return;
         }
-        Path baseDir = Paths.get(netEaseMusicProperties.getDownloadPath(), res.getName());
+        Path baseDir = Paths.get(netEaseMusicProperties.getDownloadPath(), res.getArtistName(), res.getAlbumName());
         if (!Files.exists(baseDir)) {
             Files.createDirectories(baseDir);
         }
diff --git a/src/main/java/top/baogutang/music/client/QQMusicClient.java b/src/main/java/top/baogutang/music/client/QQMusicClient.java
index 6c34068..eaa202d 100644
--- a/src/main/java/top/baogutang/music/client/QQMusicClient.java
+++ b/src/main/java/top/baogutang/music/client/QQMusicClient.java
@@ -316,7 +316,7 @@ public class QQMusicClient implements ChannelClient<MusicSearchReq, MusicSearchR
         if (Objects.isNull(res) || Objects.isNull(res.getName()) || Objects.isNull(res.getUrl())) {
             return;
         }
-        Path baseDir = Paths.get(qqMusicProperties.getDownloadPath(), res.getName());
+        Path baseDir = Paths.get(qqMusicProperties.getDownloadPath(), res.getArtistName(), res.getAlbumName());
         if (!Files.exists(baseDir)) {
             Files.createDirectories(baseDir);
         }
diff --git a/src/main/java/top/baogutang/music/dao/entity/MusicRecordEntity.java b/src/main/java/top/baogutang/music/dao/entity/MusicRecordEntity.java
index f4f78bd..87e63b5 100644
--- a/src/main/java/top/baogutang/music/dao/entity/MusicRecordEntity.java
+++ b/src/main/java/top/baogutang/music/dao/entity/MusicRecordEntity.java
@@ -30,7 +30,7 @@ public class MusicRecordEntity extends BaseEntity {
 
     private String artistName;
 
-    private MusicQualityEnum level;
+    private String level;
 
     private String pic;
 
diff --git a/src/main/java/top/baogutang/music/processor/Mp3AudioProcessor.java b/src/main/java/top/baogutang/music/processor/Mp3AudioProcessor.java
index 5acdec3..f7fabbc 100644
--- a/src/main/java/top/baogutang/music/processor/Mp3AudioProcessor.java
+++ b/src/main/java/top/baogutang/music/processor/Mp3AudioProcessor.java
@@ -6,8 +6,8 @@ import org.jaudiotagger.audio.exceptions.CannotReadException;
 import org.jaudiotagger.audio.exceptions.CannotWriteException;
 import org.jaudiotagger.audio.exceptions.InvalidAudioFrameException;
 import org.jaudiotagger.audio.exceptions.ReadOnlyFileException;
-import org.jaudiotagger.audio.flac.FlacFileWriter;
 import org.jaudiotagger.audio.mp3.MP3FileReader;
+import org.jaudiotagger.audio.mp3.MP3FileWriter;
 import org.jaudiotagger.tag.FieldKey;
 import org.jaudiotagger.tag.Tag;
 import org.jaudiotagger.tag.TagException;
@@ -41,8 +41,8 @@ public class Mp3AudioProcessor extends AbstractAudioProcessor {
         artwork.setImageUrl(res.getPic());
         artwork.setBinaryData(fetchImageData(res.getPic()));
         tag.setField(artwork);
-        FlacFileWriter flacFileWriter = new FlacFileWriter();
-        flacFileWriter.write(audioFile);
+        MP3FileWriter fileWriter = new MP3FileWriter();
+        fileWriter.write(audioFile);
         return new FileInputStream(file);
     }
 }
diff --git a/src/main/java/top/baogutang/music/service/impl/MusicRecordServiceImpl.java b/src/main/java/top/baogutang/music/service/impl/MusicRecordServiceImpl.java
index 40ab1eb..a532d54 100644
--- a/src/main/java/top/baogutang/music/service/impl/MusicRecordServiceImpl.java
+++ b/src/main/java/top/baogutang/music/service/impl/MusicRecordServiceImpl.java
@@ -42,7 +42,12 @@ public class MusicRecordServiceImpl extends ServiceImpl<MusicRecordMapper, Music
         entity.setName(res.getName());
         entity.setAlbumName(res.getAlbumName());
         entity.setArtistName(res.getArtistName());
-        entity.setLevel(MusicQualityEnum.parse(res.getLevel()));
+        MusicQualityEnum musicQualityEnum = MusicQualityEnum.parse(res.getLevel());
+        if (musicQualityEnum != null) {
+            entity.setLevel(musicQualityEnum.name());
+        } else {
+            entity.setLevel(res.getLevel());
+        }
         entity.setPic(res.getPic());
         entity.setSize(res.getSize());
         entity.setUrl(res.getUrl());
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index fd7bd3a..9588f6e 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -45,15 +45,15 @@ baogutang:
     album-base-url: http://117.72.78.133:5173/album?id=%d
     artist-base-url: http://117.72.78.133:5173/artists?id=%d
     download-base-url: https://api.sooooooooooooooooootheby.top/Netease_url/Song_V1?level=jymaster&type=json&ids=%d
-    download-path: /downloads/music
-#    download-path: /Users/nikooh/Desktop/downloads/music
+#    download-path: /downloads/music
+    download-path: /Users/nikooh/Desktop/downloads/music
   qq-music:
     query-base-url: http://117.72.78.133:5175/search?key=%s&pageNo=%d&pageSize=%d&t=%d
     playlist-base-url: http://117.72.78.133:5175/songlist?id=%s
     album-base-url: http://117.72.78.133:5175/album/songs?albummid=%s
     download-base-url: http://117.72.78.133:5176/song?url=https://y.qq.com/n/ryqq/songDetail/%s
-    download-path: /downloads/music
-#    download-path: /Users/nikooh/Desktop/downloads/music
+#    download-path: /downloads/music
+    download-path: /Users/nikooh/Desktop/downloads/music