utcnow and localnow

Author: jm289765

h2o/config.py

@@ -156,11 +156,12 @@ def make_format_info_labels(self):
             "notes", "date",
             "localdate", "time",
             "localtime", "datetime",
-            "localdatetime", "day",
+            "localdatetime", "timezone",
+            "utcoffset", "day",
             "localday", "month",
             "localmonth", "year",
-            "localyear", "timezone",
-            "utcoffset", "url",
+            "localyear", "utcnow",
+            "localnow", "url",
             "location", "timestamp",
             "bookid", "uuid",
         ]
@@ -182,7 +183,8 @@ def make_format_info_labels(self):
             self.note_format_list_labels.append(label)
             self.l.addWidget(label)
 
-        time_note = QLabel("Note that times are the time the highlight was made, not the current time.")
+        time_note = QLabel("Note that times are the time the highlight was made, not the current time " + \
+                           "(except 'utcnow' and 'localnow').")
         self.l.addWidget(time_note)
 
     def save_settings(self):

h2o/highlight_sender.py

@@ -108,6 +108,7 @@ def format_blockquote(text: str) -> str:
     h_time = datetime.datetime.strptime(annot["timestamp"][:19], "%Y-%m-%dT%H:%M:%S")
     h_local = h_time + h_time.astimezone(datetime.datetime.now().tzinfo).utcoffset()
     local = time.localtime()
+    utc = time.gmtime()
     title_authors = book_titles_authors.get(int(data["book_id"]), {})  # dict with {"title": str, "authors": Tuple[str]}
     utc_offset = ("" if local.tm_gmtoff < 0 else "+") + str(local.tm_gmtoff // 3600) + ":00"
 
@@ -139,6 +140,8 @@ def format_blockquote(text: str) -> str:
         "localmonth": str(h_local.month),
         "year": str(h_time.year),
         "localyear": str(h_local.year),
+        "utcnow": time.strftime("%Y-%m-%d %H:%M:%S", utc),
+        "localnow": time.strftime("%Y-%m-%d %H:%M:%S", local),
         "url": url_format.format(**url_args),  # calibre:// url to open ebook viewer to this highlight
         "location": url_args["location"],  # epub cfi location of this highlight
         "timestamp": h_time.timestamp(),  # Unix timestamp of highlight time. uses UTC.