From b95e6fc7f8b7578ef36a9fce43976f230c3610e1 Mon Sep 17 00:00:00 2001
From: Tomas Beuzen <tomas.beuzen@gmail.com>
Date: Tue, 7 Jul 2020 07:38:07 -0700
Subject: [PATCH] patch some cli issues, bump version

---
 pyproject.toml         | 2 +-
 pywebcat/__init__.py   | 2 +-
 pywebcat/cli.py        | 7 +++++--
 tests/test_pywebcat.py | 2 +-
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index 76e2e6b..9faa4d6 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pywebcat"
-version = "0.1.3"
+version = "0.1.4"
 description = "Python tool for working with the NOAA NOS Web Camera Applications Testbed (WebCAT)"
 authors = ["Tomas Beuzen <tomas.beuzen@gmail.com>"]
 license = "MIT"
diff --git a/pywebcat/__init__.py b/pywebcat/__init__.py
index ae73625..bbab024 100644
--- a/pywebcat/__init__.py
+++ b/pywebcat/__init__.py
@@ -1 +1 @@
-__version__ = "0.1.3"
+__version__ = "0.1.4"
diff --git a/pywebcat/cli.py b/pywebcat/cli.py
index 21eee07..56994bb 100644
--- a/pywebcat/cli.py
+++ b/pywebcat/cli.py
@@ -21,7 +21,9 @@ def main():
     wc = WebCAT()
     for item in itertools.product(station, year, month, day, time):
         try:
+            sys.stdout = open(os.devnull, "w")  # capture any output from url generation
             wc.generate_url(*item)  # generate url from the input data
+            sys.stdout = sys.__stdout__  # reinstate output
             tmp_dir = os.path.join(directory, item[0], wc.name)  # dir to save frames in
             if not os.path.exists(tmp_dir):
                 os.makedirs(tmp_dir)  # mkdir if not exist
@@ -29,8 +31,9 @@ def main():
                 print(f"Saving frames of {wc.name}...")
             wc.save_frames(interval, tmp_dir, not no_meta, verbose)  # save frames
         except:
-            url = f"http://webcat-video.axds.co/{item[0]}/raw/{item[1]}/{item[1]}_{item[2]}/{item[1]}_{item[2]}_{item[3]}/{item[0]}.{item[1]}-{item[2]}-{item}_{item[4]}.mp4"
-            print(f"Warning: {url} not a valid url... Skipping.")
+            if verbose:
+                url = f"http://webcat-video.axds.co/{item[0]}/raw/{item[1]}/{item[1]}_{item[2]:02}/{item[1]}_{item[2]:02}_{item[3]:02}/{item[0]}.{item[1]}-{item[2]:02}-{item[3]:02}_{item[4]:04}.mp4"
+                print(f"Warning: {url} not a valid url... Skipping.")
 
 
 def parse_args():
diff --git a/tests/test_pywebcat.py b/tests/test_pywebcat.py
index f600421..4dfe1be 100644
--- a/tests/test_pywebcat.py
+++ b/tests/test_pywebcat.py
@@ -6,7 +6,7 @@
 
 
 def test_version():
-    assert __version__ == "0.1.3"
+    assert __version__ == "0.1.4"
 
 
 def test_generate_url():