danvics/ytdlnis
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

made item update data when its a quick download item

Browse source
This commit is contained in:
deniscerri 2023-04-25 20:21:44 +02:00
parent ed0a01f5fc
commit a5945211b3
No known key found for this signature in database
GPG key ID: 95C43D517D830350
3 changed files with 28 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/com/deniscerri/ytdlnis/adapter/ActiveDownloadAdapter.kt
View file

@ -166,7 +166,7 @@ class ActiveDownloadAdapter(onItemClickListener: OnItemClickListener, activity:
} }
override fun areContentsTheSame(oldItem: DownloadItem, newItem: DownloadItem): Boolean { override fun areContentsTheSame(oldItem: DownloadItem, newItem: DownloadItem): Boolean {
return oldItem.id == newItem.id return oldItem.id == newItem.id && oldItem.title == newItem.title && oldItem.author == newItem.author && oldItem.thumb == newItem.thumb
} }
} }
} }

2
app/src/main/java/com/deniscerri/ytdlnis/database/models/DownloadItem.kt
View file

@ -12,7 +12,7 @@ data class DownloadItem(
val url: String, val url: String,
var title: String, var title: String,
var author: String, var author: String,
val thumb: String, var thumb: String,
val duration: String, val duration: String,
var type: DownloadViewModel.Type, var type: DownloadViewModel.Type,
var format: Format, var format: Format,

36
app/src/main/java/com/deniscerri/ytdlnis/work/DownloadWorker.kt
View file

@ -21,7 +21,9 @@ import com.deniscerri.ytdlnis.util.FileUtil
import com.deniscerri.ytdlnis.util.NotificationUtil import com.deniscerri.ytdlnis.util.NotificationUtil
import com.yausername.youtubedl_android.YoutubeDL import com.yausername.youtubedl_android.YoutubeDL
import com.yausername.youtubedl_android.YoutubeDLRequest import com.yausername.youtubedl_android.YoutubeDLRequest
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.runBlocking import kotlinx.coroutines.runBlocking
import kotlinx.coroutines.withContext
import java.io.File import java.io.File
@ -260,17 +262,31 @@ class DownloadWorker(
val logFolder = File(context.filesDir.absolutePath + "/logs") val logFolder = File(context.filesDir.absolutePath + "/logs")
val logFile = fileUtil.getLogFile(context, downloadItem) val logFile = fileUtil.getLogFile(context, downloadItem)
runCatching { if (logDownloads){
if (logDownloads){ logFolder.mkdirs()
logFolder.mkdirs() logFile.createNewFile()
logFile.createNewFile() logFile.writeText("Downloading:\n" +
logFile.writeText("Downloading:\n" + "Title: ${downloadItem.title}\n" +
"Title: ${downloadItem.title}\n" + "URL: ${downloadItem.url}\n" +
"URL: ${downloadItem.url}\n" + "Type: ${downloadItem.type}\n" +
"Type: ${downloadItem.type}\n" + "Format: ${downloadItem.format}\n\n")
"Format: ${downloadItem.format}\n\n") }
}
//update item if its incomplete
if (downloadItem.title.isEmpty() || downloadItem.author.isEmpty() || downloadItem.thumb.isEmpty()){
runCatching {
setProgressAsync(workDataOf("progress" to 0, "output" to "Updating Download Item Data", "id" to downloadItem.id, "log" to logDownloads))
val info = YoutubeDL.getInfo(downloadItem.url)
if (downloadItem.title.isEmpty()) downloadItem.title = info.title.toString()
if (downloadItem.author.isEmpty()) downloadItem.author = info.uploader.toString()
if (downloadItem.thumb.isEmpty()) downloadItem.thumb = info.thumbnail.toString()
runBlocking {
dao.update(downloadItem)
}
}
}
runCatching {
YoutubeDL.getInstance().execute(request, downloadItem.id.toString()){ progress, _, line -> YoutubeDL.getInstance().execute(request, downloadItem.id.toString()){ progress, _, line ->
setProgressAsync(workDataOf("progress" to progress.toInt(), "output" to line.chunked(5000).first().toString(), "id" to downloadItem.id, "log" to logDownloads)) setProgressAsync(workDataOf("progress" to progress.toInt(), "output" to line.chunked(5000).first().toString(), "id" to downloadItem.id, "log" to logDownloads))
val title: String = downloadItem.title val title: String = downloadItem.title