1.8.1 fr this time

CHANGELOG.md

@@ -14,7 +14,8 @@
 - Made the app remember the last used scheduled time so it can suggest you that time for the next download
 - #618, made all preferences with a description show their values
 - Fixed bug that prevented app from loading all urls from text file
-- Added ability to write info json when downloading so when you resume an
+- Added ability to stop an observed source but not delete it
+- 
 
 ## Custom yt-dlp source
 

app/src/main/java/com/deniscerri/ytdl/database/viewmodel/ObserveSourcesViewModel.kt

@@ -12,8 +12,6 @@ import androidx.work.Data
 import androidx.work.ExistingWorkPolicy
 import androidx.work.NetworkType
 import androidx.work.OneTimeWorkRequestBuilder
-import androidx.work.PeriodicWorkRequest
-import androidx.work.PeriodicWorkRequestBuilder
 import androidx.work.WorkManager
 import com.deniscerri.ytdl.database.DBManager
 import com.deniscerri.ytdl.database.models.observeSources.ObserveSourcesItem
@@ -50,7 +48,7 @@ class ObserveSourcesViewModel(private val application: Application) : AndroidVie
         return repository.getByID(id)
     }
 
-    suspend fun insert(item: ObserveSourcesItem) : Long {
+    suspend fun insertUpdate(item: ObserveSourcesItem) : Long {
         if (item.id > 0) {
             repository.update(item)
             observeTask(item)
@@ -63,6 +61,12 @@ class ObserveSourcesViewModel(private val application: Application) : AndroidVie
         return id
     }
 
+    suspend fun stopObserving(item: ObserveSourcesItem) {
+        item.status = ObserveSourcesRepository.SourceStatus.STOPPED
+        repository.update(item)
+        cancelObservationTaskByID(item.id)
+    }
+
     fun delete(item: ObserveSourcesItem) = viewModelScope.launch(Dispatchers.IO) {
         runCatching { cancelObservationTaskByID(item.id) }
         repository.delete(item)
@@ -81,7 +85,7 @@ class ObserveSourcesViewModel(private val application: Application) : AndroidVie
     }
 
     private fun cancelObservationTaskByID(id: Long){
-        workManager.cancelAllWorkByTag(id.toString())
+        workManager.cancelAllWorkByTag("observation_$id")
     }
 
 
@@ -136,7 +140,7 @@ class ObserveSourcesViewModel(private val application: Application) : AndroidVie
 
             val workRequest = OneTimeWorkRequestBuilder<ObserveSourceWorker>()
                 .addTag("observeSources")
-                .addTag(it.id.toString())
+                .addTag("observation_${it.id}")
                 .setConstraints(workConstraints.build())
                 .setInitialDelay(timeInMillis - System.currentTimeMillis(), TimeUnit.MILLISECONDS)
                 .setInputData(Data.Builder().putLong("id", it.id).build())

app/src/main/java/com/deniscerri/ytdl/ui/adapter/ObserveSourcesAdapter.kt

@@ -17,6 +17,7 @@ import com.deniscerri.ytdl.database.models.observeSources.ObserveSourcesItem
 import com.deniscerri.ytdl.database.repository.ObserveSourcesRepository
 import com.deniscerri.ytdl.util.Extensions.calculateNextTimeForObserving
 import com.deniscerri.ytdl.util.Extensions.popup
+import com.google.android.material.button.MaterialButton
 import com.google.android.material.card.MaterialCardView
 import com.google.android.material.chip.Chip
 import com.google.android.material.floatingactionbutton.FloatingActionButton
@@ -93,29 +94,35 @@ class ObserveSourcesAdapter(onItemClickListener: OnItemClickListener, activity:
         progressBar.isVisible = false
 
         // BUTTON ----------------------------------
-        val btn = card.findViewById<FloatingActionButton>(R.id.search)
-        btn.isEnabled = true
+        val searchBtn = card.findViewById<MaterialButton>(R.id.search)
+        val pauseBtn = card.findViewById<MaterialButton>(R.id.pause_resume)
+        searchBtn.isEnabled = true
+        pauseBtn.isEnabled = true
         if (item.status == ObserveSourcesRepository.SourceStatus.STOPPED){
             info.isVisible = false
-            checkMissing.isVisible = false
+            searchBtn.isVisible = false
 
-            btn.setImageResource(R.drawable.exomedia_ic_play_arrow_white)
-            btn.setOnClickListener {
-                btn.isEnabled = false
-                progressBar.isVisible = true
-                progressBar.animate()
+            pauseBtn.setIconResource(R.drawable.exomedia_ic_play_arrow_white)
+            pauseBtn.setOnClickListener {
+                pauseBtn.isEnabled = false
                 onItemClickListener.onItemStart(item, position)
             }
         }else{
             info.isVisible = true
+            searchBtn.isVisible = true
 
-            btn.setImageResource(R.drawable.ic_search)
-            btn.setOnClickListener {
-                btn.isEnabled = false
+            searchBtn.setOnClickListener {
+                searchBtn.isEnabled = false
                 progressBar.isVisible = true
                 progressBar.animate()
                 onItemClickListener.onItemSearch(item)
             }
+
+            pauseBtn.setIconResource(R.drawable.exomedia_ic_pause_white)
+            pauseBtn.setOnClickListener {
+                pauseBtn.isEnabled = false
+                onItemClickListener.onItemPaused(item, position)
+            }
         }
 
 
@@ -132,6 +139,7 @@ class ObserveSourcesAdapter(onItemClickListener: OnItemClickListener, activity:
 
         fun onItemSearch(item: ObserveSourcesItem)
         fun onItemStart(item: ObserveSourcesItem, position: Int)
+        fun onItemPaused(item: ObserveSourcesItem, position: Int)
         fun onItemClick(item: ObserveSourcesItem)
         fun onDelete(item: ObserveSourcesItem)
     }

app/src/main/java/com/deniscerri/ytdl/ui/downloadcard/ObserveSourcesBottomSheetDialog.kt

@@ -535,7 +535,7 @@ class ObserveSourcesBottomSheetDialog : BottomSheetDialogFragment() {
                 )
 
                 withContext(Dispatchers.IO){
-                    observeSourcesViewModel.insert(observeItem)
+                    observeSourcesViewModel.insertUpdate(observeItem)
                 }
                 dismiss()
             }

app/src/main/java/com/deniscerri/ytdl/ui/more/ObserveSourcesFragment.kt

@@ -2,7 +2,6 @@ package com.deniscerri.ytdl.ui.more
 
 import android.annotation.SuppressLint
 import android.content.DialogInterface
-import android.content.Intent
 import android.content.SharedPreferences
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -153,13 +152,22 @@ class ObserveSourcesFragment : Fragment(), ObserveSourcesAdapter.OnItemClickList
             withContext(Dispatchers.IO){
                 item.status = ObserveSourcesRepository.SourceStatus.ACTIVE
                 item.runCount = 0
-                observeSourcesViewModel.insert(item)
+                observeSourcesViewModel.insertUpdate(item)
             }
             listAdapter.notifyItemChanged(position)
         }
 
     }
 
+    override fun onItemPaused(item: ObserveSourcesItem, position: Int) {
+        lifecycleScope.launch {
+            withContext(Dispatchers.IO){
+                observeSourcesViewModel.stopObserving(item)
+            }
+            listAdapter.notifyItemChanged(position)
+        }
+    }
+
     override fun onItemClick(item: ObserveSourcesItem) {
         showDialog(item.url)
     }

app/src/main/java/com/deniscerri/ytdl/ui/more/settings/MainSettingsFragment.kt

@@ -5,20 +5,16 @@ import android.app.Activity
 import android.content.DialogInterface
 import android.content.Intent
 import android.content.SharedPreferences
-import android.net.Uri
 import android.os.Build
 import android.os.Bundle
 import android.os.Environment
 import android.util.LayoutDirection
 import android.util.Log
 import android.view.Gravity
 import android.view.View
-import android.view.inputmethod.InputMethodManager
-import android.widget.EditText
 import android.widget.TextView
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AlertDialog
-import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.app.AppCompatDelegate
 import androidx.core.content.edit
 import androidx.core.os.LocaleListCompat
@@ -31,7 +27,6 @@ import androidx.preference.PreferenceFragmentCompat
 import androidx.preference.PreferenceManager
 import androidx.work.WorkInfo
 import androidx.work.WorkManager
-import com.afollestad.materialdialogs.utils.MDUtil.getStringArray
 import com.deniscerri.ytdl.BuildConfig
 import com.deniscerri.ytdl.MainActivity
 import com.deniscerri.ytdl.R
@@ -52,17 +47,13 @@ import com.deniscerri.ytdl.database.viewmodel.ResultViewModel
 import com.deniscerri.ytdl.util.FileUtil
 import com.deniscerri.ytdl.util.UiUtil
 import com.deniscerri.ytdl.util.UpdateUtil
-import com.google.android.material.chip.Chip
-import com.google.android.material.chip.ChipGroup
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.snackbar.Snackbar
-import com.google.android.material.textfield.TextInputLayout
 import com.google.gson.Gson
 import com.google.gson.GsonBuilder
 import com.google.gson.JsonArray
 import com.google.gson.JsonObject
 import com.google.gson.JsonParser
-import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
@@ -754,7 +745,7 @@ class MainSettingsFragment : PreferenceFragmentCompat() {
             withContext(Dispatchers.IO){
                 if (resetData) observeSourcesViewModel.deleteAll()
                 data.observeSources!!.forEach {
-                    observeSourcesViewModel.insert(it)
+                    observeSourcesViewModel.insertUpdate(it)
                 }
             }
         }

app/src/main/java/com/deniscerri/ytdl/ui/more/settings/UpdateSettingsFragment.kt

@@ -134,7 +134,7 @@ class UpdateSettingsFragment : BaseSettingsFragment() {
 
     private fun setYTDLPVersion() {
         lifecycleScope.launch {
-            ytdlVersion!!.summary = ""
+            ytdlVersion!!.summary = getString(R.string.loading)
             val version = withContext(Dispatchers.IO){
                 ytdlpUtil.getVersion()
             }

app/src/main/java/com/deniscerri/ytdl/util/extractors/YTDLPUtil.kt

@@ -165,7 +165,7 @@ class YTDLPUtil(private val context: Context) {
             if (url.isYoutubeURL()) {
                 authorTags.addAll(0, listOf("artists", "artist"))
             }
-            var author = jsonObject.getStringByAny(*authorTags.map { it }.toTypedArray())
+            var author = jsonObject.getStringByAny(*authorTags.map { it }.toTypedArray()).removeSuffix(" - Topic")
             var duration = jsonObject.getIntByAny("duration").toString()
             if (duration != "-1"){
                 duration = jsonObject.getInt("duration").toStringDuration(Locale.US)
@@ -447,8 +447,9 @@ class YTDLPUtil(private val context: Context) {
                 }
 
                 val formatProper = Gson().fromJson(format.toString(), Format::class.java)
-                if (formatProper.format_note == null) continue
+                if (formatProper.format_note == null) formatProper.format_note = ""
 
+                val resolution = format.getString("resolution")
                 if (format.has("format_note")){
                     if (!formatProper!!.format_note.contains("audio only", true)) {
                         formatProper.format_note = format.getString("format_note")
@@ -457,12 +458,18 @@ class YTDLPUtil(private val context: Context) {
                             formatProper.format_note = format.getString("format_note").uppercase().removeSuffix("AUDIO") + " AUDIO"
                         }
                     }
+
+                    if (!resolution.isNullOrBlank() && resolution != "audio only") {
+                        formatProper.format_note = "${formatProper.format_note} (${resolution})"
+                    }
                 }
-                if (formatProper.format_note == "storyboard") continue
+
+                if (formatProper.format_note.contains("storyboard", ignoreCase = true)) continue
+
                 formatProper.container = format.getString("ext")
                 if (formatProper.tbr == "None") formatProper.tbr = ""
                 if (!formatProper.tbr.isNullOrBlank()){
-                    formatProper.tbr = formatProper.tbr + "k"
+                    formatProper.tbr += "k"
                 }
 
                 if(formatProper.vcodec.isNullOrEmpty() || formatProper.vcodec == "null"){
@@ -1173,9 +1180,13 @@ class YTDLPUtil(private val context: Context) {
         }
 
         val lang = Locale.getDefault().language
+        val langTag = Locale.getDefault().toLanguageTag()
         if (context.getStringArray(R.array.subtitle_langs).contains(lang)) {
             extractorArgs.add("lang=$lang")
         }
+        if (context.getStringArray(R.array.subtitle_langs).contains(langTag)) {
+            extractorArgs.add("lang=$langTag")
+        }
         if (poToken.isNotBlank()) {
             extractorArgs.add("po_token=web+$poToken")
         }

app/src/main/res/drawable/baseline_stop_24.xml

@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#FFFFFF" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+
+    <path android:fillColor="@android:color/white" android:pathData="M6,6h12v12H6z"/>
+
+</vector>