add ebook renderer (+adjust timeout, environment option) (#57)

Kruemmelspalter · Jan 14, 2023 · 5a2616f · 5a2616f
1 parent 8f27f58
commit 5a2616f
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 4 deletions.
diff --git a/backend/Dockerfile b/backend/Dockerfile
@@ -15,6 +15,7 @@ RUN apt-get update -y && apt-get install -y npm nodejs
 RUN npm install -g n && n stable
 RUN npm install -g @mermaid-js/mermaid-cli
 COPY mmdc-puppeteer-config.json .
+RUN apt-get update -y && apt-get install -y calibre
 
 COPY app/build/distributions/app.tar FileSpider.tar
 RUN tar -xf FileSpider.tar
diff --git a/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/renderer/Renderer.kt b/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/renderer/Renderer.kt
@@ -70,12 +70,19 @@ class Renderer {
             Renderer().tempDir().command(10) { listOf("xournalpp", "-p", "out.pdf", it.fileName) }
                 .outputFile("application/pdf", "pdf") { "out.pdf" }
 
+        private val ebookRenderer = Renderer().tempDir()
+            .command(15, mapOf("QTWEBENGINE_CHROMIUM_FLAGS" to "--no-sandbox")) {
+                listOf("ebook-convert", it.fileName, "out.pdf")
+            }
+            .outputFile("application/pdf", "pdf") { "out.pdf" }
+
         private val mimeSpecificRenderer = Renderer().useRenderer {
             when (it.document.mimeType) {
                 "application/x-tex", "application/x-latex" -> latexRenderer
                 "text/markdown" -> markdownRenderer
                 "application/x-xopp" -> xournalppRenderer
                 "text/html" -> htmlRenderer
+                "application/zip+epub" -> ebookRenderer
                 else -> plainRenderer
             }
         }
@@ -87,6 +94,7 @@ class Renderer {
                 "tex", "latex" -> latexRenderer
                 "xournal", "xournalpp" -> xournalppRenderer
                 "html" -> htmlRenderer
+                "renderer" -> ebookRenderer
                 else -> mimeSpecificRenderer
             }
         }
@@ -125,13 +133,16 @@ class Renderer {
 
     fun command(
         timeout: Long,
+        environment: Map<String, String> = mapOf(),
         timeUnit: TimeUnit = TimeUnit.SECONDS,
         commandProvider: (RenderMeta) -> List<String>
     ): Renderer {
         return addStep {
-            val process = ProcessBuilder(commandProvider(it)).redirectErrorStream(true)
+            val pb = ProcessBuilder(commandProvider(it)).redirectErrorStream(true)
                 .redirectOutput(it.fsService.getLogPathFromID(it.document.id).toFile())
-                .directory(it.workingDirectory.toFile()).start()
+                .directory(it.workingDirectory.toFile())
+            environment.toMap(pb.environment())
+            val process = pb.start()
             if (!process.waitFor(timeout, timeUnit) || process.exitValue() != 0)
                 throw RenderingException(String(it.fsService.readLog(it.document.id)?.readAllBytes() ?: byteArrayOf()))
         }
@@ -175,9 +186,13 @@ class Renderer {
             filenameProvider
         )
     }
+
     fun copy(srcProvider: (RenderMeta) -> String, dstProvider: (RenderMeta) -> String): Renderer {
         return addStep {
-            Files.copy(Paths.get(it.workingDirectory.toString(), srcProvider(it)), Paths.get(it.workingDirectory.toString(), dstProvider(it)))
+            Files.copy(
+                Paths.get(it.workingDirectory.toString(), srcProvider(it)),
+                Paths.get(it.workingDirectory.toString(), dstProvider(it))
+            )
         }
     }
 

diff --git a/frontend/components/DocumentCreationDialog.vue b/frontend/components/DocumentCreationDialog.vue
@@ -93,6 +93,8 @@ export default {
               'fLD2M8105EclOejoneKwSFYio341tuWZWl+z1j/jkrxDi9aXhqsnj9N/QI/qnjL1QAAAA==', 'base64'),
           },
         },
+        { text: 'ePub', value: { mime: 'application/zip+epub', fileExtension: 'epub', renderer: 'ebook' } },
+        { text: 'eBook', value: { renderer: 'ebook' } },
       ],
     }
   },

diff --git a/frontend/components/DocumentDisplay.vue b/frontend/components/DocumentDisplay.vue
@@ -114,7 +114,7 @@ export default {
       if (this.iframeState === 0) {
         this.iframeState = 2
       }
-    }, 5e3)
+    }, 20e3)
   },
   methods: {
     copyIdToClipboard () {