anyStateReasonContains()

gmuth · Dec 13, 2024 · ddcf1a1 · ddcf1a1
1 parent 27c4d93
commit ddcf1a1
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 9 deletions.
diff --git a/src/main/kotlin/de/gmuth/ipp/client/IppPrinter.kt b/src/main/kotlin/de/gmuth/ipp/client/IppPrinter.kt
@@ -255,17 +255,20 @@ class IppPrinter(
     fun isStopped(updateStateAttributes: Boolean = false) = stateIs(updateStateAttributes, Stopped)
     fun isProcessing(updateStateAttributes: Boolean = false) = stateIs(updateStateAttributes, Processing)
 
-    fun isPaused() = stateReasons.contains("paused")
-    fun isOffline() = stateReasons.contains("offline-report") // reported by CUPS
-    fun isTonerLow() = stateReasons.contains("toner-low")
-    fun isTonerEmpty() = stateReasons.any { it.contains("toner-empty") } // toner-empty-error
-    fun isMediaJam() = stateReasons.contains("media-jam")
-    fun isMediaLow() = stateReasons.contains("media-low")
-    fun isMediaEmpty() = stateReasons.any { it.contains("media-empty") } // media-empty-report
-    fun isMediaNeeded() = stateReasons.contains("media-needed")
+    internal fun anyStateReasonContains(reason: String) =
+        stateReasons.any { it.contains(reason) } // support "...-error" and "...-report" values
+
+    fun isPaused() = anyStateReasonContains("paused")
+    fun isOffline() = anyStateReasonContains("offline")
+    fun isTonerLow() = anyStateReasonContains("toner-low")
+    fun isTonerEmpty() = anyStateReasonContains("toner-empty")
+    fun isMediaJam() = anyStateReasonContains("media-jam")
+    fun isMediaLow() = anyStateReasonContains("media-low")
+    fun isMediaEmpty() = anyStateReasonContains("media-empty")
+    fun isMediaNeeded() = anyStateReasonContains("media-needed")
 
-    fun isDuplexSupported() = sidesSupported.any { it.startsWith("two-sided") }
     fun supportsOperations(vararg operations: IppOperation) = operationsSupported.containsAll(operations.toList())
+    fun isDuplexSupported() = sidesSupported.any { it.startsWith("two-sided") }
     fun supportsVersion(version: String) = versionsSupported.contains(version)
     fun isCups() = attributes.contains("cups-version")
 

diff --git a/src/test/kotlin/de/gmuth/ipp/client/IppPrinterTests.kt b/src/test/kotlin/de/gmuth/ipp/client/IppPrinterTests.kt
@@ -15,6 +15,7 @@ import de.gmuth.ipp.attributes.TemplateAttributes.jobName
 import de.gmuth.ipp.attributes.TemplateAttributes.jobPriority
 import de.gmuth.ipp.attributes.TemplateAttributes.numberUp
 import de.gmuth.ipp.attributes.TemplateAttributes.orientationRequested
+import de.gmuth.ipp.attributes.TemplateAttributes.outputBin
 import de.gmuth.ipp.attributes.TemplateAttributes.pageRanges
 import de.gmuth.ipp.attributes.TemplateAttributes.printerResolution
 import de.gmuth.ipp.client.WhichJobs.Completed
@@ -118,6 +119,7 @@ class IppPrinterTests {
             jobPriority(30),
             copies(1),
             numberUp(1),
+            outputBin("tray-2"),
             pageRanges(1..5),
             printerResolution(600),
             orientationRequested(Portrait),