Develop

Dockerfile

@@ -26,4 +26,6 @@ RUN echo 'export GIT_SSH_COMMAND="ssh -i \$(pwd | sed s/_transform.*//)/.private
 #RUN apt upgrade git --repository=http://dl-cdn.alpinelinux.org/alpine/edge/main
 RUN git config --global --add safe.directory /srv/wikigdrive/*
 
+HEALTHCHECK --interval=5m --timeout=3s CMD curl -f http://localhost:3000 || exit 1
+
 CMD [ "sh", "-c", "wikigdrive --workdir /data server 3000" ]

src/LinkTranslator.ts

@@ -53,7 +53,7 @@ export function convertToRelativeSvgPath(localPath: string, basePath: string) {
   if (basePath === localPath) return '.';
 
   const host = '//example.com/';
-  convertExtension(decodeURIComponent(relateUrl(host + basePath, host + localPath)), 'dirURLs');
+  return convertExtension(decodeURIComponent(relateUrl(host + basePath, host + localPath)), 'dirURLs');
 }
 
 export function convertToAbsolutePath(fullPath: string, relativePath: string) {

src/containers/job/worker.ts

@@ -1,4 +1,5 @@
 import {parentPort} from 'node:worker_threads';
+import fs from 'node:fs';
 import {executeOdtToMarkdown} from '../../odt/executeOdtToMarkdown.ts';
 
 parentPort.on('message', async (msg) => {
@@ -13,7 +14,11 @@ parentPort.on('message', async (msg) => {
 
     parentPort.postMessage({ err: new Error('Unhandled worker message: ' + type) });
   } catch (err) {
-    console.error(err);
+    console.error(err, msg.payload);
     parentPort.postMessage({ err });
+    if (err.message.indexOf('Corrupted zip') > -1) {
+      console.info('Corrupted zip, removing file: ', msg.payload.odtPath);
+      fs.unlinkSync(msg.payload.odtPath);
+    }
   }
 });

src/containers/transform/TaskLocalFileTransform.ts

@@ -162,11 +162,7 @@ export class TaskLocalFileTransform extends QueueTask {
 
       const converter = new OdtToMarkdown(document, styles, fileNameMap, xmlMap);
       converter.setRewriteRules(rewriteRules);
-      if (this.realFileName === '_index.md') {
-        converter.setPicturesDir('./' + this.realFileName.replace(/.md$/, '.assets/'), picturesDirAbsolute);
-      } else {
-        converter.setPicturesDir('../' + this.realFileName.replace(/.md$/, '.assets/'), picturesDirAbsolute);
-      }
+      converter.setPicturesDir('./' + this.realFileName.replace(/.md$/, '.assets/'), picturesDirAbsolute);
       headersMap = converter.getHeadersMap();
       invisibleBookmarks = converter.getInvisibleBookmarks();
       markdown = await converter.convert();

src/odt/executeOdtToMarkdown.ts

@@ -28,11 +28,7 @@ export async function executeOdtToMarkdown(workerData) {
 
   const converter = new OdtToMarkdown(document, styles, fileNameMap, xmlMap);
   converter.setRewriteRules(workerData.rewriteRules);
-  if (workerData.realFileName === '_index.md') {
-    converter.setPicturesDir('./' + workerData.realFileName.replace(/.md$/, '.assets/'), workerData.picturesDirAbsolute);
-  } else {
-    converter.setPicturesDir('../' + workerData.realFileName.replace(/.md$/, '.assets/'), workerData.picturesDirAbsolute);
-  }
+  converter.setPicturesDir('./' + workerData.realFileName.replace(/.md$/, '.assets/'), workerData.picturesDirAbsolute);
   const markdown = await converter.convert();
   const links = Array.from(converter.links);
 

website/public/assets/layout.css

@@ -7,6 +7,10 @@ body,
   height: 100vh;
 }
 
+body {
+  min-width: 300px !important;
+}
+
 #main {
   display: flex;
   flex-direction: column;