Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add listAll to StorageReference and reference to FirebaseStorage #397

Merged
merged 2 commits into from
Jul 13, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -236,4 +236,10 @@ If you are building a Kotlin multiplatform library which will be consumed from J
}
```


## Contributing
If you'd like to contribute to this project then you can fork this repository.
You can build and test the project locally.
1. Open the project in IntelliJ IDEA.
2. Install cocoapods via `sudo gem install -n /usr/local/bin cocoapods`
3. Install the GitLive plugin into IntelliJ
4. After a gradle sync then run `publishToMavenLocal`
Original file line number Diff line number Diff line change
Expand Up @@ -518,6 +518,7 @@ external object firebase {
fun setMaxOperationRetryTime(time: Double): Unit
fun setMaxUploadRetryTime(time: Double): Unit
fun useEmulator(host: String, port: Int)
fun ref(): Reference
}

open class Reference {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ actual class FirebaseStorage(val android: com.google.firebase.storage.FirebaseSt
android.useEmulator(host, port)
}

actual val reference = StorageReference(android.reference)
}

actual class StorageReference(val android: com.google.firebase.storage.StorageReference) {
Expand All @@ -59,6 +60,8 @@ actual class StorageReference(val android: com.google.firebase.storage.StorageRe

actual suspend fun getDownloadUrl(): String = android.downloadUrl.await().toString()

actual suspend fun listAll(): ListResult = ListResult(android.listAll().await())

actual fun putFileResumable(file: File): ProgressFlow {
val android = android.putFile(file.uri)

Expand Down Expand Up @@ -88,6 +91,12 @@ actual class StorageReference(val android: com.google.firebase.storage.StorageRe
}
}

actual class ListResult(android: com.google.firebase.storage.ListResult) {
actual val prefixes: List<StorageReference> = android.prefixes.map { StorageReference(it) }
actual val items: List<StorageReference> = android.items.map { StorageReference(it) }
actual val pageToken: String? = android.pageToken
}

actual class File(val uri: Uri)

actual typealias FirebaseStorageException = com.google.firebase.storage.StorageException
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ expect class FirebaseStorage {
fun setMaxOperationRetryTimeMillis(maxOperationRetryTimeMillis: Long)
fun setMaxUploadRetryTimeMillis(maxUploadRetryTimeMillis: Long)
fun useEmulator(host: String, port: Int)

val reference: StorageReference
}

expect class StorageReference {
Expand All @@ -34,8 +36,15 @@ expect class StorageReference {

suspend fun getDownloadUrl(): String

suspend fun listAll(): ListResult

fun putFileResumable(file: File): ProgressFlow
}

expect class ListResult {
val prefixes: List<StorageReference>
val items: List<StorageReference>
val pageToken: String?
}

expect class File
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
package dev.gitlive.firebase.storage

import cocoapods.FirebaseStorage.FIRStorage
import cocoapods.FirebaseStorage.FIRStorageListResult
import cocoapods.FirebaseStorage.FIRStorageReference
import cocoapods.FirebaseStorage.FIRStorageTaskStatusFailure
import cocoapods.FirebaseStorage.FIRStorageTaskStatusPause
Expand Down Expand Up @@ -48,6 +49,7 @@ actual class FirebaseStorage(val ios: FIRStorage) {
ios.useEmulatorWithHost(host, port.toLong())
}

actual val reference get() = StorageReference(ios.reference())
}

actual class StorageReference(val ios: FIRStorageReference) {
Expand All @@ -66,6 +68,12 @@ actual class StorageReference(val ios: FIRStorageReference) {
downloadURLWithCompletion(completion = it)
}.absoluteString()!!

actual suspend fun listAll(): ListResult = awaitResult {
ios.listAllWithCompletion { firStorageListResult, nsError ->
it.invoke(firStorageListResult?.let { ListResult(it) }, nsError)
}
}

actual fun putFileResumable(file: File): ProgressFlow {
val ios = ios.putFile(file.url)

Expand Down Expand Up @@ -102,6 +110,12 @@ actual class StorageReference(val ios: FIRStorageReference) {

}

actual class ListResult(ios: FIRStorageListResult) {
actual val prefixes: List<StorageReference> = ios.prefixes().map { StorageReference(it as FIRStorageReference) }
actual val items: List<StorageReference> = ios.items().map { StorageReference(it as FIRStorageReference) }
actual val pageToken: String? = ios.pageToken()
}

actual class File(val url: NSURL)

actual class FirebaseStorageException(message: String): FirebaseException(message)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ actual class FirebaseStorage(val js: firebase.storage.Storage) {
js.useEmulator(host, port)
}

actual val reference: StorageReference get() = StorageReference(js.ref())
}

actual class StorageReference(val js: firebase.storage.Reference) {
Expand All @@ -54,6 +55,8 @@ actual class StorageReference(val js: firebase.storage.Reference) {

actual suspend fun getDownloadUrl(): String = rethrow { js.getDownloadURL().await().toString() }

actual suspend fun listAll(): ListResult = rethrow { ListResult(js.listAll().await()) }

actual fun putFileResumable(file: File): ProgressFlow = rethrow {
val uploadTask = js.put(file)

Expand Down Expand Up @@ -85,6 +88,12 @@ actual class StorageReference(val js: firebase.storage.Reference) {

}

actual class ListResult(js: firebase.storage.ListResult) {
actual val prefixes: List<StorageReference> = js.prefixes.map { StorageReference(it) }
actual val items: List<StorageReference> = js.items.map { StorageReference(it) }
actual val pageToken: String? = js.nextPageToken
}

actual typealias File = org.w3c.files.File

actual open class FirebaseStorageException(code: String, cause: Throwable) :
Expand Down
Loading