projects
/
kiosk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
More cleanup.
[kiosk.git]
/
gkeep_renderer.py
diff --git
a/gkeep_renderer.py
b/gkeep_renderer.py
index d05a24b2defd66f302cafa65b0c82096dd724620..b639ed2794ad6afff3f73a1a9bc29f678f3227a9 100644
(file)
--- a/
gkeep_renderer.py
+++ b/
gkeep_renderer.py
@@
-1,11
+1,11
@@
#!/usr/bin/env python3
#!/usr/bin/env python3
-import
gkeepapi # type: ignore
+import
logging
import os
import re
import os
import re
-from typing import
List,
Dict
+from typing import Dict
-from google_auth_oauthlib.flow import InstalledAppFlow
+import gkeepapi # type: ignore
import constants
import file_writer
import constants
import file_writer
@@
-13,9
+13,12
@@
import renderer
import kiosk_secrets as secrets
import kiosk_secrets as secrets
-class gkeep_renderer(renderer.debuggable_abstaining_renderer):
+logger = logging.getLogger(__file__)
+
+
+class gkeep_renderer(renderer.abstaining_renderer):
def __init__(self, name_to_timeout_dict: Dict[str, int]) -> None:
def __init__(self, name_to_timeout_dict: Dict[str, int]) -> None:
- super(
gkeep_renderer, self).__init__(name_to_timeout_dict, True
)
+ super(
).__init__(name_to_timeout_dict
)
self.colors_by_name = {
"white": "#002222",
"green": "#345920",
self.colors_by_name = {
"white": "#002222",
"green": "#345920",
@@
-35,9
+38,9
@@
class gkeep_renderer(renderer.debuggable_abstaining_renderer):
secrets.google_keep_username, secrets.google_keep_password
)
if success:
secrets.google_keep_username, secrets.google_keep_password
)
if success:
-
self.debug_print
("Connected with gkeep.")
+
logger.debug
("Connected with gkeep.")
else:
else:
-
self.debug_print
("Error connecting with gkeep.")
+
logger.debug
("Error connecting with gkeep.")
def debug_prefix(self) -> str:
return "gkeep"
def debug_prefix(self) -> str:
return "gkeep"
@@
-55,10
+58,10
@@
class gkeep_renderer(renderer.debuggable_abstaining_renderer):
filename = f"{title}_2_3600.html"
contents = note.text + "\n"
filename = f"{title}_2_3600.html"
contents = note.text + "\n"
-
self.debug_print
(f"Note title '{title}'")
+
logger.debug
(f"Note title '{title}'")
if contents != "" and not contents.isspace():
contents = strikethrough.sub("", contents)
if contents != "" and not contents.isspace():
contents = strikethrough.sub("", contents)
-
self.debug_print
(f"Note contents:\n{contents}")
+
logger.debug
(f"Note contents:\n{contents}")
contents = contents.replace(
"\u2610 ", '<LI><INPUT TYPE="checkbox"> '
)
contents = contents.replace(
"\u2610 ", '<LI><INPUT TYPE="checkbox"> '
)
@@
-76,7
+79,7
@@
class gkeep_renderer(renderer.debuggable_abstaining_renderer):
leading_spaces //= 2
leading_spaces = int(leading_spaces)
x = x.lstrip(" ")
leading_spaces //= 2
leading_spaces = int(leading_spaces)
x = x.lstrip(" ")
- #
self.debug_print
(" * (%d) '%s'" % (leading_spaces, x))
+ #
logger.debug
(" * (%d) '%s'" % (leading_spaces, x))
for y in range(0, leading_spaces):
x = "<UL>" + x
for y in range(0, leading_spaces):
for y in range(0, leading_spaces):
x = "<UL>" + x
for y in range(0, leading_spaces):
@@
-88,7
+91,7
@@
class gkeep_renderer(renderer.debuggable_abstaining_renderer):
if color in list(self.colors_by_name.keys()):
color = self.colors_by_name[color]
else:
if color in list(self.colors_by_name.keys()):
color = self.colors_by_name[color]
else:
-
self.debug_print
(f"Unknown color '{color}'")
+
logger.debug
(f"Unknown color '{color}'")
print(f"TITLE: {color} {note.title}")
with file_writer.file_writer(filename) as f:
f.write("""
print(f"TITLE: {color} {note.title}")
with file_writer.file_writer(filename) as f:
f.write("""
@@
-105,7
+108,7
@@
class gkeep_renderer(renderer.debuggable_abstaining_renderer):
"""
)
if num_lines >= 12 and max_length < 120:
"""
)
if num_lines >= 12 and max_length < 120:
-
self.debug_print
(
+
logger.debug
(
f"{num_lines} lines (max={max_length} chars): two columns"
)
f.write('<TABLE BORDER=0 WIDTH=100%><TR valign="top">')
f"{num_lines} lines (max={max_length} chars): two columns"
)
f.write('<TABLE BORDER=0 WIDTH=100%><TR valign="top">')
@@
-125,13
+128,13
@@
class gkeep_renderer(renderer.debuggable_abstaining_renderer):
f.write("<FONT><UL STYLE='list-style-type:none'>")
f.write("</UL></FONT></TD></TR></TABLE></DIV>\n")
else:
f.write("<FONT><UL STYLE='list-style-type:none'>")
f.write("</UL></FONT></TD></TR></TABLE></DIV>\n")
else:
-
self.debug_print
(
+
logger.debug
(
f"{num_lines} lines (max={max_length} chars): one column"
)
f.write(f"<FONT><UL>{contents}</UL></FONT>")
f.write("</DIV>")
else:
f"{num_lines} lines (max={max_length} chars): one column"
)
f.write(f"<FONT><UL>{contents}</UL></FONT>")
f.write("</DIV>")
else:
-
self.debug_print
(f"Note is empty, deleting {filename}.")
+
logger.debug
(f"Note is empty, deleting {filename}.")
_ = os.path.join(constants.pages_dir, filename)
try:
os.remove(_)
_ = os.path.join(constants.pages_dir, filename)
try:
os.remove(_)