Merge branch 'master' of ssh://git.house:/usr/local/git/base/kiosk

[kiosk.git] / gkeep_renderer.py

diff --git a/gkeep_renderer.py b/gkeep_renderer.py
index 443abc10e8e4c89a1037c3dc88a0fa9e234e0eb1..c07ebd6a4c060cfb3f02a64001ed79528296b8e4 100644 (file)
--- a/gkeep_renderer.py
+++ b/gkeep_renderer.py
@@ -7,7 +7,7 @@ from typing import Dict
 
 import gkeepapi  # type: ignore
 
-import constants
+import kiosk_constants
 import file_writer
 import renderer
 import kiosk_secrets as secrets
@@ -35,7 +35,9 @@ class gkeep_renderer(renderer.abstaining_renderer):
         }
         self.keep = gkeepapi.Keep()
         success = self.keep.login(
-            secrets.google_keep_username, secrets.google_keep_password
+            secrets.google_keep_username,
+            secrets.google_keep_password,
+            secrets.google_keep_mac,
         )
         if success:
             logger.debug("Connected with gkeep.")
@@ -47,7 +49,7 @@ class gkeep_renderer(renderer.abstaining_renderer):
 
     def periodic_render(self, key: str) -> bool:
         strikethrough = re.compile("(\u2611[^\n]*)\n", re.UNICODE)
-        linkify = re.compile(r".*(https?:\/\/\S+).*")
+        #linkify = re.compile(r".*(https?:\/\/\S+).*")
 
         self.keep.sync()
         result_list = self.keep.find(labels=[self.keep.findLabel("kiosk")])
@@ -65,13 +67,12 @@ class gkeep_renderer(renderer.abstaining_renderer):
                 contents = contents.replace(
                     "\u2610 ", '<LI><INPUT TYPE="checkbox">&nbsp;'
                 )
-                contents = linkify.sub(r'<a href="\1">\1</a>', contents)
+                #contents = linkify.sub(r'<a href="\1">\1</a>', contents)
 
                 individual_lines = contents.split("\n")
                 num_lines = len(individual_lines)
                 contents = ""
                 for x in individual_lines:
-                    length = len(x)
                     leading_spaces = len(x) - len(x.lstrip(" "))
                     leading_spaces //= 2
                     leading_spaces = int(leading_spaces)
@@ -104,7 +105,7 @@ class gkeep_renderer(renderer.abstaining_renderer):
 <HR style="border-top:3px solid white;">
 """
                             )
-                    if num_lines >= 12:
+                    if num_lines >= 10:
                         logger.debug(
                             f"{num_lines} lines: two column mode"
                         )
@@ -132,7 +133,7 @@ class gkeep_renderer(renderer.abstaining_renderer):
                     f.write("</DIV>")
             else:
                 logger.debug(f"Note is empty, deleting {filename}.")
-                _ = os.path.join(constants.pages_dir, filename)
+                _ = os.path.join(kiosk_constants.pages_dir, filename)
                 try:
                     os.remove(_)
                 except:
@@ -141,5 +142,11 @@ class gkeep_renderer(renderer.abstaining_renderer):
 
 
 # Test
+#logger.setLevel(logging.DEBUG)
+#ch = logging.StreamHandler()
+#ch.setLevel(logging.DEBUG)
+#formatter = logging.Formatter('%(asctime)s - %(name)s - %(levelname)s - %(message)s')
+#ch.setFormatter(formatter)
+#logger.addHandler(ch)
 #x = gkeep_renderer({"Test", 1234})
 #x.periodic_render("Test")