Merge pull request #7481 from Bnyro/master

feat: extract playlist name from filename at YouTube CSV imports

Author: Bnyro

app/build.gradle.kts

@@ -103,6 +103,7 @@ dependencies {
     implementation(libs.androidx.navigation.fragment)
     implementation(libs.androidx.navigation.ui)
     implementation(libs.androidx.preference)
+    implementation(libs.androidx.documentfile)
     implementation(libs.androidx.work.runtime)
     implementation(libs.androidx.collection)
     implementation(libs.androidx.media)

app/src/main/java/com/github/libretube/helpers/ImportHelper.kt

@@ -4,6 +4,7 @@ import android.content.Context
 import android.net.Uri
 import android.util.Log
 import androidx.core.net.toUri
+import androidx.documentfile.provider.DocumentFile
 import com.github.libretube.R
 import com.github.libretube.api.JsonHelper
 import com.github.libretube.api.PlaylistsHelper
@@ -36,6 +37,9 @@ object ImportHelper {
     private const val VIDEO_ID_LENGTH = 11
     private const val YOUTUBE_IMG_URL = "https://img.youtube.com"
 
+    // format: playlistName-videos.csv, where "videos" could also be i18ned to a different language
+    private val csvPlaylistNameRegex = Regex("""(.*)-(\w+)\.csv""")
+
     /**
      * Import subscriptions by a file uri
      */
@@ -192,7 +196,8 @@ object ImportHelper {
 
                     val playlistName = lines[1].split(",").reversed().getOrNull(2)
                     // the playlist name can be undefined in some cases, e.g. watch later lists
-                    playlist.name = playlistName ?: TextUtils.getFileSafeTimeStampNow()
+                    playlist.name = playlistName ?: extractYTPlaylistName(context, uri)
+                            ?: TextUtils.getFileSafeTimeStampNow()
 
                     // start directly at the beginning if header playlist info such as name is missing
                     val startIndex = if (playlistName == null) {
@@ -212,16 +217,11 @@ object ImportHelper {
                             ?.takeIf { it.isNotBlank() }
 
                         if (videoId != null) {
-                            playlist.videos += videoId.trim()
+                            playlist.videos += videoId.trim().takeLast(VIDEO_ID_LENGTH)
                         }
                     }
                     importPlaylists.add(playlist)
                 }
-
-                // convert the YouTube URLs to videoIds
-                importPlaylists.forEach { importPlaylist ->
-                    importPlaylist.videos = importPlaylist.videos.map { it.takeLast(VIDEO_ID_LENGTH) }
-                }
             }
 
             ImportFormat.URLSORIDS -> {
@@ -365,4 +365,11 @@ object ImportHelper {
             context.toastFromMainDispatcher(R.string.success)
         }
     }
+
+    private fun extractYTPlaylistName(context: Context, uri: Uri): String? {
+        val fileName = DocumentFile.fromSingleUri(context, uri)?.name
+
+        return csvPlaylistNameRegex.find(fileName.orEmpty())?.groupValues?.getOrNull(1)
+            ?: fileName?.removeSuffix(".csv")
+    }
 }

gradle/libs.versions.toml

@@ -1,6 +1,7 @@
 [versions]
 appcompat = "1.7.1"
 core = "1.13.1"
+documentfile = "1.1.0"
 gradle = "8.6.1"
 junit = "4.13.2"
 kotlin = "1.9.25"
@@ -40,6 +41,7 @@ androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version
 androidx-core = { group = "androidx.core", name = "core", version.ref = "core" }
 androidx-core-splashscreen = { group = "androidx.core", name = "core-splashscreen", version.ref = "splashscreen" }
 androidx-constraintlayout = { group = "androidx.constraintlayout", name = "constraintlayout", version.ref = "constraintlayout" }
+androidx-documentfile = { module = "androidx.documentfile:documentfile", version.ref = "documentfile" }
 androidx-fragment = { group = "androidx.fragment", name = "fragment-ktx", version.ref = "fragment" }
 gradle = { module = "com.android.tools.build:gradle", version.ref = "gradle" }
 junit = { module = "junit:junit", version.ref = "junit" }