fix some issues with downloads

app/src/main/java/com/github/libretube/extensions/CreateDir.kt

@@ -1,7 +0,0 @@
-package com.github.libretube.extensions
-
-import java.io.File
-
-fun File.createDir() = apply {
-    if (!this.exists()) this.mkdirs()
-}

app/src/main/java/com/github/libretube/obj/DownloadedFile.kt

@@ -2,12 +2,10 @@ package com.github.libretube.obj
 
 import android.graphics.Bitmap
 import com.github.libretube.api.obj.Streams
-import com.github.libretube.enums.DownloadType
 
 data class DownloadedFile(
     val name: String,
     val size: Long,
-    val type: DownloadType,
     var metadata: Streams? = null,
     var thumbnail: Bitmap? = null
 )

app/src/main/java/com/github/libretube/services/DownloadService.kt

@@ -63,8 +63,8 @@ class DownloadService : Service() {
     private fun downloadManager() {
         // initialize and create the directories to download into
 
-        val videoDownloadDir = DownloadHelper.getVideoDir(this)
+        val videoDownloadDir = DownloadHelper.getDownloadDir(this, DownloadHelper.VIDEO_DIR)
-        val audioDownloadDir = DownloadHelper.getAudioDir(this)
+        val audioDownloadDir = DownloadHelper.getDownloadDir(this, DownloadHelper.AUDIO_DIR)
 
         // start download
         try {

app/src/main/java/com/github/libretube/ui/activities/OfflinePlayerActivity.kt

@@ -75,21 +75,20 @@ class OfflinePlayerActivity : BaseActivity() {
         )
     }
 
+    private fun File.toUri(): Uri? {
+        return if (this.exists()) Uri.fromFile(this) else null
+    }
+
     private fun playVideo() {
-        val videoDownloadDir = DownloadHelper.getVideoDir(this)
+        val videoUri = File(
-        val videoFile = File(
+            DownloadHelper.getDownloadDir(this, DownloadHelper.VIDEO_DIR),
-            videoDownloadDir,
             fileName
-        )
+        ).toUri()
 
-        val audioDownloadDir = DownloadHelper.getAudioDir(this)
+        val audioUri = File(
-        val audioFile = File(
+            DownloadHelper.getDownloadDir(this, DownloadHelper.AUDIO_DIR),
-            audioDownloadDir,
             fileName
-        )
+        ).toUri()
-
-        val videoUri = if (videoFile.exists()) Uri.fromFile(videoFile) else null
-        val audioUri = if (audioFile.exists()) Uri.fromFile(audioFile) else null
 
         setMediaSource(
             videoUri,

app/src/main/java/com/github/libretube/ui/adapters/DownloadsAdapter.kt

@@ -61,8 +61,8 @@ class DownloadsAdapter(
                     ) { _, index ->
                         when (index) {
                             0 -> {
-                                val audioDir = DownloadHelper.getAudioDir(root.context)
+                                val audioDir = DownloadHelper.getDownloadDir(root.context, DownloadHelper.AUDIO_DIR)
-                                val videoDir = DownloadHelper.getVideoDir(root.context)
+                                val videoDir = DownloadHelper.getDownloadDir(root.context, DownloadHelper.VIDEO_DIR)
 
                                 listOf(audioDir, videoDir).forEach {
                                     val f = File(it, file.name)

app/src/main/java/com/github/libretube/util/DownloadHelper.kt

@@ -2,12 +2,15 @@ package com.github.libretube.util
 
 import android.content.Context
 import android.os.Build
-import com.github.libretube.enums.DownloadType
-import com.github.libretube.extensions.createDir
 import com.github.libretube.obj.DownloadedFile
 import java.io.File
 
 object DownloadHelper {
+    const val VIDEO_DIR = "video"
+    const val AUDIO_DIR = "audio"
+    const val METADATA_DIR = "metadata"
+    const val THUMBNAIL_DIR = "thumbnail"
+
     private fun getOfflineStorageDir(context: Context): File {
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) return context.filesDir
 
@@ -18,65 +21,35 @@ object DownloadHelper {
         }
     }
 
-    fun getVideoDir(context: Context): File {
+    fun getDownloadDir(context: Context, path: String): File {
         return File(
             getOfflineStorageDir(context),
-            "video"
+            path
-        ).createDir()
+        ).apply {
+            if (!this.exists()) this.mkdirs()
+        }
     }
 
-    fun getAudioDir(context: Context): File {
+    private fun File.toDownloadedFile(): DownloadedFile {
-        return File(
+        return DownloadedFile(
-            getOfflineStorageDir(context),
+            name = this.name,
-            "audio"
+            size = this.length()
-        ).createDir()
+        )
-    }
-
-    fun getMetadataDir(context: Context): File {
-        return File(
-            getOfflineStorageDir(context),
-            "metadata"
-        ).createDir()
-    }
-
-    fun getThumbnailDir(context: Context): File {
-        return File(
-            getOfflineStorageDir(context),
-            "thumbnail"
-        ).createDir()
     }
 
     fun getDownloadedFiles(context: Context): MutableList<DownloadedFile> {
-        val videoFiles = getVideoDir(context).listFiles()
+        val videoFiles = getDownloadDir(context, VIDEO_DIR).listFiles().orEmpty()
-        val audioFiles = getAudioDir(context).listFiles()?.toMutableList()
+        val audioFiles = getDownloadDir(context, AUDIO_DIR).listFiles().orEmpty().toMutableList()
 
         val files = mutableListOf<DownloadedFile>()
 
-        videoFiles?.forEach {
+        videoFiles.forEach {
-            var type = DownloadType.VIDEO
+            audioFiles.removeIf { audioFile -> audioFile.name == it.name }
-            audioFiles?.forEach { audioFile ->
+            files.add(it.toDownloadedFile())
-                if (audioFile.name == it.name) {
-                    type = DownloadType.AUDIO_VIDEO
-                    audioFiles.remove(audioFile)
-                }
-            }
-            files.add(
-                DownloadedFile(
-                    name = it.name,
-                    size = it.length(),
-                    type = type
-                )
-            )
         }
 
-        audioFiles?.forEach {
+        audioFiles.forEach {
-            files.add(
+            files.add(it.toDownloadedFile())
-                DownloadedFile(
-                    name = it.name,
-                    size = it.length(),
-                    type = DownloadType.AUDIO
-                )
-            )
         }
 
         return files

app/src/main/java/com/github/libretube/util/ImageHelper.kt

@@ -56,16 +56,11 @@ object ImageHelper {
             .data(url)
             .target { result ->
                 val bitmap = (result as BitmapDrawable).bitmap
-                saveImage(
+                val file = File(
-                    context,
+                    DownloadHelper.getDownloadDir(context, DownloadHelper.THUMBNAIL_DIR),
-                    bitmap,
+                    fileName
-                    Uri.fromFile(
-                        File(
-                            DownloadHelper.getThumbnailDir(context),
-                            fileName
-                        )
-                    )
                 )
+                saveImage(context, bitmap, Uri.fromFile(file))
             }
             .build()
 
@@ -73,15 +68,11 @@ object ImageHelper {
     }
 
     fun getDownloadedImage(context: Context, fileName: String): Bitmap? {
-        return getImage(
+        val file = File(
-            context,
+            DownloadHelper.getDownloadDir(context, DownloadHelper.THUMBNAIL_DIR),
-            Uri.fromFile(
+            fileName
-                File(
-                    DownloadHelper.getThumbnailDir(context),
-                    fileName
-                )
-            )
         )
+        return getImage(context, Uri.fromFile(file))
     }
 
     private fun saveImage(context: Context, bitmapImage: Bitmap, imagePath: Uri) {

app/src/main/java/com/github/libretube/util/MetadataHelper.kt

@@ -11,7 +11,7 @@ class MetadataHelper(
     private val context: Context
 ) {
     private val mapper = ObjectMapper()
-    private val metadataDir = DownloadHelper.getMetadataDir(context)
+    private val metadataDir = DownloadHelper.getDownloadDir(context, DownloadHelper.METADATA_DIR)
 
     fun createMetadata(fileName: String, streams: Streams) {
         val targetFile = File(metadataDir, fileName)