Fix expired entry editing. Display local time instead of UTC.

Author: firecat53

docs/usage.md

@@ -37,8 +37,10 @@
     - Switch databases on the fly.
     - Alternate keyboard languages and layouts supported via xdotool or ydotool (for
       Wayland)
-    - Display of expiring/expired passwords and shows the expiration time where set
-    - Add, edit and type TOTP codes. RFC 6238, Steam and custom settings are supported.
+    - Display of expiring/expired passwords (expiring within 3 days) and shows
+      the expiration time where set.
+    - Add, edit and type TOTP codes. RFC 6238, Steam and custom settings are
+      supported.
       Supports TOTP attributes generated by [KeePass2][3], as well as [KeeOtp][4] and [TrayTOTP][5] plugins' [formats][6].
 - *Type entries*
     - Auto-type username and/or password on selection.

keepmenu/edit.py

@@ -1,7 +1,7 @@
 """Methods for editing entries and groups
 
 """
-from datetime import datetime
+from datetime import datetime, timezone
 import os
 import random
 from secrets import choice
@@ -17,6 +17,14 @@
 from keepmenu.type import type_text
 
 
+def format_expiry(expiry_time):
+    """Format expiry time for display (UTC to local, date-only if midnight)"""
+    local_time = expiry_time.astimezone()
+    if local_time.hour == 0 and local_time.minute == 0:
+        return local_time.strftime("%Y-%m-%d")
+    return local_time.strftime("%Y-%m-%d %H:%M")
+
+
 def add_entry(kpo):
     """Add Keepass entry
 
@@ -72,7 +80,7 @@ def edit_entry(kpo, kp_entry):
               str("TOTP: ******") if get_otp_url(kp_entry) else "TOTP: None",
               str(f"Url: {kp_entry.url}"),
               "Notes: <Enter to Edit>" if kp_entry.notes else "Notes: None",
-              str(f"Expiry time: {kp_entry.expiry_time.strftime('%Y-%m-%d %H:%M')}")
+              str(f"Expiry time: {format_expiry(kp_entry.expiry_time)}")
               if kp_entry.expires is True else "Expiry time: None"]
 
     attrs = kp_entry.custom_properties
@@ -192,7 +200,7 @@ def edit_expiry(kp_entry):
                        "Expiration Date (yyyy-mm-dd hh:mm OR "
                        "yyyy-mm-dd OR HH:MM OR "
                        "'None' to unset)",
-                       inp=kp_entry.expiry_time.strftime("%Y-%m-%d %H:%M") if
+                       inp=format_expiry(kp_entry.expiry_time) if
                            kp_entry.expires is True else "")
     if not sel:
         return True
@@ -207,13 +215,13 @@ def edit_expiry(kp_entry):
 
 
 def exp_date(dtime):
-    """Convert string to datetime
+    """Convert string to datetime (local time input, returns UTC)
 
     """
     formats = ["%Y-%m-%d %H:%M", "%Y-%m-%d", "%H:%M"]
     for fmt in formats:
         try:
-            return datetime.strptime(dtime, fmt)
+            return datetime.strptime(dtime, fmt).astimezone(timezone.utc)
         except ValueError:
             continue
     dmenu_err("Invalid format. No changes made")