CalvinBackup/SpotiFLAC-Mobile
1
0
Fork 0
mirror of https://github.com/zarzet/SpotiFLAC-Mobile.git synced 2026-08-26 21:02:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

feat(filename): add provider traceability tags

Browse Source
This commit is contained in:
zarzet
2026-08-17 20:51:27 +07:00
parent efc03db308
commit 2e115308b7
13 changed files with 201 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
android/app/src/main/kotlin/com/zarz/spotiflac/NativeFinalizerFFmpeg.kt
+1
View File
@@ -243,6 +243,7 @@ internal fun NativeDownloadFinalizer.buildOutputPath(inputPath: String, extensio
internal fun NativeDownloadFinalizer.desiredFileName(input: NativeDownloadFinalizer.FinalizeInput, state: NativeDownloadFinalizer.FinalizeState, extension: String): String {
val ext = normalizeExt(extension).ifBlank { normalizeExt(File(state.fileName).extension).ifBlank { ".flac" } }
val rawName = input.result.optString("quality_variant_file_name", "")
.ifBlank { input.result.optString("resolved_file_name", "") }
.ifBlank { input.request.optString("saf_file_name", "") }
.ifBlank { state.fileName }
.ifBlank { "${trackString(input, "artistName", input.request.optString("artist_name", "Artist"))} - ${trackString(input, "name", input.request.optString("track_name", "Track"))}" }
android/app/src/main/kotlin/com/zarz/spotiflac/SafDownloadHandler.kt
+16 -4
View File
@@ -126,15 +126,18 @@ object SafDownloadHandler {
val response = downloader(req.toString())
val respObj = JSONObject(response)
if (respObj.optBoolean("success", false)) {
val resolvedFileName = respObj.optString("resolved_file_name", "")
.trim()
.let { if (it.isNotEmpty()) forceFilenameExt(it, outputExt) else fileName }
val reportedPath = respObj.optString("file_path", "").trim()
if (reportedPath.isEmpty() || reportedPath.startsWith("/proc/self/fd/")) {
respObj.put("file_path", workingFile.absolutePath)
} else if (reportedPath != workingFile.absolutePath) {
workingFile.delete()
}
respObj.put("file_name", respObj.optString("file_name", "").ifBlank { fileName })
respObj.put("file_name", resolvedFileName)
respObj.put("saf_deferred_publish", true)
respObj.put("saf_final_file_name", fileName)
respObj.put("saf_final_file_name", resolvedFileName)
respObj.put("saf_relative_dir", relativeDir)
respObj.put("saf_tree_uri", treeUriStr)
respObj.put("saf_output_ext", outputExt)
@@ -169,7 +172,12 @@ object SafDownloadHandler {
val response = downloader(req.toString())
val respObj = JSONObject(response)
if (respObj.optBoolean("success", false)) {
var finalFileName = fileName
val resolvedFileName = respObj.optString("resolved_file_name", "").trim()
var finalFileName = if (resolvedFileName.isNotEmpty()) {
forceFilenameExt(resolvedFileName, outputExt)
} else {
fileName
}
val goFilePath = respObj.optString("file_path", "")
if (goFilePath.isNotEmpty() &&
!goFilePath.startsWith("content://") &&
@@ -185,7 +193,11 @@ object SafDownloadHandler {
respObj.put("actual_extension", actualExt)
}
if (actualExt.isNotBlank() && actualExt != outputExt) {
val actualFileName = buildSafFileName(req, actualExt)
val actualFileName = if (resolvedFileName.isNotEmpty()) {
forceFilenameExt(resolvedFileName, actualExt)
} else {
buildSafFileName(req, actualExt)
}
val actualStagedFileName = if (useStagedOutput) {
buildStagedSafFileName(actualFileName)
} else {