Paging, line splitting, date validation, new background. Ready for testing.

Author: Alvaro Figueroa

PyPortal_Electioncal_US/code.py

@@ -18,8 +18,10 @@
     print("WiFi secrets are kept in secrets.py, please add them there!")
     raise
 
-STATE="hawaii"
-COUNTY="hawaii"
+#STATE="puerto_rico"
+#COUNTY="aguada"
+STATE="texas"
+COUNTY="andrews"
 
 DATA_SOURCE = "https://electioncal.us/en/" + STATE +"/" + COUNTY + "/voter.json"
 DATA_LOCATION = []
@@ -31,8 +33,8 @@
                     status_neopixel=board.NEOPIXEL,
                     default_bg=0x000000)
 
-gfx = electioncal_graphics.Electioncal_Graphics(pyportal.splash, am_pm=True)
 
+gfx = electioncal_graphics.Electioncal_Graphics(pyportal.splash, am_pm=True)
 display_refresh = None
 while True:
     # only query the online time once per hour (and on first run)
@@ -47,17 +49,21 @@
 
         try:
             value = pyportal.fetch()
-            print("Response is", value)
-            gfx.display_elections(value, STATE, COUNTY)
+            #print("Response is", value)
+            gfx.load_data(value)
         except RuntimeError as e:
             print("Some error occured, retrying! -", e)
             continue
+    try:
+        gfx.elections_cycle()
+    except RuntimeError as e:
+        print("Some error ocurred, retrying! -", e)
+        continue
 
-    gfx.update_time()
     # Optional: to take screenshot to SD card
     #storage.remount("/", False)
     #print('Taking Screenshot...')
     #save_pixels('/screenshot.bmp')
     #print('Screenshot taken')
 
-    time.sleep(60)  # wait 60 seconds before updating anything again
+    #time.sleep(60)  # wait 60 seconds before updating anything again

PyPortal_Electioncal_US/electioncal_graphics.py

@@ -21,14 +21,21 @@ def __init__(self, root_group, *, am_pm=True):
 
         self._icon_sprite = None
         self._icon_file = None
-        self.set_icon(cwd+"/icons/us-sat.bmp")
+        self.set_icon(cwd+"/icons/electioncal.bmp")
 
         self.small_font = bitmap_font.load_font(small_font)
         self.medium_font = bitmap_font.load_font(medium_font)
         glyphs = b'0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ-,.: '
         self.small_font.load_glyphs(glyphs)
         self.medium_font.load_glyphs(glyphs)
 
+        self.url_text = Label(self.small_font, max_glyphs=35)
+        self.url_text.x = 10
+        self.url_text.y = 195
+        self.url_text.color = 0xFFFFFF
+        self._text_group.append(self.url_text)
+        self.url_text.text = "Visit us at https://electioncal.us"
+
         self.date_text = Label(self.small_font, max_glyphs=21)
         self.date_text.x = 10
         self.date_text.y = 220
@@ -41,46 +48,39 @@ def __init__(self, root_group, *, am_pm=True):
         self.state_text.color = 0xFFFFFF
         self._text_group.append(self.state_text)
 
-        self.county_text = Label(self.small_font, max_glyphs=60)
-        self.county_text.x = 10
-        self.county_text.y = 35
-        self.county_text.color = 0xFFFFFF
-        self._text_group.append(self.county_text)
-
-        self.date0_name_text = Label(self.small_font, max_glyphs=60)
-        self.date0_name_text.x = 10
-        self.date0_name_text.y = 80
-        self.date0_name_text.color = 0xFFFFFF
-        self._text_group.append(self.date0_name_text)
-
-        self.date0_date_text = Label(self.medium_font, max_glyphs=11)
-        self.date0_date_text.x = 10
-        self.date0_date_text.y = 105
-        self.date0_date_text.color = 0xFFFFFF
-        self._text_group.append(self.date0_date_text)
-
-        self.date1_name_text = Label(self.small_font, max_glyphs=60)
-        self.date1_name_text.x = 10
-        self.date1_name_text.y = 140
-        self.date1_name_text.color = 0xFFFFFF
-        self._text_group.append(self.date1_name_text)
-
-        self.date1_date_text = Label(self.medium_font, max_glyphs=11)
-        self.date1_date_text.x = 10
-        self.date1_date_text.y = 165
-        self.date1_date_text.color = 0xFFFFFF
-        self._text_group.append(self.date1_date_text)
-
-    def display_elections(self, electioncal_data, STATE, COUNTY):
-        electioncal = json.loads(electioncal_data)
+        self.election_date_text = Label(self.medium_font, max_glyphs=11)
+        self.election_date_text.x = 10
+        self.election_date_text.y = 60
+        self.election_date_text.color = 0xFFFFFF
+        self._text_group.append(self.election_date_text)
+
+        self.election_name_text = Label(self.small_font, max_glyphs=60)
+        self.election_name_text.x = 10
+        self.election_name_text.y = 95
+        self.election_name_text.color = 0xFFFFFF
+        self._text_group.append(self.election_name_text)
+
+        self.election_name_text_line2 = Label(self.small_font, max_glyphs=60)
+        self.election_name_text_line2.x = 10
+        self.election_name_text_line2.y = 120
+        self.election_name_text_line2.color = 0xFFFFFF
+        self._text_group.append(self.election_name_text_line2)
+
 
+    def load_data(self, election_data):
+        self.electioncal = json.loads(election_data)
+        self.state_text.text = self.electioncal["dates"][0]["state"] + " State, " + self.electioncal["dates"][1]["county"]
+
+    def elections_cycle(self):
         self.update_time()
-        self.state_text.text = "State: " + STATE
-        self.county_text.text = "County: " + COUNTY
-        self.date0_name_text.text = electioncal["dates"][0]["name"]
-        self.date0_date_text.text = electioncal["dates"][0]["date"]
-        self.date1_name_text.text = electioncal["dates"][1]["name"]
-        self.date1_date_text.text = electioncal["dates"][1]["date"]
+        num_elections = len(self.electioncal["dates"])
+
+        for i in range(0,num_elections):
+            if self.date_text.text[10:] < self.electioncal["dates"][i]["date"]:
+                self.election_date_text.text = self.electioncal["dates"][i]["date"]
+                # splitting the line at around 40 chars seems ok for regular PyPortal
+                self.election_name_text_line2.text, self.election_name_text.text = self.paragrapher(self.electioncal["dates"][i]["name"], 40)
+                time.sleep(4)
 
     def update_time(self):
         """Fetch the time.localtime(), parse it out and update the display text"""
@@ -104,6 +104,23 @@ def update_time(self):
         date_str = date_format_str % (year, month, day)
         self.date_text.text = "Today is: " + date_str
 
+    def paragrapher(self, text, cut):
+        """ Cuts a long line into two, having spaces in mind.
+        Note we return line2 first as it looks better to clear the line2
+        before printing a line1 with empty line2
+        We run from cut, backwards till we find a space.
+        """
+        if len(text) > cut:
+            for i in range(cut,0,-1):
+                if text[i] == " ":
+                    break
+            line1 = text[0:i]
+            line2 = text[i+1:80]
+        else:
+            line1 = text
+            line2 = ""
+        return line2, line1
+
     def set_icon(self, filename):
         """The background image to a bitmap file.
 
@@ -127,4 +144,4 @@ def set_icon(self, filename):
             self._icon_sprite = displayio.TileGrid(icon,
                                                    pixel_shader=displayio.ColorConverter(),
                                                    position=(0,0))
-        self._icon_group.append(self._icon_sprite)
+        self._icon_group.append(self._icon_sprite)