chore: code style

Author: GregTaoo

…op/gregtao/concerto/util/LyricsUtil.java …concerto/http/kugou/KuGouLyricsUtil.javasrc/main/java/top/gregtao/concerto/util/LyricsUtil.java renamed to src/main/java/top/gregtao/concerto/http/kugou/KuGouLyricsUtil.java src/main/java/top/gregtao/concerto/util/LyricsUtil.java renamed to src/main/java/top/gregtao/concerto/http/kugou/KuGouLyricsUtil.java

@@ -1,15 +1,17 @@
-package top.gregtao.concerto.util;
+package top.gregtao.concerto.http.kugou;
 
 import com.google.gson.Gson;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
+import top.gregtao.concerto.util.Pair;
+import top.gregtao.concerto.util.TextUtil;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
 
-public class LyricsUtil {
+public class KuGouLyricsUtil {
     public static Pair<String, String> krcToLrc(String krc) {
         String[] lines = krc.split("\n|\r|\r\n");
         List<Pair<String, String>> pairList = new ArrayList<>();

src/main/java/top/gregtao/concerto/http/kugou/KuGouMusicApiClient.java

@@ -165,7 +165,7 @@ public HttpResponse<String> request(String url, Map<String, String> params, KuGo
 
         // 签名
         if (!config.isNoSign()) {
-            String signature = "";
+            String signature;
             switch (config.getEncryptType()) {
                 case WEB -> signature = KuGouMusicApiCrypto.signWebParams(paramsMap);
                 case null, default -> signature = KuGouMusicApiCrypto.signAndroidParams(paramsMap, dataJson);

src/main/java/top/gregtao/concerto/music/KuGouMusic.java

@@ -14,7 +14,7 @@
 import top.gregtao.concerto.music.meta.music.MusicMetaData;
 import top.gregtao.concerto.music.meta.music.UnknownMusicMeta;
 import top.gregtao.concerto.util.FileUtil;
-import top.gregtao.concerto.util.LyricsUtil;
+import top.gregtao.concerto.http.kugou.KuGouLyricsUtil;
 import top.gregtao.concerto.util.Optionals;
 import top.gregtao.concerto.util.Pair;
 
@@ -31,7 +31,7 @@ public class KuGouMusic extends Music implements CacheableMusic, DynamicPath {
 
     private String rawPath, rawLyrics, rawSubLyrics, format;
 
-    private Map<Level, String> hashMap = new HashMap<>();
+    private final Map<Level, String> hashMap = new HashMap<>();
 
     public KuGouMusic(String id, String hash, boolean isEncodeAlbumAudioId) {
         this.albumAudioId = isEncodeAlbumAudioId ? toAlbumAudioId(id) : id;
@@ -150,7 +150,7 @@ public Pair<Lyrics, Lyrics> getLyrics() {
 
             Pair<String, String> pair = KuGouMusicApiClient.INSTANCE.getLyric(bestLyric.getFirst(), bestLyric.getSecond())
                     .map(KuGouMusicApiCrypto::decodeLyrics)
-                    .map(LyricsUtil::krcToLrc)
+                    .map(KuGouLyricsUtil::krcToLrc)
                     .orElseThrow();
 
             this.rawLyrics = pair.getFirst();

src/main/java/top/gregtao/concerto/util/MathUtil.java

@@ -15,20 +15,18 @@ public static int parseIntOrElse(String nm, int orElse) {
         }
     }
 
-    public static String formattedTime(int timestamp) {
+    public static String formattedTime(long timestamp) {
         Date date = new Date(timestamp);
         SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
         return dateFormat.format(date);
     }
 
-    public static String formattedTime(String timestamp) {
-        return formattedTime(parseIntOrElse(timestamp, 0));
+    public static String formattedTime(int timestamp) {
+        return formattedTime((long) timestamp);
     }
 
-    public static String formattedTime(long timestamp) {
-        Date date = new Date(timestamp);
-        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
-        return dateFormat.format(date);
+    public static String formattedTime(String timestamp) {
+        return formattedTime(parseIntOrElse(timestamp, 0));
     }
 
     public static <T> int lowerBound(ArrayList<T> a, T key, Comparator<? super T> c) {