Merge remote-tracking branch 'origin/master'

ZTFtrue · Aug 15, 2024 · 0685e5b · 0685e5b
2 parents e3b8fb4 + ffde2c1
commit 0685e5b
Showing 1 changed file with 46 additions and 41 deletions.
diff --git a/app/src/main/java/com/ztftrue/music/MusicViewModel.kt b/app/src/main/java/com/ztftrue/music/MusicViewModel.kt
@@ -386,24 +386,49 @@ class MusicViewModel : ViewModel() {
     }
 
     fun getAlbumCover(id: Long, context: Context): Any? {
-        var result: Any? = null
-        val folder = File(context.externalCacheDir, "album_cover")
-        folder.mkdirs()
-        val coverPath = File(folder, "$id.jpg")
-        if (coverPath.exists()) {
-            return coverPath.path
-        } else {
-//            coverPath.createNewFile()
-        }
         try {
-            val albumUri = ContentUris.withAppendedId(
-                Uri.parse("content://media/external/audio/albumart"),
-                id
-            )
-            val s = context.contentResolver.openInputStream(
-                albumUri
-            )
-            if (s == null) {
+            var result: Any? = null
+            val folder = File(context.externalCacheDir, "album_cover")
+            folder.mkdirs()
+            val coverPath = File(folder, "$id.jpg")
+            if (coverPath.exists()) {
+                return coverPath.path
+            } else {
+    //            coverPath.createNewFile()
+            }
+            try {
+                val albumUri = ContentUris.withAppendedId(
+                    Uri.parse("content://media/external/audio/albumart"),
+                    id
+                )
+                val s = context.contentResolver.openInputStream(
+                    albumUri
+                )
+                if (s == null) {
+                    val bm =
+                        BitmapFactory.decodeResource(
+                            context.resources,
+                            R.drawable.songs_thumbnail_cover
+                        )
+                    val outStream = FileOutputStream(coverPath)
+
+                    bm.compress(Bitmap.CompressFormat.JPEG, 100, outStream)
+                    outStream.flush()
+                    outStream.close()
+                    result =
+                        R.drawable.songs_thumbnail_cover
+                } else {
+                    s.use { input ->
+                        Files.copy(input, coverPath.toPath())
+                    }
+                    result = coverPath.path
+                    s.close()
+                }
+
+            } catch (e: Exception) {
+    //                        e.printStackTrace()
+            }
+            if (result == null) {
                 val bm =
                     BitmapFactory.decodeResource(
                         context.resources,
@@ -414,32 +439,12 @@ class MusicViewModel : ViewModel() {
                 bm.compress(Bitmap.CompressFormat.JPEG, 100, outStream)
                 outStream.flush()
                 outStream.close()
-                result =
-                    R.drawable.songs_thumbnail_cover
-            } else {
-                s.use { input ->
-                    Files.copy(input, coverPath.toPath())
-                }
-                result = coverPath.path
-                s.close()
+                return R.drawable.songs_thumbnail_cover
             }
+            return result
+        } catch (_: Exception) {
 
-        } catch (e: Exception) {
-//                        e.printStackTrace()
-        }
-        if (result == null) {
-            val bm =
-                BitmapFactory.decodeResource(
-                    context.resources,
-                    R.drawable.songs_thumbnail_cover
-                )
-            val outStream = FileOutputStream(coverPath)
-
-            bm.compress(Bitmap.CompressFormat.JPEG, 100, outStream)
-            outStream.flush()
-            outStream.close()
-            return R.drawable.songs_thumbnail_cover
         }
-        return result
+        return R.drawable.songs_thumbnail_cover
     }
 }