projects
/
kiosk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Various changes including adding new stevens renderer.
[kiosk.git]
/
gkeep_renderer.py
diff --git
a/gkeep_renderer.py
b/gkeep_renderer.py
index b639ed2794ad6afff3f73a1a9bc29f678f3227a9..f910e309a4ef62771d4d67d3998b0f961bc04ba2 100644
(file)
--- a/
gkeep_renderer.py
+++ b/
gkeep_renderer.py
@@
-7,7
+7,7
@@
from typing import Dict
import gkeepapi # type: ignore
import gkeepapi # type: ignore
-import constants
+import
kiosk_
constants
import file_writer
import renderer
import kiosk_secrets as secrets
import file_writer
import renderer
import kiosk_secrets as secrets
@@
-65,16
+65,13
@@
class gkeep_renderer(renderer.abstaining_renderer):
contents = contents.replace(
"\u2610 ", '<LI><INPUT TYPE="checkbox"> '
)
contents = contents.replace(
"\u2610 ", '<LI><INPUT TYPE="checkbox"> '
)
- 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)
individual_lines = contents.split("\n")
num_lines = len(individual_lines)
- max_length = 0
contents = ""
for x in individual_lines:
length = len(x)
contents = ""
for x in individual_lines:
length = len(x)
- if length > max_length:
- max_length = length
leading_spaces = len(x) - len(x.lstrip(" "))
leading_spaces //= 2
leading_spaces = int(leading_spaces)
leading_spaces = len(x) - len(x.lstrip(" "))
leading_spaces //= 2
leading_spaces = int(leading_spaces)
@@
-107,9
+104,9
@@
class gkeep_renderer(renderer.abstaining_renderer):
<HR style="border-top:3px solid white;">
"""
)
<HR style="border-top:3px solid white;">
"""
)
- if num_lines >= 12
and max_length < 120
:
+ if num_lines >= 12:
logger.debug(
logger.debug(
- f"{num_lines} lines
(max={max_length} chars): two columns
"
+ f"{num_lines} lines
: two column mode
"
)
f.write('<TABLE BORDER=0 WIDTH=100%><TR valign="top">')
f.write(
)
f.write('<TABLE BORDER=0 WIDTH=100%><TR valign="top">')
f.write(
@@
-129,13
+126,13
@@
class gkeep_renderer(renderer.abstaining_renderer):
f.write("</UL></FONT></TD></TR></TABLE></DIV>\n")
else:
logger.debug(
f.write("</UL></FONT></TD></TR></TABLE></DIV>\n")
else:
logger.debug(
- f"{num_lines} lines
(max={max_length} chars): one column
"
+ f"{num_lines} lines
: one column mode
"
)
f.write(f"<FONT><UL>{contents}</UL></FONT>")
f.write("</DIV>")
else:
logger.debug(f"Note is empty, deleting {filename}.")
)
f.write(f"<FONT><UL>{contents}</UL></FONT>")
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:
try:
os.remove(_)
except:
@@
-144,5
+141,11
@@
class gkeep_renderer(renderer.abstaining_renderer):
# Test
# 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")
#x = gkeep_renderer({"Test", 1234})
#x.periodic_render("Test")