Myzel394/Alibi
1
0
Fork 0
mirror of https://github.com/Myzel394/Alibi.git synced 2025-06-18 23:05:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

refactor: Outsource into getOrCreateNewMediaFile method

Browse Source
This commit is contained in:
Myzel394 2023-12-30 21:04:24 +01:00
parent 329b41b4c8
commit 7c6e44dd69
No known key found for this signature in database
GPG Key ID: 79CC92F37B3E1A2B
2 changed files with 66 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
app/src/main/java/app/myzel394/alibi/helpers/BatchesFolder.kt
View File

@ -1,10 +1,13 @@
package app.myzel394.alibi.helpers
import android.content.ContentUris
import app.myzel394.alibi.ui.MEDIA_RECORDINGS_PREFIX
import android.content.Context
import android.database.Cursor
import android.net.Uri
import android.os.Build
import android.provider.MediaStore
import android.provider.MediaStore.Video.Media
import androidx.documentfile.provider.DocumentFile
import java.io.File
@ -325,6 +328,63 @@ abstract class BatchesFolder(
return File(getInternalFolder(), "$counter.$fileExtension")
}
protected fun getOrCreateMediaFile(
name: String,
mimeType: String,
relativePath: String,
): Uri {
// Check if already exists
var uri: Uri? = null
context.contentResolver.query(
mediaContentUri,
arrayOf(MediaStore.MediaColumns._ID, MediaStore.MediaColumns.DISPLAY_NAME),
"${MediaStore.MediaColumns.DISPLAY_NAME} = '$name'",
null,
null,
)!!.use { cursor ->
if (cursor.moveToFirst()) {
// No need to check for the name since the query already did that
val id = cursor.getColumnIndex(MediaStore.MediaColumns._ID)
if (id == -1) {
return@use
}
uri = ContentUris.withAppendedId(
mediaContentUri,
cursor.getLong(id)
)
}
}
if (uri == null) {
// Create empty output file to be able to write to it
uri = context.contentResolver.insert(
mediaContentUri,
android.content.ContentValues().apply {
put(
MediaStore.MediaColumns.DISPLAY_NAME,
name
)
put(
MediaStore.MediaColumns.MIME_TYPE,
mimeType
)
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
put(
Media.RELATIVE_PATH,
relativePath,
)
}
}
)!!
}
return uri!!
}
enum class BatchType {
INTERNAL,
CUSTOM,

59
app/src/main/java/app/myzel394/alibi/helpers/VideoBatchesFolder.kt
View File

@ -1,9 +1,7 @@
package app.myzel394.alibi.helpers
import android.content.ContentUris
import android.content.Context
import android.net.Uri
import android.os.Build
import android.os.Environment
import android.os.ParcelFileDescriptor
import android.provider.MediaStore
@ -47,60 +45,15 @@ class VideoBatchesFolder(
}
BatchType.MEDIA -> {
val name = getName(date, extension)
// Check if already exists
var uri: Uri? = null
context.contentResolver.query(
mediaContentUri,
arrayOf(MediaStore.MediaColumns._ID, MediaStore.MediaColumns.DISPLAY_NAME),
// TODO: Improve
"${MediaStore.MediaColumns.DISPLAY_NAME} = '$name'",
null,
null,
)!!.use { cursor ->
if (cursor.moveToFirst()) {
// No need to check for the name since the query already did that
val id = cursor.getColumnIndex(MediaStore.MediaColumns._ID)
if (id == -1) {
return@use
}
uri = ContentUris.withAppendedId(
mediaContentUri,
cursor.getLong(id)
)
}
}
if (uri == null) {
// Create empty output file to be able to write to it
uri = context.contentResolver.insert(
mediaContentUri,
android.content.ContentValues().apply {
put(
MediaStore.MediaColumns.DISPLAY_NAME,
name
)
put(
MediaStore.MediaColumns.MIME_TYPE,
"video/$extension"
)
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
put(
MediaStore.Video.Media.RELATIVE_PATH,
MEDIA_RELATIVE_PATH,
)
}
}
)!!
}
val mediaUri = getOrCreateMediaFile(
name = getName(date, extension),
mimeType = "video/$extension",
relativePath = MEDIA_RELATIVE_PATH,
)
FFmpegKitConfig.getSafParameterForWrite(
context,
uri
mediaUri
)!!
}
}