Merge 74d5526 into 6755024

borevitzlab · Jun 20, 2014 · 65cbda2 · 65cbda2
2 parents 6755024 + 74d5526
commit 65cbda2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/exif2timestream.py b/exif2timestream.py
@@ -24,6 +24,7 @@
 FULLRES_CONSTANTS = {"original", "orig", "fullres"}
 IMAGE_TYPE_CONSTANTS = {"raw", "jpg"}
 RAW_FORMATS = {"cr2", "nef", "tif", "tiff"}
+DATE_NOW_CONSTANTS = {"now", "current"}
 CLI_OPTS = """
 USAGE:
     exif2timestream.py [-t PROCESSES -1 -d -l LOGDIR] -c CAM_CONFIG_CSV
@@ -109,6 +110,8 @@ def date(x):
         if isinstance(x, struct_time):
             return x
         else:
+            if x.lower() in DATE_NOW_CONSTANTS:
+                return NOW
             try:
                 return strptime(x, "%Y_%m_%d")
             except:

diff --git a/setup.py b/setup.py
@@ -20,7 +20,7 @@
 setup(
     name="exif2timestream",
     py_modules=['exif2timestream', ],
-    version="0.2.6",
+    version="0.2.7",
     install_requires=install_requires,
     tests_require=test_requires,
     description=desc,