From c883341f09d01a3b95d4c65ac4f8f5dfbb642b89 Mon Sep 17 00:00:00 2001 From: mraniki <8766259+mraniki@users.noreply.github.com> Date: Sun, 7 Jul 2024 11:03:33 +0200 Subject: [PATCH 1/4] =?UTF-8?q?=E2=99=BB=EF=B8=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- findmyorder/main.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/findmyorder/main.py b/findmyorder/main.py index 23cb0ca..c04f729 100644 --- a/findmyorder/main.py +++ b/findmyorder/main.py @@ -111,7 +111,8 @@ def _create_client(self, **kwargs): library is not supported. """ - library = kwargs.get("parser_library", "standard") + # library = kwargs.get("parser_library", "standard") + library = kwargs.get("parser_library") or kwargs.get("library") or "standard" cls = self.client_classes.get((f"{library.capitalize()}Handler")) return None if cls is None else cls(**kwargs) From 6dddf044b9f22d126df284adae2227103d436a18 Mon Sep 17 00:00:00 2001 From: mraniki <8766259+mraniki@users.noreply.github.com> Date: Sun, 7 Jul 2024 12:28:20 +0200 Subject: [PATCH 2/4] =?UTF-8?q?=F0=9F=92=84=20=5Fcreate=5Fclient=20update?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- findmyorder/main.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/findmyorder/main.py b/findmyorder/main.py index c04f729..5d09bb6 100644 --- a/findmyorder/main.py +++ b/findmyorder/main.py @@ -112,7 +112,13 @@ def _create_client(self, **kwargs): """ # library = kwargs.get("parser_library", "standard") - library = kwargs.get("parser_library") or kwargs.get("library") or "standard" + library = ( + kwargs.get("library") + or kwargs.get("platform") + or kwargs.get("protocol") + or kwargs.get("parser_library") + or "standard" + ) cls = self.client_classes.get((f"{library.capitalize()}Handler")) return None if cls is None else cls(**kwargs) From e07f71d51fef26571a50385eb4eaf69675302fa6 Mon Sep 17 00:00:00 2001 From: mraniki <8766259+mraniki@users.noreply.github.com> Date: Sun, 7 Jul 2024 12:39:56 +0200 Subject: [PATCH 3/4] =?UTF-8?q?=E2=9C=85=20Unit=20Test?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tests/test_unit.py | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/tests/test_unit.py b/tests/test_unit.py index 7c78ef5..285477d 100644 --- a/tests/test_unit.py +++ b/tests/test_unit.py @@ -156,14 +156,3 @@ async def test_standard_get_order(fmo, order, result_order): assert result["comment"] == result_order["comment"] assert type(result["timestamp"] is datetime) - -# @pytest.mark.asyncio -# async def test_create_client_exception(fmo, caplog): -# result = fmo.create_client() -# assert result is not None -# assert any( -# record.message -# == "No Client were created. Check your settings or disable the module." -# for record in caplog.records -# if record.levelname == "WARNING" -# ) From 02b716f804d7b08f03d45f8962ba7882c9b9398d Mon Sep 17 00:00:00 2001 From: mraniki <8766259+mraniki@users.noreply.github.com> Date: Sun, 7 Jul 2024 15:24:32 +0200 Subject: [PATCH 4/4] =?UTF-8?q?=E2=99=BB=EF=B8=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- findmyorder/main.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/findmyorder/main.py b/findmyorder/main.py index 5d09bb6..1883515 100644 --- a/findmyorder/main.py +++ b/findmyorder/main.py @@ -50,7 +50,7 @@ def __init__( return self.client_classes = self.get_all_client_classes() self.clients = [] - # Create a client for each client in settings + # Create a client for each client in settings.findmyorder for name, client_config in settings.findmyorder.items(): if ( # Skip empty client configs @@ -65,7 +65,7 @@ def __init__( continue # Create the client - logger.debug("Creating FMO parser {}", name) + logger.debug("Creating client {}", name) client = self._create_client(**client_config, name=name) # If the client has a valid client attribute, append it to the list if client and getattr(client, "client", None):