diff --git a/codimd_export.py b/codimd_export.py index cf3f0b7afd8d1292f4a7980d5cb9340c250b8563..dbb3c257963cc7a83d6a738079e884febfbe3ec6 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 78936aef267169323b96d643d9bede42e430be3a..f8dff8499da6bf37508385eea8e42360d5966e70 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 5ef76543f44789041e7bb030850cbeb101403668..6c66b8139d45dcf0f9b55b5721caaac18879d0a8 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)