From 1f7b6fe2ccec94c376347dcad697fc577d96a4c2 Mon Sep 17 00:00:00 2001
From: Andreas Domanowski <andreas@domanowski.net>
Date: Wed, 1 Mar 2023 13:01:06 +0100
Subject: [PATCH] Add check whether archive file exists

---
 codimd_export.py    | 3 ++-
 hedgedoc_import.py  | 9 +++++++++
 md-import-export.py | 4 +++-
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/codimd_export.py b/codimd_export.py
index cf3f0b7..dbb3c25 100755
--- a/codimd_export.py
+++ b/codimd_export.py
@@ -24,7 +24,8 @@ def prepare_target_dir(pathname):
     """Create the directory to dump documents to, but refuse to override an existing one."""
     target_dir = Path(pathname)
     if target_dir.exists():
-        raise SystemExit(f"error: the target directory {target_dir} already exists")
+        raise SystemExit(f"ERROR: the target directory {target_dir} already exists. Delete it, then re-execute this "
+                         f"script")
     target_dir.mkdir()
     return target_dir
 
diff --git a/hedgedoc_import.py b/hedgedoc_import.py
index 78936ae..f8dff84 100644
--- a/hedgedoc_import.py
+++ b/hedgedoc_import.py
@@ -33,7 +33,16 @@ def import_single_document(instance_url, hedgedoc_free_url, content, session_id)
         return response.url
 
 
+def check_archive_exists(archive_file):
+    if not os.path.exists(archive_file):
+        raise SystemExit(
+            f"ERROR: File {archive_file} does not exist. Export your data from CodiMD and re-execute this script again!"
+            f" Aborting...")
+
+
 def import_into_hedgedoc(instance_url, session_id, export_folder, archive_file):
+    print("Beginning import")
+    check_archive_exists(archive_file)
     check_accessibility(instance_url, session_id)
     # let user select browser
     browser = select_browser()
diff --git a/md-import-export.py b/md-import-export.py
index 5ef7654..6c66b81 100644
--- a/md-import-export.py
+++ b/md-import-export.py
@@ -4,5 +4,7 @@ from hedgedoc_import import import_into_hedgedoc
 
 if __name__ == "__main__":
     export_folder = "codimd-documents"
+    export_archive = "archive.zip"
     export_from_codimd("http://localhost:3001", get_sessionid("CodiMD", "connect.sid"), export_folder)
-    import_into_hedgedoc("http://hedgedoc:3000", get_sessionid("HedgeDoc", "connect.hedgeDoc.sid"), export_folder, "archive.zip")
+    import_into_hedgedoc("http://hedgedoc:3000", get_sessionid("HedgeDoc", "connect.hedgeDoc.sid"), export_folder,
+                         export_archive)
-- 
GitLab