kavin/LibreTube
1
0
Fork 0
mirror of https://github.com/libre-tube/LibreTube.git synced 2025-04-28 16:00:31 +05:30
Code Issues Projects Releases Wiki Activity

fixes

Browse Source
This commit is contained in:
Bnyro 2022-06-05 18:32:32 +02:00
parent c94e3b4868
commit 43fe899f2f
1 changed files with 32 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
app/src/main/java/com/github/libretube/DownloadService.kt
View File

@ -7,6 +7,7 @@ import android.app.PendingIntent
import android.app.Service import android.app.Service
import android.content.BroadcastReceiver import android.content.BroadcastReceiver
import android.content.Context import android.content.Context
import android.content.Context.DOWNLOAD_SERVICE
import android.content.Intent import android.content.Intent
import android.content.IntentFilter import android.content.IntentFilter
import android.net.Uri import android.net.Uri
@ -17,6 +18,7 @@ import android.os.IBinder
import android.util.Log import android.util.Log
import androidx.core.app.NotificationCompat import androidx.core.app.NotificationCompat
import androidx.core.app.NotificationManagerCompat import androidx.core.app.NotificationManagerCompat
import androidx.core.app.ServiceCompat.stopForeground
import com.arthenica.ffmpegkit.FFmpegKit import com.arthenica.ffmpegkit.FFmpegKit
import java.io.File import java.io.File
@ -75,19 +77,13 @@ class DownloadService : Service() {
onDownloadComplete, onDownloadComplete,
IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE) IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE)
) )
downloadId = downloadManagerRequest("Video", "Downloading", videoUrl, videoDir)
if (videoUrl != "") { if (videoUrl != "") {
downloadId = 0L downloadId = downloadManagerRequest("Video", "Downloading", videoUrl, videoDir)
} else if (audioUrl != "") {
downloadId = downloadManagerRequest("Audio", "Downloading", audioUrl, audioDir)
} }
} catch (e: IllegalArgumentException) { } catch (e: IllegalArgumentException) {
Log.e(TAG, "download error $e") Log.e(TAG, "download error $e")
try {
downloadId = 0L
downloadManagerRequest("Audio", "Downloading", audioUrl, audioDir)
} catch (e: Exception) {
Log.e(TAG, "audio download error $e")
stopService(Intent(this, DownloadService::class.java))
}
} }
} }
@ -96,28 +92,32 @@ class DownloadService : Service() {
// Fetching the download id received with the broadcast // Fetching the download id received with the broadcast
val id = intent.getLongExtra(DownloadManager.EXTRA_DOWNLOAD_ID, -1) val id = intent.getLongExtra(DownloadManager.EXTRA_DOWNLOAD_ID, -1)
// Checking if the received broadcast is for our enqueued download by matching download id // Checking if the received broadcast is for our enqueued download by matching download id
if (downloadId == id) { if (downloadId == id && videoUrl != "" && audioUrl != "") {
downloadId = 0L
try {
downloadManagerRequest("Audio", "Downloading", audioUrl, audioDir) downloadManagerRequest("Audio", "Downloading", audioUrl, audioDir)
} catch (e: Exception) { } else {
} // create LibreTube folder in Downloads
} else if (downloadId == 0L) { val libreTubeDir = File(
val libreTube = File( Environment.getExternalStoragePublicDirectory(DIRECTORY_DOWNLOADS),
Environment.getExternalStoragePublicDirectory(DIRECTORY_DOWNLOADS), "LibreTube" "LibreTube"
) )
if (!libreTube.exists()) { if (!libreTubeDir.exists()) {
libreTube.mkdirs() libreTubeDir.mkdirs()
Log.e(TAG, "libreTube Directory make") Log.e(TAG, "libreTube Directory make")
} else { } else {
Log.e(TAG, "libreTube Directory already have") Log.e(TAG, "libreTube Directory already have")
} }
muxDownloadedMedia(libreTube) muxDownloadedMedia(libreTubeDir)
onDestroy()
} }
} }
} }
private fun downloadManagerRequest(title: String, descriptionText: String, url: String, fileDir: File): Long { private fun downloadManagerRequest(
title: String,
descriptionText: String,
url: String,
fileDir: File
): Long {
val request: DownloadManager.Request = val request: DownloadManager.Request =
DownloadManager.Request(Uri.parse(url)) DownloadManager.Request(Uri.parse(url))
.setTitle(title) // Title of the Download Notification .setTitle(title) // Title of the Download Notification
@ -131,7 +131,12 @@ class DownloadService : Service() {
return downloadManager.enqueue(request) return downloadManager.enqueue(request)
} }
private fun createNotificationChannel(id: String, name: String, descriptionText: String, importance: Int): String { private fun createNotificationChannel(
id: String,
name: String,
descriptionText: String,
importance: Int
): String {
// Create the NotificationChannel, but only on API 26+ because // Create the NotificationChannel, but only on API 26+ because
// the NotificationChannel class is new and not in the support library // the NotificationChannel class is new and not in the support library
return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
@ -180,7 +185,10 @@ class DownloadService : Service() {
.setContentTitle(resources.getString(R.string.downloadfailed)) .setContentTitle(resources.getString(R.string.downloadfailed))
.setContentText("failure") .setContentText("failure")
.setPriority(NotificationCompat.PRIORITY_HIGH) .setPriority(NotificationCompat.PRIORITY_HIGH)
createNotificationChannel("failed", "failed", "Download Failed", NotificationManager.IMPORTANCE_DEFAULT) createNotificationChannel(
"failed", "failed", "Download Failed",
NotificationManager.IMPORTANCE_DEFAULT
)
with(NotificationManagerCompat.from(this@DownloadService)) { with(NotificationManagerCompat.from(this@DownloadService)) {
// notificationId is a unique int for each notification that you must define // notificationId is a unique int for each notification that you must define
notify(69, builder.build()) notify(69, builder.build())