Skip to content

Allow more custom callbacks #18

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Nov 13, 2021
Merged

Allow more custom callbacks #18

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9f05a6a
Allow custom callbacks at imageCreate()
gesellix Nov 13, 2021
84bc087
Allow custom callbacks at imageLoad()
gesellix Nov 13, 2021
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
43 changes: 29 additions & 14 deletions api-client/src/main/kotlin/de/gesellix/docker/remote/api/client/ImageApi.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import de.gesellix.docker.engine.RequestMethod.POST
import de.gesellix.docker.remote.api.BuildInfo
import de.gesellix.docker.remote.api.BuildPruneResponse
import de.gesellix.docker.remote.api.ContainerConfig
import de.gesellix.docker.remote.api.CreateImageInfo
import de.gesellix.docker.remote.api.HistoryResponseItem
import de.gesellix.docker.remote.api.IdResponse
import de.gesellix.docker.remote.api.Image
Expand Down Expand Up @@ -571,6 +572,7 @@ class ImageApi(dockerClientConfig: DockerClientConfig = defaultClientConfig, pro
* @throws ServerException If the API returns a server error response
*/
@Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
@JvmOverloads
fun imageCreate(
fromImage: String?,
fromSrc: String?,
Expand All @@ -580,7 +582,8 @@ class ImageApi(dockerClientConfig: DockerClientConfig = defaultClientConfig, pro
xRegistryAuth: String?,
changes: List<String>?,
platform: String?,
inputImage: InputStream?
inputImage: InputStream?,
callback: StreamCallback<CreateImageInfo?>? = null, timeoutMillis: Long? = null /*= 24.hours.toLongMilliseconds()*/
) {
val localVariableConfig =
imageCreateRequestConfig(
Expand All @@ -595,21 +598,25 @@ class ImageApi(dockerClientConfig: DockerClientConfig = defaultClientConfig, pro
inputImage = inputImage
)

val localVarResponse = requestStream<Any?>(
val localVarResponse = requestStream<CreateImageInfo?>(
localVariableConfig
)

val timeout = Duration.of(1, ChronoUnit.MINUTES)
val callback = LoggingCallback<Any>()
val timeout = if (timeoutMillis == null) {
Duration.of(10, ChronoUnit.MINUTES)
} else {
Duration.of(timeoutMillis, ChronoUnit.MILLIS)
}
val actualCallback = callback ?: LoggingCallback<CreateImageInfo?>()

return when (localVarResponse.responseType) {
ResponseType.Success -> {
runBlocking {
launch {
withTimeout(timeout.toMillis()) {
callback.onStarting(this@launch::cancel)
(localVarResponse as SuccessStream<*>).data.collect { callback.onNext(it) }
callback.onFinished()
actualCallback.onStarting(this@launch::cancel)
((localVarResponse as SuccessStream<*>).data as Flow<CreateImageInfo?>).collect { actualCallback.onNext(it) }
actualCallback.onFinished()
}
}
}
Expand Down Expand Up @@ -1016,24 +1023,32 @@ class ImageApi(dockerClientConfig: DockerClientConfig = defaultClientConfig, pro
* @throws ServerException If the API returns a server error response
*/
@Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
fun imageLoad(quiet: Boolean?, imagesTarball: java.io.File?) {
@JvmOverloads
fun imageLoad(
quiet: Boolean?, imagesTarball: java.io.File?,
callback: StreamCallback<CreateImageInfo?>? = null, timeoutMillis: Long? = null /*= 24.hours.toLongMilliseconds()*/
) {
val localVariableConfig = imageLoadRequestConfig(quiet = quiet, imagesTarball = imagesTarball)

val localVarResponse = requestStream<Any?>(
val localVarResponse = requestStream<CreateImageInfo?>(
localVariableConfig
)

val timeout = Duration.of(1, ChronoUnit.MINUTES)
val callback = LoggingCallback<Any>()
val timeout = if (timeoutMillis == null) {
Duration.of(10, ChronoUnit.MINUTES)
} else {
Duration.of(timeoutMillis, ChronoUnit.MILLIS)
}
val actualCallback = callback ?: LoggingCallback<CreateImageInfo?>()

return when (localVarResponse.responseType) {
ResponseType.Success -> {
runBlocking {
launch {
withTimeout(timeout.toMillis()) {
callback.onStarting(this@launch::cancel)
(localVarResponse as SuccessStream<*>).data.collect { callback.onNext(it) }
callback.onFinished()
actualCallback.onStarting(this@launch::cancel)
((localVarResponse as SuccessStream<*>).data as Flow<CreateImageInfo>).collect { actualCallback.onNext(it) }
actualCallback.onFinished()
}
}
}
Expand Down