Skip to content

Commit

Permalink
Add support for DocumentsProvider.openDocumentThumbnail()
Browse files Browse the repository at this point in the history
This will return a pipe and then spawn a background task to generate a
thumbnail and write it to the pipe. Cancellation is supported in between
logical operations (eg. parse headers, load frame, etc.). Android has no
way to interrupt the parsers in MediaMetadataRetriever and ImageDecoder
though, so there will be a delay before cancellation takes effect. This
can be noticeable when scrolling quickly, for example through a list of
videos, since there is a hard concurrency limit equal to the number of
logical cores.

Note that only audio, image, and video formats natively supported by
Android can be thumbnailed. We don't bundle any decoders.

Signed-off-by: Andrew Gunnerson <accounts+github@chiller3.com>
  • Loading branch information
chenxiaolong committed Dec 20, 2024
1 parent 8642bb9 commit 5884b3e
Show file tree
Hide file tree
Showing 5 changed files with 419 additions and 6 deletions.
1 change: 1 addition & 0 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,7 @@ dependencies {
implementation(libs.appcompat)
implementation(libs.biometric)
implementation(libs.core.ktx)
implementation(libs.exifinterface)
implementation(libs.fragment.ktx)
implementation(libs.preference.ktx)
implementation(libs.security.crypto)
Expand Down
96 changes: 90 additions & 6 deletions app/src/main/java/com/chiller3/rsaf/rclone/RcloneProvider.kt
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import android.content.SharedPreferences
import android.content.res.AssetFileDescriptor
import android.database.Cursor
import android.database.MatrixCursor
import android.graphics.Bitmap
import android.graphics.Point
import android.os.CancellationSignal
import android.os.Handler
Expand All @@ -24,6 +25,7 @@ import android.system.ErrnoException
import android.system.Os
import android.system.OsConstants
import android.util.Log
import android.util.Size
import android.webkit.MimeTypeMap
import com.chiller3.rsaf.AppLock
import com.chiller3.rsaf.BuildConfig
Expand All @@ -39,6 +41,8 @@ import com.chiller3.rsaf.extension.toException
import com.chiller3.rsaf.extension.toSingleLineString
import java.io.FileNotFoundException
import java.io.IOException
import java.util.concurrent.Executors
import java.util.concurrent.TimeUnit

class RcloneProvider : DocumentsProvider(), SharedPreferences.OnSharedPreferenceChangeListener {
companion object {
Expand Down Expand Up @@ -76,7 +80,8 @@ class RcloneProvider : DocumentsProvider(), SharedPreferences.OnSharedPreference
DocumentsContract.Document.FLAG_SUPPORTS_MOVE or
DocumentsContract.Document.FLAG_SUPPORTS_REMOVE or
DocumentsContract.Document.FLAG_SUPPORTS_RENAME or
DocumentsContract.Document.FLAG_SUPPORTS_WRITE
DocumentsContract.Document.FLAG_SUPPORTS_WRITE or
DocumentsContract.Document.FLAG_SUPPORTS_THUMBNAIL
private val DIRECTORY_PERMS =
OsConstants.S_IRWXU or
OsConstants.S_IRGRP or OsConstants.S_IXGRP or
Expand Down Expand Up @@ -310,6 +315,8 @@ class RcloneProvider : DocumentsProvider(), SharedPreferences.OnSharedPreference
// consistent. It is just a dumb workaround to make some common file access patterns work. A
// client app can absolutely still shoot itself in the foot.
private val inUseTracker = VfsNode()
private val thumbnailTaskPool =
Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors())

private fun waitUntilUploadsDone(documentId: String) {
val path = vfsPath(documentId)
Expand Down Expand Up @@ -382,6 +389,9 @@ class RcloneProvider : DocumentsProvider(), SharedPreferences.OnSharedPreference

override fun shutdown() {
prefs.unregisterListener(this)

thumbnailTaskPool.shutdown()
thumbnailTaskPool.awaitTermination(Long.MAX_VALUE, TimeUnit.DAYS)
}

override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences?, key: String?) {
Expand Down Expand Up @@ -579,16 +589,46 @@ class RcloneProvider : DocumentsProvider(), SharedPreferences.OnSharedPreference
/**
* Open a document thumbnail.
*
* This is not implemented. It's only overridden because certain clients, including DocumentsUI,
* would otherwise crash, even though [DocumentsContract.Document.FLAG_SUPPORTS_THUMBNAIL] is
* never advertised.
* This is only implemented for audio, image, and video files. If generating a thumbnail is
* supported, but the process fails, the client will see an empty file.
*/
override fun openDocumentThumbnail(documentId: String, sizeHint: Point,
signal: CancellationSignal?): AssetFileDescriptor? {
debugLog("openDocumentThumbnail($documentId, $sizeHint, $signal)")
enforceNotBlocked(documentId)

return null
val projection = arrayOf(DocumentsContract.Document.COLUMN_MIME_TYPE)
val mimeType = queryDocument(documentId, projection).use { cursor ->
if (!cursor.moveToFirst()) {
// Should never happen.
return null
}

val index = cursor.getColumnIndexOrThrow(DocumentsContract.Document.COLUMN_MIME_TYPE)
cursor.getString(index)
}

if (!Thumbnailer.isSupported(mimeType)) {
Log.d(TAG, "Thumbnail not supported for: $mimeType")
return null
}

val mediaInput = openDocument(documentId, "r", signal)

try {
val pipe = ParcelFileDescriptor.createReliablePipe()

// The task owns both file descriptors.
val task = ThumbnailTask(documentId, mediaInput, pipe[1], mimeType, sizeHint, signal)

thumbnailTaskPool.submit(task)

return AssetFileDescriptor(pipe[0], 0, AssetFileDescriptor.UNKNOWN_LENGTH)
} catch (e: Exception) {
Log.w(TAG, "Failed to create thumbnail pipe", e)
mediaInput.close()
return null
}
}

/**
Expand Down Expand Up @@ -1002,4 +1042,48 @@ class RcloneProvider : DocumentsProvider(), SharedPreferences.OnSharedPreference
toString(this, 0)
}
}
}

private inner class ThumbnailTask(
private val documentId: String,
private val mediaInput: ParcelFileDescriptor,
private val thumbnailOutput: ParcelFileDescriptor,
private val mimeType: String,
private val sizeHint: Point,
private val signal: CancellationSignal?,
) : Runnable {
override fun run() {
debugLog("ThumbnailTask[$documentId].run()")

// Since we're accessing the data through ProxyFd, we don't need to try and keep the
// process alive during this process.

mediaInput.use { input ->
// We'll try to close with an error message if possible, in case the client is able
// to make use of that. There's no other way of indicating an error or that a
// thumbnail is unavailable. A client that doesn't check for errors will just see an
// empty file.
ParcelFileDescriptor.AutoCloseOutputStream(thumbnailOutput).use { output ->
try {
val bitmap = Thumbnailer.createThumbnail(
input.fileDescriptor,
mimeType,
Size(sizeHint.x, sizeHint.y),
signal,
)

try {
signal?.throwIfCanceled()

bitmap.compress(Bitmap.CompressFormat.PNG, 0, output)
} finally {
bitmap.recycle()
}
} catch (e: Exception) {
Log.w(TAG, "Failed to generate thumbnail", e)
thumbnailOutput.closeWithError(e.toSingleLineString())
}
}
}
}
}
}
Loading

0 comments on commit 5884b3e

Please sign in to comment.