From 4f85b77be4043ea278d6bdef17fe95be6b02b409 Mon Sep 17 00:00:00 2001 From: lady ada Date: Fri, 13 Nov 2020 19:35:29 -0500 Subject: [PATCH 1/2] remove broken ip address print during debug add '...' when strings are too long --- adafruit_magtag/magtag.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/adafruit_magtag/magtag.py b/adafruit_magtag/magtag.py index 2c1e846..8f83b2c 100755 --- a/adafruit_magtag/magtag.py +++ b/adafruit_magtag/magtag.py @@ -235,7 +235,10 @@ def set_text(self, val, index=0, auto_refresh=True): self.add_text() string = str(val) if self._text_maxlen[index]: - string = string[: self._text_maxlen[index]] + if len(string) > self._text_maxlen[index]: + # too long! shorten it + string = string[: self._text_maxlen[index]-3] + string += '...' print("text index", self._text[index]) index_in_splash = None @@ -350,7 +353,7 @@ def fetch(self, refresh_url=None, timeout=10): print("Drawing text", string) if self._text_wrap[i]: if self._debug: - print("Wrapping text") + print("Wrapping text with length of", self._text_wrap[i]) lines = self.wrap_nicely(string, self._text_wrap[i]) string = "\n".join(lines) self.set_text(string, index=i, auto_refresh=False) @@ -396,8 +399,8 @@ def url(self, value): self._url = value if value and not self.network.uselocal: self.network.connect() - if self._debug: - print("My IP address is", self.network.ip_address) + #if self._debug: + # print("My IP address is", self.network.ip_address) @property def json_path(self): From f9a478a10ec70a92d06b1138354e65c89562a8d1 Mon Sep 17 00:00:00 2001 From: lady ada Date: Fri, 13 Nov 2020 19:40:09 -0500 Subject: [PATCH 2/2] black --- adafruit_magtag/magtag.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/adafruit_magtag/magtag.py b/adafruit_magtag/magtag.py index 8f83b2c..46b98c6 100755 --- a/adafruit_magtag/magtag.py +++ b/adafruit_magtag/magtag.py @@ -237,8 +237,8 @@ def set_text(self, val, index=0, auto_refresh=True): if self._text_maxlen[index]: if len(string) > self._text_maxlen[index]: # too long! shorten it - string = string[: self._text_maxlen[index]-3] - string += '...' + string = string[: self._text_maxlen[index] - 3] + string += "..." print("text index", self._text[index]) index_in_splash = None @@ -399,7 +399,7 @@ def url(self, value): self._url = value if value and not self.network.uselocal: self.network.connect() - #if self._debug: + # if self._debug: # print("My IP address is", self.network.ip_address) @property