From 888508d1c694252c2986e5b631a6333fab542867 Mon Sep 17 00:00:00 2001 From: Tobias Brunner Date: Sat, 27 Feb 2021 14:30:40 +0100 Subject: [PATCH] improve lodur einsatz detection --- pylokid/__init__.py | 2 +- pylokid/__main__.py | 5 ++++- pylokid/library/lodur.py | 7 ++++++- pylokid/main.py | 7 ------- pyproject.toml | 2 +- 5 files changed, 12 insertions(+), 11 deletions(-) diff --git a/pylokid/__init__.py b/pylokid/__init__.py index 5146f93..2ee739d 100644 --- a/pylokid/__init__.py +++ b/pylokid/__init__.py @@ -2,6 +2,6 @@ Pylokid. From Mail to Lodur - all automated. """ -__version__ = "3.0.0" +__version__ = "3.0.1" __git_version__ = "0" __url__ = "https://github.com/tobru/pylokid" diff --git a/pylokid/__main__.py b/pylokid/__main__.py index f215c72..614cdc6 100644 --- a/pylokid/__main__.py +++ b/pylokid/__main__.py @@ -4,4 +4,7 @@ Helper module to run not-installed version (via ``python3 -m pylokid``) from pylokid.main import main if __name__ == "__main__": - main() + try: + main() + except KeyboardInterrupt: + print("Byebye") diff --git a/pylokid/library/lodur.py b/pylokid/library/lodur.py index 02040d4..d13935b 100644 --- a/pylokid/library/lodur.py +++ b/pylokid/library/lodur.py @@ -69,7 +69,12 @@ class Lodur: if state == "open": self.browser.open("{}?modul=36".format(self.url)) - einsatzrapport_url = self.browser.find_link(link_text=f_id) + try: + einsatzrapport_url = self.browser.find_link(link_regex=re.compile(f_id)) + except mechanicalsoup.LinkNotFoundError: + self.logger.error("[%s] No Einsatzrapport found in Lodur", f_id) + return None + if einsatzrapport_url: lodur_id = re.search( ".*event=([0-9]{1,})&.*", einsatzrapport_url["href"] diff --git a/pylokid/main.py b/pylokid/main.py index 2983e83..93ba628 100644 --- a/pylokid/main.py +++ b/pylokid/main.py @@ -247,10 +247,3 @@ def main(): # repeat every logger.info("Waiting %s seconds until next check", IMAP_CHECK_INTERVAL) time.sleep(int(IMAP_CHECK_INTERVAL)) - - -if __name__ == "__main__": - try: - main() - except KeyboardInterrupt: - print("Byebye") diff --git a/pyproject.toml b/pyproject.toml index a7c0070..5e6dff4 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "pylokid" -version = "3.0.0" +version = "3.0.1" description = "" authors = ["Tobias Brunner "] license = "MIT"