first steps towards playlist editing

nift4 · nift4 · commit 1bc15342308a · 2025-05-03T13:46:29.000+02:00
diff --git a/app/src/main/java/org/akanework/gramophone/ui/adapters/ArtistAdapter.kt b/app/src/main/java/org/akanework/gramophone/ui/adapters/ArtistAdapter.kt
@@ -102,7 +102,7 @@ class ArtistAdapter(
 
     private class ArtistDecorAdapter(
         artistAdapter: ArtistAdapter
-    ) : BaseDecorAdapter<ArtistAdapter>(artistAdapter, R.plurals.artists) {
+    ) : BaseDecorAdapter<ArtistAdapter>(artistAdapter, R.plurals.artists, false) {
 
         override fun onSortButtonPressed(popupMenu: PopupMenu) {
             popupMenu.menu.findItem(R.id.album_artist_checkbox).isVisible = true
diff --git a/app/src/main/java/org/akanework/gramophone/ui/adapters/BaseDecorAdapter.kt b/app/src/main/java/org/akanework/gramophone/ui/adapters/BaseDecorAdapter.kt
@@ -38,7 +38,7 @@ import org.akanework.gramophone.ui.getAdapterType
 open class BaseDecorAdapter<T : BaseAdapter<*>>(
     protected val adapter: T,
     private val pluralStr: Int,
-    private val isSubFragment: Boolean = false
+    private val isSubFragment: Boolean
 ) : MyRecyclerView.Adapter<BaseDecorAdapter<T>.ViewHolder>(), ItemHeightHelper {
 
     protected val context: Context = adapter.context
@@ -56,7 +56,7 @@ open class BaseDecorAdapter<T : BaseAdapter<*>>(
         return ViewHolder(view)
     }
 
-    final override fun onBindViewHolder(holder: ViewHolder, position: Int) {
+    override fun onBindViewHolder(holder: ViewHolder, position: Int) {
         val count = adapter.itemCount
         holder.playAll.visibility =
             if (adapter is SongAdapter) View.VISIBLE else View.GONE
@@ -245,6 +245,7 @@ open class BaseDecorAdapter<T : BaseAdapter<*>>(
         view: View,
     ) : RecyclerView.ViewHolder(view) {
         val sortButton: MaterialButton = view.findViewById(R.id.sort)
+        val createPlaylist: MaterialButton = view.findViewById(R.id.create_playlist)
         val playAll: MaterialButton = view.findViewById(R.id.play_all)
         val shuffleAll: MaterialButton = view.findViewById(R.id.shuffle_all)
         val jumpUp: MaterialButton = view.findViewById(R.id.jumpUp)
diff --git a/app/src/main/java/org/akanework/gramophone/ui/adapters/PlaylistAdapter.kt b/app/src/main/java/org/akanework/gramophone/ui/adapters/PlaylistAdapter.kt
@@ -17,13 +17,23 @@
 
 package org.akanework.gramophone.ui.adapters
 
+import android.util.Log
+import android.view.View
+import android.widget.Toast
+import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.widget.PopupMenu
+import androidx.core.view.iterator
 import androidx.fragment.app.Fragment
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import org.akanework.gramophone.R
 import org.akanework.gramophone.ui.MainActivity
 import org.akanework.gramophone.ui.fragments.GeneralSubFragment
 import uk.akane.libphonograph.dynamicitem.RecentlyAdded
 import uk.akane.libphonograph.items.Playlist
+import uk.akane.libphonograph.manipulator.ItemManipulator
 
 /**
  * [PlaylistAdapter] is an adapter for displaying artists.
@@ -41,8 +51,8 @@ class PlaylistAdapter(
     ownsView = true,
     defaultLayoutType = LayoutType.LIST
 ) {
-
     override val defaultCover = R.drawable.ic_default_cover_playlist
+    private val ioScope = CoroutineScope(Dispatchers.IO)
 
     override fun virtualTitleOf(item: Playlist): String {
         return context.getString(
@@ -59,8 +69,10 @@ class PlaylistAdapter(
     }
 
     override fun onMenu(item: Playlist, popupMenu: PopupMenu) {
-        popupMenu.inflate(R.menu.more_menu_less)
-
+        popupMenu.inflate(R.menu.more_menu)
+        popupMenu.menu.iterator().forEach {
+            it.isVisible = it.itemId == R.id.play_next || it.itemId == R.id.rename || it.itemId == R.id.delete
+        }
         popupMenu.setOnMenuItemClickListener { it1 ->
             when (it1.itemId) {
                 R.id.play_next -> {
@@ -72,9 +84,55 @@ class PlaylistAdapter(
                     true
                 }
 
+                R.id.delete -> {
+                    AlertDialog.Builder(context)
+                        .setTitle(R.string.delete)
+                        .setMessage(context.getString(R.string.delete_really, item.title))
+                        .setPositiveButton(R.string.yes) { _, _ ->
+                            ioScope.launch {
+                                try {
+                                    ItemManipulator.deletePlaylist(context, item.path!!)
+                                } catch (e: Exception) {
+                                    Log.e("PlaylistAdapter", Log.getStackTraceString(e))
+                                    withContext(Dispatchers.Main) {
+                                        Toast.makeText(context, R.string.delete_failed_playlist, Toast.LENGTH_LONG).show()
+                                    }
+                                }
+                            }
+                        }
+                        .setNegativeButton(R.string.no) { _, _ -> }
+                        .show()
+                    true
+                }
+
+                R.id.rename -> TODO()
+
                 else -> false
             }
         }
     }
 
+
+    override fun createDecorAdapter(): BaseDecorAdapter<out BaseAdapter<Playlist>> {
+        return PlaylistDecorAdapter(this)
+    }
+
+    private inner class PlaylistDecorAdapter(
+        playlistAdapter: PlaylistAdapter
+    ) : BaseDecorAdapter<PlaylistAdapter>(playlistAdapter, R.plurals.items, false) {
+
+        override fun onBindViewHolder(
+            holder: BaseDecorAdapter<PlaylistAdapter>.ViewHolder,
+            position: Int,
+            payloads: List<Any?>
+        ) {
+            super.onBindViewHolder(holder, position, payloads)
+            holder.createPlaylist.visibility = View.VISIBLE
+            holder.createPlaylist.setOnClickListener { _ ->
+                ioScope.launch {
+                    ItemManipulator.createPlaylist(context, "test123")
+                }
+            }
+        }
+    }
 }
diff --git a/app/src/main/res/drawable/outline_add_box_24.xml b/app/src/main/res/drawable/outline_add_box_24.xml
@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="?colorControlNormal" android:viewportHeight="960" android:viewportWidth="960" android:width="24dp">
+      
+    <path android:fillColor="@android:color/white" android:pathData="M440,680L520,680L520,520L680,520L680,440L520,440L520,280L440,280L440,440L280,440L280,520L440,520L440,680ZM200,840Q167,840 143.5,816.5Q120,793 120,760L120,200Q120,167 143.5,143.5Q167,120 200,120L760,120Q793,120 816.5,143.5Q840,167 840,200L840,760Q840,793 816.5,816.5Q793,840 760,840L200,840ZM200,760L760,760Q760,760 760,760Q760,760 760,760L760,200Q760,200 760,200Q760,200 760,200L200,200Q200,200 200,200Q200,200 200,200L200,760Q200,760 200,760Q200,760 200,760ZM200,200L200,200Q200,200 200,200Q200,200 200,200L200,760Q200,760 200,760Q200,760 200,760L200,760Q200,760 200,760Q200,760 200,760L200,200Q200,200 200,200Q200,200 200,200Z"/>
+    
+</vector>
diff --git a/app/src/main/res/layout/general_decor.xml b/app/src/main/res/layout/general_decor.xml
@@ -24,6 +24,25 @@
         android:gravity="center_vertical"
         android:layout_marginEnd="9dp">
 
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/create_playlist"
+            android:layout_width="48dp"
+            android:layout_height="48dp"
+            android:background="@drawable/rp_buttons"
+            android:insetLeft="0dp"
+            android:insetTop="0dp"
+            android:insetRight="0dp"
+            android:insetBottom="0dp"
+            android:visibility="gone"
+            app:tooltipText="@string/create_playlist"
+            android:contentDescription="@string/create_playlist"
+            app:icon="@drawable/outline_add_box_24"
+            app:iconGravity="textStart"
+            app:iconPadding="0dp"
+            app:iconSize="26dp"
+            app:iconTint="?attr/colorPrimary"
+            tools:visibility="visible" />
+
         <com.google.android.material.button.MaterialButton
             android:id="@+id/play_all"
             android:layout_width="48dp"
diff --git a/app/src/main/res/menu/more_menu.xml b/app/src/main/res/menu/more_menu.xml
@@ -9,6 +9,10 @@
     <item
         android:id="@+id/artist"
         android:title="@string/go_to_artist" />
+    <item
+        android:id="@+id/rename"
+        android:title="@string/rename"
+        android:visible="false" />
     <item
         android:id="@+id/details"
         android:title="@string/details" />
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -159,6 +159,7 @@
     <string name="dialog_edit_metadata">Edit</string>
     <string name="dialog_lyrics">Lyrics</string>
     <string name="delete_failed">Deleting song failed</string>
+    <string name="delete_failed_playlist">Deleting playlist failed</string>
     <string name="album_covers_enhance">Enhanced album cover loading</string>
     <string name="album_covers_enhance_desc">Support high quality song covers and allow album and song cover to differ (requires photos access)</string>
     <string name="deny_images"><![CDATA[Please deny \"Photos and videos\" permission]]></string>
@@ -421,4 +422,6 @@
     <string name="do_not_enter_email_enter_msg">Enter message, not an e-mail address</string>
     <string name="log_will_auto_send">Logs will be sent automatically, explain the issue instead</string>
     <string name="log_attachment">Logs will be sent as attachment automatically</string>
+    <string name="create_playlist">Create playlist</string>
+    <string name="rename">Rename</string>
 </resources>
diff --git a/libPhonograph/build.gradle.kts b/libPhonograph/build.gradle.kts
@@ -14,7 +14,7 @@ android {
         testFixtures {
             enable = true
         }
-        minSdk = 16
+        minSdk = 21
         consumerProguardFiles("consumer-rules.pro")
     }
 
diff --git a/libPhonograph/src/main/java/uk/akane/libphonograph/dynamicitem/RecentlyAdded.kt b/libPhonograph/src/main/java/uk/akane/libphonograph/dynamicitem/RecentlyAdded.kt
@@ -4,7 +4,7 @@ import androidx.media3.common.MediaItem
 import uk.akane.libphonograph.items.Playlist
 import uk.akane.libphonograph.items.addDate
 
-class RecentlyAdded(minAddDate: Long, songList: List<MediaItem>) : Playlist(-1, null) {
+class RecentlyAdded(minAddDate: Long, songList: List<MediaItem>) : Playlist(-1, null, null, null, null) {
     private val rawList: List<MediaItem> = songList.sortedByDescending {
         it.mediaMetadata.addDate ?: -1 }
     private var filteredList = filterList(minAddDate)
diff --git a/libPhonograph/src/main/java/uk/akane/libphonograph/items/Playlist.kt b/libPhonograph/src/main/java/uk/akane/libphonograph/items/Playlist.kt
@@ -1,13 +1,18 @@
 package uk.akane.libphonograph.items
 
 import androidx.media3.common.MediaItem
+import java.io.File
 
 open class Playlist protected constructor(
     override val id: Long?,
-    override val title: String?
+    override val title: String?,
+    val path: File?,
+    val dateAdded: Long?,
+    val dateModified: Long?,
 ) : Item {
     private var _songList: List<MediaItem>? = null
-    constructor(id: Long?, title: String?, songList: List<MediaItem>) : this(id, title) {
+    constructor(id: Long?, title: String?, path: File?, dateAdded: Long?, dateModified: Long?,
+                songList: List<MediaItem>) : this(id, title, path, dateAdded, dateModified) {
         _songList = songList
     }
     override val songList: List<MediaItem>
@@ -38,11 +43,14 @@ open class Playlist protected constructor(
 internal data class RawPlaylist(
     val id: Long?,
     val title: String?,
+    val path: File?,
+    val dateAdded: Long?,
+    val dateModified: Long?,
     val songList: List<Long>
 ) {
     // idMap may be null if and only if all playlists are empty
     fun toPlaylist(idMap: Map<Long, MediaItem>?): Playlist {
-        return Playlist(id, title, songList.mapNotNull { value ->
+        return Playlist(id, title, path, dateAdded, dateModified, songList.mapNotNull { value ->
             idMap!![value]
             // if song is null it's 100% of time a library (or MediaStore?) bug
             // and because I found the MediaStore bug in the wild, don't be so stingy
diff --git a/libPhonograph/src/main/java/uk/akane/libphonograph/manipulator/ItemManipulator.kt b/libPhonograph/src/main/java/uk/akane/libphonograph/manipulator/ItemManipulator.kt
@@ -5,13 +5,17 @@ import android.content.Context
 import android.content.Intent
 import android.content.IntentSender
 import android.content.pm.PackageManager
-import android.os.Binder
+import android.media.MediaScannerConnection
+import android.os.Environment
 import android.provider.MediaStore
+import android.util.Log
+import uk.akane.libphonograph.TAG
 import uk.akane.libphonograph.hasScopedStorageV2
+import java.io.File
+import java.io.IOException
 
 object ItemManipulator {
     // requires requestLegacyExternalStorage for simplicity
-    // TODO test on Q :)
     fun deleteSong(context: Context, id: Long): DeleteRequest {
         val uri = ContentUris.withAppendedId(
             MediaStore.Audio.Media.getContentUri("external"), id)
@@ -33,6 +37,57 @@ object ItemManipulator {
         }
     }
 
+    fun createPlaylist(context: Context, name: String): File {
+        val parent = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_MUSIC)
+        val out = File(parent, "$name.m3u")
+        if (out.exists())
+            throw IllegalArgumentException("tried to create playlist $out that already exists")
+        PlaylistSerializer.write(context.applicationContext, out, listOf())
+        return out
+    }
+
+    fun setPlaylistContent(context: Context, out: File, songs: List<File>) {
+        // TODO try write request for non-owned files (can we find out what we own?)
+        if (!out.exists())
+            throw IllegalArgumentException("tried to change playlist $out that doesn't exist")
+        val backup = out.readBytes()
+        try {
+            PlaylistSerializer.write(context.applicationContext, out, songs)
+        } catch (t: Throwable) {
+            try {
+                PlaylistSerializer.write(context.applicationContext, out.resolveSibling(
+                    "${out.nameWithoutExtension}_NEW_${System.currentTimeMillis()}.${out.extension}"), songs)
+            } catch (t: Throwable) {
+                Log.e(TAG, Log.getStackTraceString(t))
+            }
+            try {
+                out.resolveSibling("${out.name}.bak").writeBytes(backup)
+            } catch (t: Throwable) {
+                Log.e(TAG, Log.getStackTraceString(t))
+            }
+            throw t
+        }
+    }
+
+    fun renamePlaylist(context: Context, out: File, newName: String) {
+        // TODO try delete request for non-owned files
+        val new = out.resolveSibling("$newName.${out.extension}")
+        out.renameTo(new)
+        MediaScannerConnection.scanFile(context, arrayOf(out.toString(), new.toString()), null) { path, uri ->
+            if (uri == null && path == new.toString()) {
+                Log.e(TAG, "failed to scan renamed playlist $path")
+            }
+        }
+    }
+
+    fun deletePlaylist(context: Context, out: File) {
+        // TODO try delete request for non-owned files
+        Log.i(TAG, "deleting $out")
+        if (!out.delete())
+            throw IOException("delete returned false")
+        MediaScannerConnection.scanFile(context, arrayOf(out.toString()), null) { _, _ -> }
+    }
+
     class DeleteRequest {
         val startSystemDialog: IntentSender?
         val continueDelete: (() -> Boolean)?
diff --git a/libPhonograph/src/main/java/uk/akane/libphonograph/manipulator/PlaylistSerializer.kt b/libPhonograph/src/main/java/uk/akane/libphonograph/manipulator/PlaylistSerializer.kt
@@ -0,0 +1,49 @@
+package uk.akane.libphonograph.manipulator
+
+import android.content.Context
+import android.media.MediaScannerConnection
+import android.util.Log
+import java.io.File
+
+object PlaylistSerializer {
+    private const val TAG = "PlaylistSerializer"
+
+    @Throws(UnsupportedPlaylistFormatException::class)
+    fun write(context: Context, outFile: File, songs: List<File>) {
+        val format = when (outFile.extension.lowercase()) {
+            "m3u", "m3u8" -> PlaylistFormat.M3u
+            // "xspf" -> PlaylistFormat.Xspf
+            // "wpl" -> PlaylistFormat.Wpl
+            // "pls" -> PlaylistFormat.Pls
+            else -> throw UnsupportedPlaylistFormatException(outFile.extension)
+        }
+        write(context, format, outFile, songs)
+    }
+
+    private fun write(context: Context, format: PlaylistFormat, outFile: File, songs: List<File>) {
+        when (format) {
+            PlaylistFormat.M3u -> {
+                val parent = outFile.parentFile ?: throw NullPointerException("parentFile of playlist is null")
+                val out = "#EXTM3U\n" + songs.joinToString("\n") { it.relativeTo(parent).toString() }.trim()
+                outFile.writeText(out)
+            }
+            PlaylistFormat.Xspf -> TODO()
+            PlaylistFormat.Wpl -> TODO()
+            PlaylistFormat.Pls -> TODO()
+        }
+        MediaScannerConnection.scanFile(context, arrayOf(outFile.toString()), null) { path, uri ->
+            if (uri == null) {
+                Log.e(TAG, "failed to scan playlist $path")
+            }
+        }
+    }
+
+    private enum class PlaylistFormat {
+        M3u,
+        Xspf,
+        Wpl,
+        Pls,
+    }
+
+    class UnsupportedPlaylistFormatException(extension: String) : Exception(extension)
+}
diff --git a/libPhonograph/src/main/java/uk/akane/libphonograph/reader/Reader.kt b/libPhonograph/src/main/java/uk/akane/libphonograph/reader/Reader.kt

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ android {`
`14`	`14`	`testFixtures {`
`15`	`15`	`enable = true`
`16`	`16`	`}`
`17`		`- minSdk = 16`
	`17`	`+ minSdk = 21`
`18`	`18`	`consumerProguardFiles("consumer-rules.pro")`
`19`	`19`	`}`
`20`	`20`