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

Validate cutting timestamps from text inputs

Browse source
This commit is contained in:
Max Jakobitsch 2025-03-01 19:25:04 +01:00
parent 0eabeb0556
commit 9731739e5e
1 changed files with 59 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

102
app/src/main/java/com/deniscerri/ytdl/ui/downloadcard/CutVideoBottomSheetDialog.kt
View file

@ -91,6 +91,9 @@ class CutVideoBottomSheetDialog(private val _item: DownloadItem? = null, private
private lateinit var suggestedLabel : View private lateinit var suggestedLabel : View
private lateinit var item: DownloadItem private lateinit var item: DownloadItem
/**
* The duration of the video in milliseconds.
*/
private var itemDurationTimestamp = 0L private var itemDurationTimestamp = 0L
private lateinit var selectedCuts: MutableList<String> private lateinit var selectedCuts: MutableList<String>
@ -297,39 +300,6 @@ class CutVideoBottomSheetDialog(private val _item: DownloadItem? = null, private
} }
private fun setStartTimestamp(
millis: Long,
updateTextInput: Boolean = true,
updateSlider: Boolean = true
) {
startTimestamp = millis
if (updateSlider) rangeSlider.setValues(millis.toFloat(), endTimestamp.toFloat())
if (updateTextInput) {
startTextInput.setTextAndRecalculateWidth(millis.toStringTimeStamp(forceMillis = true))
}
okBtn.isEnabled = startTimestamp != 0L || endTimestamp != itemDurationTimestamp
}
private fun setEndTimestamp(
millis: Long,
updateTextInput: Boolean = true,
updateSlider: Boolean = true
) {
endTimestamp = millis
if (updateSlider) rangeSlider.setValues(startTimestamp.toFloat(), millis.toFloat())
if (updateTextInput) {
endTextInput.setTextAndRecalculateWidth(millis.toStringTimeStamp(forceMillis = true))
}
okBtn.isEnabled = startTimestamp != 0L || endTimestamp != itemDurationTimestamp
}
private fun setCutTimestamps(startTimestamp: Long, endTimestamp: Long) {
setStartTimestamp(startTimestamp)
setEndTimestamp(endTimestamp)
}
private fun resetCutTimestamps() = setCutTimestamps(0L, itemDurationTimestamp)
@SuppressLint("SetTextI18n", "ClickableViewAccessibility") @SuppressLint("SetTextI18n", "ClickableViewAccessibility")
private fun initCutSection() { private fun initCutSection() {
rangeSlider.valueFrom = 0F rangeSlider.valueFrom = 0F
@ -456,26 +426,72 @@ class CutVideoBottomSheetDialog(private val _item: DownloadItem? = null, private
populateSuggestedChapters() populateSuggestedChapters()
} }
private fun setStartTimestamp(
millis: Long,
updateTextInput: Boolean = true,
updateSlider: Boolean = true
) {
startTimestamp = millis
if (updateSlider) rangeSlider.setValues(millis.toFloat(), endTimestamp.toFloat())
if (updateTextInput) {
startTextInput.setTextAndRecalculateWidth(millis.toStringTimeStamp(forceMillis = true))
}
okBtn.isEnabled = startTimestamp != 0L || endTimestamp != itemDurationTimestamp
}
private fun setEndTimestamp(
millis: Long,
updateTextInput: Boolean = true,
updateSlider: Boolean = true
) {
endTimestamp = millis
if (updateSlider) rangeSlider.setValues(startTimestamp.toFloat(), millis.toFloat())
if (updateTextInput) {
endTextInput.setTextAndRecalculateWidth(millis.toStringTimeStamp(forceMillis = true))
}
okBtn.isEnabled = startTimestamp != 0L || endTimestamp != itemDurationTimestamp
}
private fun setCutTimestamps(startTimestamp: Long, endTimestamp: Long) {
setStartTimestamp(startTimestamp)
setEndTimestamp(endTimestamp)
}
private fun resetCutTimestamps() = setCutTimestamps(0L, itemDurationTimestamp)
private fun isValidTimestamp(millis: Long): Boolean =
0L <= millis && millis <= itemDurationTimestamp
private fun isValidStartTimeStamp(millis: Long):Boolean =
isValidTimestamp(millis) && millis < endTimestamp
private fun isValidEndTimeStamp(millis: Long):Boolean =
isValidTimestamp(millis) && millis > startTimestamp
private fun updateFromStartTextInput(text: String) { private fun updateFromStartTextInput(text: String) {
val timestamp = text.tryConvertToTimestamp() val timestamp = text.tryConvertToTimestamp()
if (timestamp == null) { if (timestamp == null || timestamp == startTimestamp || !isValidStartTimeStamp(timestamp)) {
startTextInput.setTextAndRecalculateWidth(startTimestamp.toStringTimeStamp(forceMillis = true)) startTextInput.setTextAndRecalculateWidth(startTimestamp.toStringTimeStamp(forceMillis = true))
} else if (timestamp != startTimestamp) { return
setStartTimestamp(timestamp, updateTextInput = false)
player.seekTo(timestamp)
player.play()
} }
setStartTimestamp(timestamp, updateTextInput = false)
player.seekTo(timestamp)
player.play()
} }
private fun updateFromEndTextInput(text: String) { private fun updateFromEndTextInput(text: String) {
val timestamp = text.tryConvertToTimestamp() val timestamp = text.tryConvertToTimestamp()
if (timestamp == null) { if (timestamp == null || timestamp == endTimestamp || !isValidEndTimeStamp(timestamp)) {
endTextInput.setTextAndRecalculateWidth(endTimestamp.toStringTimeStamp(forceMillis = true)) endTextInput.setTextAndRecalculateWidth(endTimestamp.toStringTimeStamp(forceMillis = true))
} else if (timestamp != endTimestamp) { return
setEndTimestamp(timestamp, updateTextInput = false)
player.seekTo(timestamp-1500)
player.play()
} }
setEndTimestamp(timestamp, updateTextInput = false)
player.seekTo(timestamp - 1500)
player.play()
} }
private fun updateFromSlider() { private fun updateFromSlider() {