From 1f70a98d141b8b27ba736381b4100694e00e3275 Mon Sep 17 00:00:00 2001
From: deniscerri <64997243+deniscerri@users.noreply.github.com>
Date: Sun, 26 Mar 2023 17:22:43 +0200
Subject: [PATCH] fixed edge cases

---
 .../ui/downloadcard/DownloadAudioFragment.kt  | 14 ++++++++++++-
 .../ui/downloadcard/DownloadVideoFragment.kt  | 20 ++++++++++++++++++-
 .../deniscerri/ytdlnis/work/DownloadWorker.kt |  4 ++--
 3 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/deniscerri/ytdlnis/ui/downloadcard/DownloadAudioFragment.kt b/app/src/main/java/com/deniscerri/ytdlnis/ui/downloadcard/DownloadAudioFragment.kt
index 8d197bbe..e222ecf8 100644
--- a/app/src/main/java/com/deniscerri/ytdlnis/ui/downloadcard/DownloadAudioFragment.kt
+++ b/app/src/main/java/com/deniscerri/ytdlnis/ui/downloadcard/DownloadAudioFragment.kt
@@ -192,7 +192,13 @@ class DownloadAudioFragment(private var resultItem: ResultItem, private var curr
                 }
 
                 val splitByChapters = view.findViewById<Chip>(R.id.split_by_chapters)
-                splitByChapters!!.isChecked = downloadItem.audioPreferences.splitByChapters
+                if (downloadItem.downloadSections.isNotBlank()){
+                    splitByChapters.isEnabled = false
+                    splitByChapters.isChecked = false
+                }else{
+                    splitByChapters!!.isChecked = downloadItem.audioPreferences.splitByChapters
+                }
+
                 splitByChapters.setOnClickListener {
                     downloadItem.audioPreferences.splitByChapters = splitByChapters.isChecked
                 }
@@ -246,12 +252,18 @@ class DownloadAudioFragment(private var resultItem: ResultItem, private var curr
                     override fun onCancelCut() {
                         downloadItem.downloadSections = ""
                         cut.text = ""
+
+                        splitByChapters.isEnabled = true
+                        splitByChapters.isChecked = downloadItem.audioPreferences.splitByChapters
                     }
 
                     override fun onChangeCut(from: String, to: String) {
                         val value = "${from}-${to}"
                         downloadItem.downloadSections = value
                         cut.text = value
+
+                        splitByChapters.isEnabled = false
+                        splitByChapters.isChecked = false
                     }
                 }
                 cut.setOnClickListener {
diff --git a/app/src/main/java/com/deniscerri/ytdlnis/ui/downloadcard/DownloadVideoFragment.kt b/app/src/main/java/com/deniscerri/ytdlnis/ui/downloadcard/DownloadVideoFragment.kt
index 10db64d4..112322c3 100644
--- a/app/src/main/java/com/deniscerri/ytdlnis/ui/downloadcard/DownloadVideoFragment.kt
+++ b/app/src/main/java/com/deniscerri/ytdlnis/ui/downloadcard/DownloadVideoFragment.kt
@@ -199,7 +199,12 @@ class DownloadVideoFragment(private val resultItem: ResultItem, private var curr
 
 
                 val splitByChapters = view.findViewById<Chip>(R.id.split_by_chapters)
-                splitByChapters!!.isChecked = downloadItem.audioPreferences.splitByChapters
+                if(downloadItem.downloadSections.isNotBlank()){
+                    splitByChapters.isEnabled = false
+                    splitByChapters.isChecked = false
+                }else{
+                    splitByChapters!!.isChecked = downloadItem.audioPreferences.splitByChapters
+                }
                 splitByChapters.setOnClickListener {
                     if (splitByChapters.isChecked){
                         addChapters.isEnabled = false
@@ -266,12 +271,25 @@ class DownloadVideoFragment(private val resultItem: ResultItem, private var curr
                     override fun onCancelCut() {
                         downloadItem.downloadSections = ""
                         cut.text = ""
+
+                        splitByChapters.isEnabled = true
+                        splitByChapters.isChecked = downloadItem.videoPreferences.splitByChapters
+                        if (splitByChapters.isChecked){
+                            addChapters.isEnabled = false
+                            addChapters.isChecked = false
+                        }else{
+                            addChapters.isEnabled = true
+                        }
                     }
 
                     override fun onChangeCut(from: String, to: String) {
                         val value = "${from}-${to}"
                         downloadItem.downloadSections = value
                         cut.text = value
+
+                        splitByChapters.isEnabled = false
+                        splitByChapters.isChecked = false
+                        addChapters.isEnabled = true
                     }
                 }
                 cut.setOnClickListener {
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 2132b006..d61a7c3e 100644
--- a/app/src/main/java/com/deniscerri/ytdlnis/work/DownloadWorker.kt
+++ b/app/src/main/java/com/deniscerri/ytdlnis/work/DownloadWorker.kt
@@ -165,7 +165,7 @@ class DownloadWorker(
                     request.addOption("--parse-metadata", "%(album,title)s:%(meta_album)s")
                 }
 
-                if (downloadItem.audioPreferences.splitByChapters){
+                if (downloadItem.audioPreferences.splitByChapters && downloadItem.downloadSections.isBlank()){
                     request.addOption("--split-chapters")
                     request.addOption("-P", tempFileDir.absolutePath)
                 }else{
@@ -204,7 +204,7 @@ class DownloadWorker(
                     }
                 }
 
-                if (downloadItem.videoPreferences.splitByChapters){
+                if (downloadItem.videoPreferences.splitByChapters  && downloadItem.downloadSections.isBlank()){
                     request.addOption("--split-chapters")
                     request.addOption("-P", tempFileDir.absolutePath)
                 }else{