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

fixed edge cases

Browse source
This commit is contained in:
deniscerri 2023-03-26 17:22:43 +02:00
parent 55e878467c
commit 1f70a98d14
No known key found for this signature in database
GPG key ID: 95C43D517D830350
3 changed files with 34 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
app/src/main/java/com/deniscerri/ytdlnis/ui/downloadcard/DownloadAudioFragment.kt
View file

@ -192,7 +192,13 @@ class DownloadAudioFragment(private var resultItem: ResultItem, private var curr
} }
val splitByChapters = view.findViewById<Chip>(R.id.split_by_chapters) 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 { splitByChapters.setOnClickListener {
downloadItem.audioPreferences.splitByChapters = splitByChapters.isChecked downloadItem.audioPreferences.splitByChapters = splitByChapters.isChecked
} }
@ -246,12 +252,18 @@ class DownloadAudioFragment(private var resultItem: ResultItem, private var curr
override fun onCancelCut() { override fun onCancelCut() {
downloadItem.downloadSections = "" downloadItem.downloadSections = ""
cut.text = "" cut.text = ""
splitByChapters.isEnabled = true
splitByChapters.isChecked = downloadItem.audioPreferences.splitByChapters
} }
override fun onChangeCut(from: String, to: String) { override fun onChangeCut(from: String, to: String) {
val value = "${from}-${to}" val value = "${from}-${to}"
downloadItem.downloadSections = value downloadItem.downloadSections = value
cut.text = value cut.text = value
splitByChapters.isEnabled = false
splitByChapters.isChecked = false
} }
} }
cut.setOnClickListener { cut.setOnClickListener {

20
app/src/main/java/com/deniscerri/ytdlnis/ui/downloadcard/DownloadVideoFragment.kt
View file

@ -199,7 +199,12 @@ class DownloadVideoFragment(private val resultItem: ResultItem, private var curr
val splitByChapters = view.findViewById<Chip>(R.id.split_by_chapters) 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 { splitByChapters.setOnClickListener {
if (splitByChapters.isChecked){ if (splitByChapters.isChecked){
addChapters.isEnabled = false addChapters.isEnabled = false
@ -266,12 +271,25 @@ class DownloadVideoFragment(private val resultItem: ResultItem, private var curr
override fun onCancelCut() { override fun onCancelCut() {
downloadItem.downloadSections = "" downloadItem.downloadSections = ""
cut.text = "" 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) { override fun onChangeCut(from: String, to: String) {
val value = "${from}-${to}" val value = "${from}-${to}"
downloadItem.downloadSections = value downloadItem.downloadSections = value
cut.text = value cut.text = value
splitByChapters.isEnabled = false
splitByChapters.isChecked = false
addChapters.isEnabled = true
} }
} }
cut.setOnClickListener { cut.setOnClickListener {

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

@ -165,7 +165,7 @@ class DownloadWorker(
request.addOption("--parse-metadata", "%(album,title)s:%(meta_album)s") 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("--split-chapters")
request.addOption("-P", tempFileDir.absolutePath) request.addOption("-P", tempFileDir.absolutePath)
}else{ }else{
@ -204,7 +204,7 @@ class DownloadWorker(
} }
} }
if (downloadItem.videoPreferences.splitByChapters){ if (downloadItem.videoPreferences.splitByChapters && downloadItem.downloadSections.isBlank()){
request.addOption("--split-chapters") request.addOption("--split-chapters")
request.addOption("-P", tempFileDir.absolutePath) request.addOption("-P", tempFileDir.absolutePath)
}else{ }else{