Merge pull request #68 from ming-sc/dev

fix: 修复一些 bug

Author: GregTaoo

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

@@ -275,25 +275,14 @@ public static MusicMetaData parseMetaData(JsonObject object) {
                     .map(JsonElement::getAsLong)
                     .orElseThrow();
 
-            List<String> authorList = optional.map(json -> json.getAsJsonArray("authors"))
-                    .map(arr -> arr.asList().stream()
-                            .map(JsonElement::getAsJsonObject)
-                            .map(Optional::of)
-                            .map(authorOpt -> Optionals
-                                    .flatFirstOf(
-                                        authorOpt,
-                                        // getDetail 接口会再套一层 base 对象
-                                        json -> Optional.ofNullable(json.getAsJsonObject("base")),
-                                        Optional::ofNullable
-                                    )
-                                    // 获取到 author_name 所在对象
-                                    .map(base -> base.get("author_name"))
-                            )
-                            .filter(nameElementOpt -> nameElementOpt.isPresent() && !nameElementOpt.get().isJsonNull())
-                            .map(nameElementOpt -> nameElementOpt.get().getAsString())
-                            .collect(Collectors.toList())
-                    )
-                    .orElseThrow();
+            List<String> authorList = Optionals
+                    .flatFirstOf(
+                            optional,
+                            // 先尝试从 authors 中提取
+                            KuGouMusic::getAuthorsList,
+                            // 再尝试从 base 中提取
+                            KuGouMusic::getAuthorsListFromBase
+                    ).orElseThrow();
 
             String headPic = optional.map(json -> json.getAsJsonObject("album_info"))
                     .map(albumInfo -> albumInfo.get("cover"))
@@ -310,6 +299,39 @@ public static MusicMetaData parseMetaData(JsonObject object) {
         }
     }
 
+    /**
+     * 尝试从 authors 中提取作者列表, 可能有 authors 不存在的情况 (作者信息未上传)
+     */
+    private static Optional<List<String>> getAuthorsList(JsonObject jsonObject) {
+        return Optional.ofNullable(jsonObject)
+                .map(json -> json.getAsJsonArray("authors"))
+                .map(arr -> arr.asList().stream()
+                        .map(JsonElement::getAsJsonObject)
+                        .map(Optional::of)
+                        .map(authorOpt -> Optionals
+                                .flatFirstOf(
+                                        authorOpt,
+                                        // getDetail 接口会再套一层 base 对象
+                                        json -> Optional.ofNullable(json.getAsJsonObject("base")),
+                                        Optional::ofNullable
+                                )
+                                // 获取到 author_name 所在对象
+                                .map(base -> base.get("author_name"))
+                        )
+                        .filter(nameElementOpt -> nameElementOpt.isPresent() && !nameElementOpt.get().isJsonNull())
+                        .map(nameElementOpt -> nameElementOpt.get().getAsString())
+                        .collect(Collectors.toList())
+                );
+    }
+
+    public static Optional<List<String>> getAuthorsListFromBase(JsonObject jsonObject) {
+        return Optional.ofNullable(jsonObject)
+                .map(json -> json.getAsJsonObject("base"))
+                .map(base -> base.get("author_name"))
+                .map(JsonElement::getAsString)
+                .map(names -> Arrays.asList(names.split("、")));
+    }
+
     /**
      * 解析音乐元数据, 处理 searchMusic 和 getPlayListAllTrack 返回的 Json 对象
      * @param object 音乐详情 Json 对象

src/main/java/top/gregtao/concerto/screen/kugou/KuGouMusicIndexScreen.java

@@ -55,17 +55,19 @@ protected void init() {
                     0, 0, 0, 0,
                     Text.empty(),
                     button -> {
-                        // 更新 VIP 状态
-                        KuGouMusicUser localUser = KuGouMusicApiClient.LOCAL_USER;
-                        if (localUser.isLoggedIn() && localUser.isVersionSame()) {
-                            Text tip;
-                            if (localUser.updateVIPStatus()) {
-                                tip = Text.translatable("concerto.screen.kugou.vip.update_success");
-                            } else {
-                                tip = Text.translatable("concerto.screen.kugou.vip.update_failed");
+                        ConcertoRunner.run(() -> {
+                            // 更新 VIP 状态
+                            KuGouMusicUser localUser = KuGouMusicApiClient.LOCAL_USER;
+                            if (localUser.isLoggedIn() && localUser.isVersionSame()) {
+                                Text tip;
+                                if (localUser.updateVIPStatus()) {
+                                    tip = Text.translatable("concerto.screen.kugou.vip.update_success");
+                                } else {
+                                    tip = Text.translatable("concerto.screen.kugou.vip.update_failed");
+                                }
+                                displayAlert(tip);
                             }
-                            displayAlert(tip);
-                        }
+                        });
                     },
                     textRenderer
             ));

src/main/java/top/gregtao/concerto/screen/widget/URLImageWidget.java

@@ -160,10 +160,13 @@ public static BufferedImage readImageFromUrl(String url) throws IOException {
     }
 
     private void uploadImage(BufferedImage image, Runnable callback) {
+        // ImageIO.write() 是耗时操作, 会卡住渲染线程
+        NativeImage nativeImage = toNativeImage(image);
         MinecraftClient.getInstance().submit(() -> {
-            if (this.texture != null)
-              MinecraftClient.getInstance().getTextureManager().destroyTexture(this.textureId);
-            this.texture = new NativeImageBackedTexture(this.textureId::toString, toNativeImage(image));
+            if (this.texture != null) {
+                MinecraftClient.getInstance().getTextureManager().destroyTexture(this.textureId);
+            }
+            this.texture = new NativeImageBackedTexture(this.textureId::toString, nativeImage);
             MinecraftClient.getInstance().getTextureManager().registerTexture(this.textureId, this.texture);
         }).thenRun(callback);
     }