From 6089cbc48493d746a110bba8d9997c3d2209b82e Mon Sep 17 00:00:00 2001
From: LagradOst <11805592+LagradOst@users.noreply.github.com>
Date: Wed, 30 Aug 2023 00:52:34 +0200
Subject: [PATCH] fixed subs on downloads

---
 app/build.gradle.kts                          |  2 +-
 .../ui/player/DownloadFileGenerator.kt        | 73 +++++++++++--------
 .../utils/VideoDownloadManager.kt             |  2 +-
 3 files changed, 45 insertions(+), 32 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 3927d081..55d0f7ae 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -233,7 +233,7 @@ dependencies {
     // To fix SSL fuckery on android 9
     implementation("org.conscrypt:conscrypt-android:2.2.1")
     // Util to skip the URI file fuckery 🙏
-    implementation("com.github.LagradOst:SafeFile:0.0.3")
+    implementation("com.github.LagradOst:SafeFile:0.0.5")
 
     // API because cba maintaining it myself
     implementation("com.uwetrottmann.tmdb2:tmdb-java:2.6.0")
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/DownloadFileGenerator.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/DownloadFileGenerator.kt
index baf7ed52..1b618e45 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/DownloadFileGenerator.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/DownloadFileGenerator.kt
@@ -50,6 +50,10 @@ class DownloadFileGenerator(
         return null
     }
 
+    fun cleanDisplayName(name: String): String {
+        return name.substringBeforeLast('.').trim()
+    }
+
     override suspend fun generateLinks(
         clearCache: Boolean,
         isCasting: Boolean,
@@ -58,39 +62,48 @@ class DownloadFileGenerator(
         offset: Int,
     ): Boolean {
         val meta = episodes[currentIndex + offset]
-        callback(Pair(null, meta))
+        callback(null to meta)
 
-        context?.let { ctx ->
-            val relative = meta.relativePath
-            val display = meta.displayName
+        val ctx = context ?: return true
+        val relative = meta.relativePath ?: return true
+        val display = meta.displayName ?: return true
 
-            if (display == null || relative == null) {
-                return@let
+        val cleanDisplay = cleanDisplayName(display)
+
+        VideoDownloadManager.getFolder(ctx, relative, meta.basePath)
+            ?.forEach { (name, uri) ->
+                // only these files are allowed, so no videos as subtitles
+                if (listOf(
+                        ".vtt",
+                        ".srt",
+                        ".txt",
+                        ".ass",
+                        ".ttml",
+                        ".sbv",
+                        ".dfxp"
+                    ).none { name.contains(it, true) }
+                ) return@forEach
+
+                // cant have the exact same file as a subtitle
+                if (name.equals(display, true)) return@forEach
+
+                val cleanName = cleanDisplayName(name)
+
+                // we only want files with the approx same name
+                if (!cleanName.startsWith(cleanDisplay, true)) return@forEach
+
+                val realName = cleanName.removePrefix(cleanDisplay)
+
+                subtitleCallback(
+                    SubtitleData(
+                        realName.ifBlank { ctx.getString(R.string.default_subtitles) },
+                        uri.toString(),
+                        SubtitleOrigin.DOWNLOADED_FILE,
+                        name.toSubtitleMimeType(),
+                        emptyMap()
+                    )
+                )
             }
-            VideoDownloadManager.getFolder(ctx, relative, meta.basePath)
-                ?.forEach { file ->
-                    val name = display.removeSuffix(".mp4")
-                    if (file.first != meta.displayName && file.first.startsWith(name)) {
-                        val realName = file.first.removePrefix(name)
-                            .removeSuffix(".vtt")
-                            .removeSuffix(".srt")
-                            .removeSuffix(".txt")
-                            .trim()
-                            .removePrefix("(")
-                            .removeSuffix(")")
-
-                        subtitleCallback(
-                            SubtitleData(
-                                realName.ifBlank { ctx.getString(R.string.default_subtitles) },
-                                file.second.toString(),
-                                SubtitleOrigin.DOWNLOADED_FILE,
-                                name.toSubtitleMimeType(),
-                                emptyMap()
-                            )
-                        )
-                    }
-                }
-        }
 
         return true
     }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/VideoDownloadManager.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/VideoDownloadManager.kt
index 6425ba66..72eb002a 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/VideoDownloadManager.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/VideoDownloadManager.kt
@@ -505,7 +505,7 @@ object VideoDownloadManager {
     ): List<Pair<String, Uri>>? {
         val base = basePathToFile(context, basePath)
         val folder = base?.gotoDirectory(relativePath, false) ?: return null
-        if (folder.isDirectory() != false) return null
+        //if (folder.isDirectory() != false) return null
 
         return folder.listFiles()
             ?.mapNotNull { (it.name() ?: "") to (it.uri() ?: return@mapNotNull null) }