starred/audiobookshelf-app
1
0
Fork 0
mirror of https://github.com/advplyr/audiobookshelf-app.git synced 2026-08-07 20:38:43 +02:00
Code Issues 454 Packages Projects Releases 10 Wiki Activity

Add: function to create LocalFile from download item part

Browse Source
This commit is contained in:
Nicholas Wallace
2025-04-29 21:10:54 -07:00
parent 686310f0bf
commit 367eb6de9f
2 changed files with 73 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
android/app/src/main/java/com/audiobookshelf/app/data/DeviceClasses.kt
+1
View File
@@ -61,6 +61,7 @@ data class ServerConnectionConfig(
data class LocalFile(
var id: String,
var filename: String?,
var extension: String?,
var contentUrl: String,
var basePath: String,
var absolutePath: String,
android/app/src/main/java/com/audiobookshelf/app/device/FolderScanner.kt
+72 -32
View File
@@ -7,6 +7,7 @@ import androidx.documentfile.provider.DocumentFile
import com.anggrayudi.storage.file.*
import com.audiobookshelf.app.data.*
import com.audiobookshelf.app.models.DownloadItem
import com.audiobookshelf.app.models.DownloadItemPart
import java.io.File
class FolderScanner(var ctx: Context) {
@@ -21,6 +22,46 @@ class FolderScanner(var ctx: Context) {
return "local_" + DeviceManager.getBase64Id(mediaItemId)
}
/** Create LocalFile from downloadItemPart */
private fun createLocalFile(downloadItemPart: DownloadItemPart): LocalFile? {
if (downloadItemPart.isInternalStorage) {
val file = File(downloadItemPart.finalDestinationPath)
val localFileId = DeviceManager.getBase64Id(file.name)
val localFile =
LocalFile(
localFileId,
file.name,
file.extension,
Uri.fromFile(file).toString(),
file.getBasePath(ctx),
file.absolutePath,
file.mimeType,
file.length()
)
return localFile
} else {
// Convert the file path to a Uri using SAF
val docFile = DocumentFileCompat.fromFullPath(ctx, downloadItemPart.finalDestinationPath)
if (docFile == null) {
Log.e(tag, "Doc File Invalid ${downloadItemPart.finalDestinationPath}")
return null
}
val localFileId = DeviceManager.getBase64Id(docFile.id)
val localFile =
LocalFile(
localFileId,
docFile.name,
docFile.extension,
docFile.uri.toString(),
docFile.getBasePath(ctx),
docFile.getAbsolutePath(ctx),
docFile.mimeType,
docFile.length()
)
return localFile
}
}
private fun scanInternalDownloadItem(
downloadItem: DownloadItem,
cb: (DownloadItemScanResult?) -> Unit
@@ -71,16 +112,15 @@ class FolderScanner(var ctx: Context) {
val file = File(downloadItemPart.finalDestinationPath)
val localFileId = DeviceManager.getBase64Id(file.name)
val localFile =
LocalFile(
localFileId,
file.name,
Uri.fromFile(file).toString(),
file.getBasePath(ctx),
file.absolutePath,
file.mimeType,
file.length()
)
val localFile = createLocalFile(downloadItemPart)
if (localFile == null) {
Log.e(
tag,
"scanInternalDownloadItem: Null localFile for path ${downloadItemPart.finalDestinationPath}"
)
return cb(null)
}
Log.d(tag, "Scan internal storage item created file ${file.name}")
if (file == null) {
@@ -101,11 +141,11 @@ class FolderScanner(var ctx: Context) {
val trackFileMetadata =
FileMetadata(
file.name,
file.extension,
file.absolutePath,
file.getBasePath(ctx),
file.length()
localFile.filename ?: "",
localFile.extension ?: "",
localFile.absolutePath,
localFile.basePath,
localFile.size
)
// Create new audio track
val track =
@@ -140,7 +180,10 @@ class FolderScanner(var ctx: Context) {
}
} else if (downloadItemPart.ebookFile != null) {
foundEBookFile = true
Log.d(tag, "scanInternalDownloadItem: Ebook file found with mimetype=${file.mimeType}")
Log.d(
tag,
"scanInternalDownloadItem: Ebook file found with mimetype=${localFile.mimeType}"
)
localLibraryItem.localFiles.add(localFile)
val ebookFile =
@@ -328,27 +371,24 @@ class FolderScanner(var ctx: Context) {
val itemPart =
downloadItem.downloadItemParts.find { itemPart -> itemPart.filename == docFile.name }
// Build local file object
val localFileId = DeviceManager.getBase64Id(docFile.id)
val localFile =
LocalFile(
localFileId,
docFile.name,
docFile.uri.toString(),
docFile.getBasePath(ctx),
docFile.getAbsolutePath(ctx),
docFile.mimeType,
docFile.length()
)
var localFile: LocalFile? = null
if (itemPart != null) {
// Build local file object
localFile = createLocalFile(itemPart)
}
if (itemPart == null) {
if (downloadItem.mediaType == "book"
) { // for books every download item should be a file found
Log.e(
tag,
"scanDownloadItem: Item part not found for doc file ${localFile.filename} | ${localFile.absolutePath} | ${localFile.contentUrl}"
"scanDownloadItem: Item part not found for doc file ${localFile?.filename} | ${localFile?.absolutePath} | ${localFile?.contentUrl}"
)
}
} else if (localFile == null) {
Log.e(tag, "scanDownloadItem: Local file is null for item part: ${itemPart.filename}")
} else if (itemPart.audioTrack != null) { // Is audio track
val audioTrackFromServer = itemPart.audioTrack
Log.d(
@@ -362,7 +402,7 @@ class FolderScanner(var ctx: Context) {
val trackFileMetadata =
FileMetadata(
localFile.filename ?: "",
docFile.extension ?: "",
localFile.extension ?: "",
localFile.absolutePath,
localFile.basePath,
localFile.size
@@ -377,7 +417,7 @@ class FolderScanner(var ctx: Context) {
localFile.mimeType ?: "",
trackFileMetadata,
true,
localFileId,
localFile.id,
audioTrackFromServer.index
)
audioTracks.add(track)
@@ -408,7 +448,7 @@ class FolderScanner(var ctx: Context) {
itemPart.ebookFile.metadata,
itemPart.ebookFile.ebookFormat,
true,
localFileId,
localFile.id,
localFile.contentUrl
)
(localLibraryItem.media as Book).ebookFile = ebookFile