Skip to content
Open
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
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,11 @@ class EsclScanningProtocol(
httpClient
)

val scannerCapabilities = esclRequestClient.getScannerCapabilities()
val statusBeforeNextDocument =
scannerCapabilities is ESCLRequestClient.ScannerCapabilitiesResult.Success &&
scannerCapabilities.scannerCapabilities.makeAndModel == "RICOH"

suspend fun abortIfCancelling(scanJob: io.github.chrisimx.esclkt.ScanJob? = null): Boolean = if (cancelled.value) {
logger.debug { "Scan job cancelling is set. Aborting, canceling job if possible. scanJob: $scanJob" }
scanJob?.cancel()
Expand Down Expand Up @@ -237,6 +242,12 @@ class EsclScanningProtocol(
}
val jobResult = job.scanJob

// Some RICOH devices keep the job pending until ScannerStatus is queried.
if (statusBeforeNextDocument) {
val status = esclRequestClient.getScannerStatus()
logger.debug { "Scanner status after job creation: $status" }
}

if (abortIfCancelling(jobResult)) return@flow

var polling = false
Expand Down