Merge branch 'main' into fix/publicip-exception

This commit is contained in:
Mihai Morariu 2022-02-14 16:19:43 +02:00
commit 283d47ff65
4 changed files with 58 additions and 8 deletions

View file

@ -16,13 +16,13 @@ class Module(core.module.Module):
self.__ip = ""
def public_ip(self, widget):
return self.__ip
return self.__ip or "n/a"
def update(self):
try:
self.__ip = util.location.public_ip()
except Exception:
self.__ip = "n/a"
self.__ip = None
# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4

View file

@ -55,7 +55,7 @@ class Module(core.module.Module):
self._state = []
self._newspaper_filename = tempfile.mktemp(".html")
self._newspaper_file = tempfile.NamedTemporaryFile(mode="w", suffix=".html")
self._last_refresh = 0
self._last_update = 0
@ -308,10 +308,11 @@ class Module(core.module.Module):
while newspaper_items:
content += self._create_news_section(newspaper_items)
open(self._newspaper_filename, "w").write(
self._newspaper_file.write(
HTML_TEMPLATE.replace("[[CONTENT]]", content)
)
webbrowser.open("file://" + self._newspaper_filename)
self._newspaper_file.flush()
webbrowser.open("file://" + self._newspaper_file.name)
self._update_history("newspaper")
self._save_history()