From f26f440df488fc96cf1e0900a648704da5219274 Mon Sep 17 00:00:00 2001
From: deniscerri <64997243+deniscerri@users.noreply.github.com>
Date: Thu, 8 Jun 2023 22:09:52 +0200
Subject: [PATCH] stuff

---
 .../deniscerri/ytdlnis/database/dao/DownloadDao.kt  |  2 +-
 .../database/viewmodel/CommandTemplateViewModel.kt  | 13 +++++++------
 .../com/deniscerri/ytdlnis/work/DownloadWorker.kt   |  2 +-
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/com/deniscerri/ytdlnis/database/dao/DownloadDao.kt b/app/src/main/java/com/deniscerri/ytdlnis/database/dao/DownloadDao.kt
index fb00f6ca..4dc8f4fa 100644
--- a/app/src/main/java/com/deniscerri/ytdlnis/database/dao/DownloadDao.kt
+++ b/app/src/main/java/com/deniscerri/ytdlnis/database/dao/DownloadDao.kt
@@ -76,7 +76,7 @@ interface DownloadDao {
     @Query("DELETE FROM downloads WHERE status='Processing' AND id=:id")
     suspend fun deleteSingleProcessing(id: Long)
 
-    @Update(onConflict = OnConflictStrategy.REPLACE)
+    @Upsert
     suspend fun update(item: DownloadItem)
 
     @Query("SELECT * FROM downloads ORDER BY id DESC LIMIT 1")
diff --git a/app/src/main/java/com/deniscerri/ytdlnis/database/viewmodel/CommandTemplateViewModel.kt b/app/src/main/java/com/deniscerri/ytdlnis/database/viewmodel/CommandTemplateViewModel.kt
index 1206314e..f5b2f628 100644
--- a/app/src/main/java/com/deniscerri/ytdlnis/database/viewmodel/CommandTemplateViewModel.kt
+++ b/app/src/main/java/com/deniscerri/ytdlnis/database/viewmodel/CommandTemplateViewModel.kt
@@ -76,14 +76,15 @@ class CommandTemplateViewModel(private val application: Application) : AndroidVi
     }
 
     suspend fun importFromClipboard() : Int {
-        val allTemplates = repository.getAll()
-        val allShortcuts = repository.getAllShortCuts()
         var count = 0
-        val clipboard = withContext(Dispatchers.Main){
-            application.getSystemService(CLIPBOARD_SERVICE) as ClipboardManager
-        }
-        val clip = clipboard.primaryClip!!.getItemAt(0).text.toString()
         try{
+            val allTemplates = repository.getAll()
+            val allShortcuts = repository.getAllShortCuts()
+            val clipboard = withContext(Dispatchers.Main){
+                application.getSystemService(CLIPBOARD_SERVICE) as ClipboardManager
+            }
+            val clip = clipboard.primaryClip!!.getItemAt(0).text.toString()
+
             jsonFormat.decodeFromString<CommandTemplateExport>(clip).run {
                 templates.filterNot {t ->
                     allTemplates.find { it.content == t.content} != null
diff --git a/app/src/main/java/com/deniscerri/ytdlnis/work/DownloadWorker.kt b/app/src/main/java/com/deniscerri/ytdlnis/work/DownloadWorker.kt
index 32606fa7..dbe95665 100644
--- a/app/src/main/java/com/deniscerri/ytdlnis/work/DownloadWorker.kt
+++ b/app/src/main/java/com/deniscerri/ytdlnis/work/DownloadWorker.kt
@@ -207,7 +207,7 @@ class DownloadWorker(
                     request.addOption("--parse-metadata", "%(album,title)s:%(meta_album)s")
                 }
 
-                request.addOption("--audio-quality", sharedPreferences.getInt("audio_quality", 5))
+                request.addOption("--audio-quality", sharedPreferences.getInt("audio_quality", 0))
 
                 if (downloadItem.audioPreferences.splitByChapters && downloadItem.downloadSections.isBlank()){
                     request.addOption("--split-chapters")