fix for issue #22

gmuth · May 14, 2024 · a1f4331 · a1f4331
1 parent 720a95f
commit a1f4331
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/src/main/kotlin/de/gmuth/ipp/client/CupsClient.kt b/src/main/kotlin/de/gmuth/ipp/client/CupsClient.kt
@@ -1,7 +1,7 @@
 package de.gmuth.ipp.client
 
 /**
- * Copyright (c) 2020-2023 Gerhard Muth
+ * Copyright (c) 2020-2024 Gerhard Muth
  */
 
 import de.gmuth.ipp.client.IppExchangeException.ClientErrorNotFoundException
@@ -32,7 +32,7 @@ class CupsClient(
 
     private val cupsServer =
         IppPrinter(cupsUri, ippClient = ippClient, getPrinterAttributesOnInit = false)
-            .apply { workDirectory = cupsClientWorkDirectory.createDirectoryIfNotExists() }
+            .apply { workDirectory = cupsClientWorkDirectory.createDirectoryIfNotExists(false) }
 
     init {
         if (cupsUri.scheme == "ipps") config.trustAnyCertificateAndSSLHostname()

diff --git a/src/main/kotlin/de/gmuth/ipp/client/IppPrinter.kt b/src/main/kotlin/de/gmuth/ipp/client/IppPrinter.kt
@@ -1,7 +1,7 @@
 package de.gmuth.ipp.client
 
 /**
- * Copyright (c) 2020-2023 Gerhard Muth
+ * Copyright (c) 2020-2024 Gerhard Muth
  */
 
 import de.gmuth.ipp.attributes.*
@@ -582,6 +582,9 @@ class IppPrinter(
     fun printerDirectory(printerName: String = name.text.replace("\\s+".toRegex(), "_")): File =
         File(workDirectory, printerName).createDirectoryIfNotExists()
 
-    internal fun File.createDirectoryIfNotExists() = this
-        .apply { if (!mkdirs() && !isDirectory) throw IOException("Failed to create directory: $path") }
+    internal fun File.createDirectoryIfNotExists(throwOnFailure: Boolean = true) = this.apply {
+        if (!mkdirs() && !isDirectory) "Failed to create directory: $path".let {
+            if (throwOnFailure) throw IOException(it) else logger.warning(it)
+        }
+    }
 }