Check if dir exists before deleting; 0.4.2 (#56)

hfaran · Mar 21, 2018 · 045a687 · 045a687
1 parent 80138f3
commit 045a687
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -7,3 +7,5 @@ install:
     - "pip install -r dev-requirements.txt"
 script:
     - python app.py -z tests/testarchive.zip --test
+    - python cli.py clean
+    - python cli.py clean -w
diff --git a/slackviewer/__init__.py b/slackviewer/__init__.py
@@ -1 +1 @@
-__version__ = "0.4.1"
+__version__ = "0.4.2"
diff --git a/slackviewer/cli.py b/slackviewer/cli.py
@@ -1,6 +1,8 @@
 import click
 import shutil
 
+import os
+
 from slackviewer.constants import SLACKVIEWER_TEMP_PATH
 from slackviewer.utils.click import envvar, flag_ennvar
 
@@ -16,7 +18,10 @@ def cli():
               help="Actually performs file deletion")
 def clean(wet):
     if wet:
-        print("Removing {}...".format(SLACKVIEWER_TEMP_PATH))
-        shutil.rmtree(SLACKVIEWER_TEMP_PATH)
+        if os.path.exists(SLACKVIEWER_TEMP_PATH):
+            print("Removing {}...".format(SLACKVIEWER_TEMP_PATH))
+            shutil.rmtree(SLACKVIEWER_TEMP_PATH)
+        else:
+            print("Nothing to remove! {} does not exist.".format(SLACKVIEWER_TEMP_PATH))
     else:
         print("Run with -w to remove {}".format(SLACKVIEWER_TEMP_PATH))