Merge pull request #99 from d-kleine/master

fixed -d and -t flags
rasbt · Sep 22, 2024 · eb56c6a · eb56c6a
2 parents dca8d30 + 1c06e02
commit eb56c6a
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -175,6 +175,10 @@ In line with [NEP 29][nep-29], this project supports:
 
 [[top](#sections)]
 
+#### v. 2.5.1.dev1 (TBD)
+
+- Extra args to allow printing `-d` (current date) and `-t` (current time) information without needing to use the `-u` (updated) flag.  ([#99](https://github.com/rasbt/watermark/pull/99), via contribution by [Daniel Kleine](https://github.com/d-kleine))
+
 #### v. 2.5.0 (Sep 20, 2024)
 
 - Can now capture imports retrospectively via `-iv` more reliably.  ([#94](https://github.com/rasbt/watermark/pull/94), via contribution by [Martin Perier](https://github.com/martinp7))

diff --git a/watermark/watermark.py b/watermark/watermark.py
@@ -172,17 +172,27 @@ def watermark(
                 value = iso_dt
             else:
                 values = []
-                if args['current_date']:
-                    values.append(time.strftime("%Y-%m-%d"))
-                elif args['datename']:
-                    values.append(time.strftime("%a %b %d %Y"))
+                if args['current_date'] or args['datename']:
+                    if args['datename']:
+                        values.append(time.strftime("%a %b %d %Y"))
+                    else:
+                        values.append(time.strftime("%Y-%m-%d"))
                 if args['current_time']:
                     time_str = time.strftime("%H:%M:%S")
                     if args['timezone']:
                         time_str += time.strftime("%Z")
                     values.append(time_str)
                 value = " ".join(values)
             output.append({"Last updated": value})
+        elif args['current_date'] or args['current_time']:
+            if args['current_date'] and args['current_time']:
+                date_str = time.strftime("%Y-%m-%d")
+                time_str = time.strftime("%H:%M:%S")
+                output.append({"Date/Time": f"{date_str} {time_str}"})
+            elif args['current_date']:
+                output.append({"Date": time.strftime("%Y-%m-%d")})
+            elif args['current_time']:
+                output.append({"Time": time.strftime("%H:%M:%S")})
         if args['python']:
             output.append(_get_pyversions())
         if args['packages']: