nick/amethyst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Intentionality: check the return value and log a warning via Log.w() when deletion fails

Browse Source
This commit is contained in:
davotoula
2026-03-20 09:29:04 +01:00
parent 123d9eea0c
commit 94cf31eb29
1 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
amethyst/src/main/java/com/vitorpamplona/amethyst/service/uploads/MetadataStripper.kt
+21 -7
View File
@@ -171,7 +171,9 @@ object MetadataStripper {
if (muxerStarted) runCatching { muxer?.stop() } if (muxerStarted) runCatching { muxer?.stop() }
muxer?.release() muxer?.release()
extractor.release() extractor.release()
if (!succeeded) outputFile.delete() if (!succeeded && !outputFile.delete()) {
Log.w("MetadataStripper", "Failed to delete temp file: ${outputFile.absolutePath}")
}
} }
return succeeded return succeeded
} }
@@ -199,7 +201,9 @@ object MetadataStripper {
val inputStream = val inputStream =
context.contentResolver.openInputStream(uri) context.contentResolver.openInputStream(uri)
?: run { ?: run {
tempFile.delete() if (!tempFile.delete()) {
Log.w("MetadataStripper", "Failed to delete temp file: ${tempFile.absolutePath}")
}
return StrippingResult(uri, false) return StrippingResult(uri, false)
} }
inputStream.use { input -> inputStream.use { input ->
@@ -218,7 +222,9 @@ object MetadataStripper {
StrippingResult(tempFile.toUri(), true) StrippingResult(tempFile.toUri(), true)
} catch (e: Exception) { } catch (e: Exception) {
if (e is CancellationException) throw e if (e is CancellationException) throw e
tempFile?.delete() if (tempFile?.delete() == false) {
Log.w("MetadataStripper", "Failed to delete temp file: ${tempFile.absolutePath}")
}
Log.d("MetadataStripper", "Failed to strip image metadata: ${e.message}") Log.d("MetadataStripper", "Failed to strip image metadata: ${e.message}")
StrippingResult(uri, false) StrippingResult(uri, false)
} }
@@ -304,7 +310,9 @@ object MetadataStripper {
input.copyTo(output) input.copyTo(output)
} }
} ?: run { } ?: run {
tempInputFile.delete() if (!tempInputFile.delete()) {
Log.w("MetadataStripper", "Failed to delete temp file: ${tempInputFile.absolutePath}")
}
return StrippingResult(uri, false) return StrippingResult(uri, false)
} }
@@ -345,7 +353,9 @@ object MetadataStripper {
} }
if (startOffset == 0L && endOffset == fileSize) { if (startOffset == 0L && endOffset == fileSize) {
tempInputFile.delete() if (!tempInputFile.delete()) {
Log.w("MetadataStripper", "Failed to delete temp file: ${tempInputFile.absolutePath}")
}
tempInputFile = null tempInputFile = null
return StrippingResult(uri, true) // no tags found, already clean return StrippingResult(uri, true) // no tags found, already clean
} }
@@ -365,14 +375,18 @@ object MetadataStripper {
} }
} }
} }
tempInputFile.delete() if (!tempInputFile.delete()) {
Log.w("MetadataStripper", "Failed to delete temp file: ${tempInputFile.absolutePath}")
}
tempInputFile = null tempInputFile = null
Log.d("MetadataStripper", "Stripped ID3 tags from MP3") Log.d("MetadataStripper", "Stripped ID3 tags from MP3")
StrippingResult(tempOutputFile.toUri(), true) StrippingResult(tempOutputFile.toUri(), true)
} catch (e: Exception) { } catch (e: Exception) {
if (e is CancellationException) throw e if (e is CancellationException) throw e
tempInputFile?.delete() if (tempInputFile?.delete() == false) {
Log.w("MetadataStripper", "Failed to delete temp file: ${tempInputFile.absolutePath}")
}
Log.d("MetadataStripper", "Failed to strip MP3 metadata: ${e.message}") Log.d("MetadataStripper", "Failed to strip MP3 metadata: ${e.message}")
StrippingResult(uri, false) StrippingResult(uri, false)
} }