From 9c90a0fa33f87cd3eeeb960bd1b8ea9e246a460e Mon Sep 17 00:00:00 2001
From: Micah Lee <micah@micahflee.com>
Date: Thu, 9 Apr 2020 13:58:22 -0700
Subject: [PATCH] Rename dangerzone-container commands to remove hiphens and
 underscores, because old and new versions of click treat them differently

---
 dangerzone/container.py        | 6 +++---
 dangerzone/docker_installer.py | 2 +-
 dangerzone/gui.py              | 4 +---
 dangerzone/settings_widget.py  | 6 +-----
 dangerzone/tasks.py            | 4 ++--
 5 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/dangerzone/container.py b/dangerzone/container.py
index 878e10b..ab1bd98 100644
--- a/dangerzone/container.py
+++ b/dangerzone/container.py
@@ -52,7 +52,7 @@ def container_main():
 
 @container_main.command()
 @click.option("--container-name", default="flmcode/dangerzone")
-def image_ls(container_name):
+def ls(container_name):
     """docker image ls [container_name]"""
     sys.exit(exec_container(["image", "ls", container_name]))
 
@@ -67,7 +67,7 @@ def pull():
 @click.option("--document-filename", required=True)
 @click.option("--pixel-dir", required=True)
 @click.option("--container-name", default="flmcode/dangerzone")
-def document_to_pixels(document_filename, pixel_dir, container_name):
+def documenttopixels(document_filename, pixel_dir, container_name):
     """docker run --network none -v [document_filename]:/tmp/input_file -v [pixel_dir]:/dangerzone [container_name] document-to-pixels"""
     sys.exit(
         exec_container(
@@ -92,7 +92,7 @@ def document_to_pixels(document_filename, pixel_dir, container_name):
 @click.option("--container-name", default="flmcode/dangerzone")
 @click.option("--ocr", required=True)
 @click.option("--ocr-lang", required=True)
-def pixels_to_pdf(pixel_dir, safe_dir, container_name, ocr, ocr_lang):
+def pixelstopdf(pixel_dir, safe_dir, container_name, ocr, ocr_lang):
     """docker run --network none -v [pixel_dir]:/dangerzone -v [safe_dir]:/safezone [container_name] -e OCR=[ocr] -e OCR_LANGUAGE=[ocr_lang] pixels-to-pdf"""
     sys.exit(
         exec_container(
diff --git a/dangerzone/docker_installer.py b/dangerzone/docker_installer.py
index db07a23..6a7596d 100644
--- a/dangerzone/docker_installer.py
+++ b/dangerzone/docker_installer.py
@@ -33,7 +33,7 @@ def is_docker_installed(global_common):
 
 def is_docker_ready(global_common):
     # Run `docker image ls` without an error
-    with global_common.exec_dangerzone_container(["image-ls"]) as p:
+    with global_common.exec_dangerzone_container(["ls"]) as p:
         p.communicate()
 
         # The user canceled, or permission denied
diff --git a/dangerzone/gui.py b/dangerzone/gui.py
index 9d2d7db..ec83a1e 100644
--- a/dangerzone/gui.py
+++ b/dangerzone/gui.py
@@ -52,9 +52,7 @@ def gui_main(custom_container, filename):
 
     if custom_container:
         # Do we have this container?
-        with global_common.exec_dangerzone_container(
-            ["image-ls", "--container-name", custom_container]
-        ) as p:
+        with global_common.exec_dangerzone_container(["ls", custom_container]) as p:
             stdout_data, stderr_data = p.communicate()
 
             # The user canceled, or permission denied
diff --git a/dangerzone/settings_widget.py b/dangerzone/settings_widget.py
index ec7305c..c3cbfc3 100644
--- a/dangerzone/settings_widget.py
+++ b/dangerzone/settings_widget.py
@@ -143,11 +143,7 @@ class SettingsWidget(QtWidgets.QWidget):
             self.update_checkbox.hide()
         else:
             with self.global_common.exec_dangerzone_container(
-                [
-                    "image-ls",
-                    "--container-name",
-                    self.global_common.get_container_name(),
-                ]
+                ["ls", self.global_common.get_container_name(),]
             ) as p:
                 stdout_data, stderror_data = p.communicate()
 
diff --git a/dangerzone/tasks.py b/dangerzone/tasks.py
index 1398203..e3aaea0 100644
--- a/dangerzone/tasks.py
+++ b/dangerzone/tasks.py
@@ -72,7 +72,7 @@ class ConvertToPixels(TaskBase):
     def run(self):
         self.update_label.emit("Converting document to pixels")
         args = [
-            "document-to-pixels",
+            "documenttopixels",
             "--document-filename",
             self.common.document_filename,
             "--pixel-dir",
@@ -173,7 +173,7 @@ class ConvertToPDF(TaskBase):
         ]
 
         args = [
-            "pixels-to-pdf",
+            "pixelstopdf",
             "--pixel-dir",
             self.common.pixel_dir.name,
             "--safe-dir",