Skip to content

fix: Reinstate the filename format setting #128

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dzx-dzx wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix: Reinstate the filename format setting #128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bbc8c19
fix: Reinstate the filename format setting
dzx-dzx Oct 2, 2024
0f2b956
Merge branch 'Myzel394:master' into master
dzx-dzx Aug 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions app/src/main/java/app/myzel394/alibi/helpers/AudioBatchesFolder.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ import app.myzel394.alibi.ui.RECORDER_MEDIA_SELECTED_VALUE
import com.arthenica.ffmpegkit.FFmpegKitConfig
import java.io.File
import java.io.FileDescriptor
import java.time.LocalDateTime

class AudioBatchesFolder(
override val context: Context,
Expand All @@ -38,7 +37,6 @@ class AudioBatchesFolder(
private var mediaFileFileDescriptor: ParcelFileDescriptor? = null

override fun getOutputFileForFFmpeg(
date: LocalDateTime,
extension: String,
fileName: String,
): String {
Expand Down
5 changes: 0 additions & 5 deletions app/src/main/java/app/myzel394/alibi/helpers/BatchesFolder.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,6 @@ abstract class BatchesFolder(
}

abstract fun getOutputFileForFFmpeg(
date: LocalDateTime,
extension: String,
fileName: String,
): String
Expand All @@ -244,19 +243,16 @@ abstract class BatchesFolder(

suspend fun concatenate(
recording: RecordingInformation,
filenameFormat: AppSettings.FilenameFormat,
disableCache: Boolean? = null,
onNextParameterTry: (String) -> Unit = {},
onProgress: (Float?) -> Unit = {},
fileName: String,
): String {
val disableCache = disableCache ?: (type != BatchType.INTERNAL)
val date = recording.getStartDateForFilename(filenameFormat)

if (!disableCache && checkIfOutputAlreadyExists(fileName)
) {
return getOutputFileForFFmpeg(
date = recording.recordingStart,
extension = recording.fileExtension,
fileName = fileName,
)
Expand All @@ -272,7 +268,6 @@ abstract class BatchesFolder(
val filePaths = getBatchesForFFmpeg()

val outputFile = getOutputFileForFFmpeg(
date = date,
extension = recording.fileExtension,
fileName = fileName,
)
Expand Down
2 changes: 0 additions & 2 deletions app/src/main/java/app/myzel394/alibi/helpers/VideoBatchesFolder.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ import app.myzel394.alibi.ui.RECORDER_MEDIA_SELECTED_VALUE
import app.myzel394.alibi.ui.VIDEO_RECORDING_BATCHES_SUBFOLDER_NAME
import com.arthenica.ffmpegkit.FFmpegKitConfig
import java.io.File
import java.time.LocalDateTime

class VideoBatchesFolder(
override val context: Context,
Expand All @@ -40,7 +39,6 @@ class VideoBatchesFolder(
private var customParcelFileDescriptor: ParcelFileDescriptor? = null

override fun getOutputFileForFFmpeg(
date: LocalDateTime,
extension: String,
fileName: String,
): String {
Expand Down
3 changes: 1 addition & 2 deletions ...n/java/app/myzel394/alibi/ui/components/RecorderScreen/organisms/RecorderEventsHandler.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,13 +178,12 @@ fun RecorderEventsHandler(
}

val fileName = batchesFolder.getName(
recording.recordingStart,
recording.getStartDateForFilename(filenameFormat = settings.filenameFormat),
recording.fileExtension,
)

batchesFolder.concatenate(
recording,
filenameFormat = settings.filenameFormat,
fileName = fileName,
onProgress = { percentage ->
processingProgress = percentage
Expand Down