From 63ca1647874e410d057f3b1243f2441690865b2c Mon Sep 17 00:00:00 2001 From: Nils Stein Date: Wed, 2 Aug 2023 09:14:50 +0200 Subject: [PATCH 1/9] fixing selenium --- fritz_advanced_thermostat/fritz_advanced_thermostat.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fritz_advanced_thermostat/fritz_advanced_thermostat.py b/fritz_advanced_thermostat/fritz_advanced_thermostat.py index e75a4a2..3def964 100644 --- a/fritz_advanced_thermostat/fritz_advanced_thermostat.py +++ b/fritz_advanced_thermostat/fritz_advanced_thermostat.py @@ -91,7 +91,7 @@ def __init__(self, self._thermostats = [] # Setup selenium options self._selenium_options = Options() - self._selenium_options.add_argument('--headless') + self._selenium_options.add_argument('--headless=new') self._selenium_options.add_argument('--no-sandbox') self._selenium_options.add_argument('--disable-gpu') self._selenium_options.add_argument('--disable-dev-shm-usage') From 92f3cd1986832096daf7e75f64569adf2b51be06 Mon Sep 17 00:00:00 2001 From: Nils Stein Date: Wed, 2 Aug 2023 09:23:36 +0200 Subject: [PATCH 2/9] downgrade selenium --- fritz_advanced_thermostat/fritz_advanced_thermostat.py | 2 +- requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fritz_advanced_thermostat/fritz_advanced_thermostat.py b/fritz_advanced_thermostat/fritz_advanced_thermostat.py index 3def964..e75a4a2 100644 --- a/fritz_advanced_thermostat/fritz_advanced_thermostat.py +++ b/fritz_advanced_thermostat/fritz_advanced_thermostat.py @@ -91,7 +91,7 @@ def __init__(self, self._thermostats = [] # Setup selenium options self._selenium_options = Options() - self._selenium_options.add_argument('--headless=new') + self._selenium_options.add_argument('--headless') self._selenium_options.add_argument('--no-sandbox') self._selenium_options.add_argument('--disable-gpu') self._selenium_options.add_argument('--disable-dev-shm-usage') diff --git a/requirements.txt b/requirements.txt index ef2949f..3510cd6 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ fritzconnection>=1.12.2 pyfritzhome>=0.6.8 requests>=2.31.0 -selenium>=4.11.2 +selenium>=4.7.2 packaging>=23.1 \ No newline at end of file From 8cf7edb3ad18c12d17a0ea3d4c5c34e9201299e2 Mon Sep 17 00:00:00 2001 From: Nils Stein Date: Wed, 2 Aug 2023 09:47:54 +0200 Subject: [PATCH 3/9] revert downgrade --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 3510cd6..ef2949f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ fritzconnection>=1.12.2 pyfritzhome>=0.6.8 requests>=2.31.0 -selenium>=4.7.2 +selenium>=4.11.2 packaging>=23.1 \ No newline at end of file From 490285ef02687ea3249031cabcf6f81e00f966ca Mon Sep 17 00:00:00 2001 From: Nils Stein <31704359+mietzen@users.noreply.github.com> Date: Tue, 8 Aug 2023 18:10:37 +0200 Subject: [PATCH 4/9] testing old selenium --- requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index ef2949f..872900d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ fritzconnection>=1.12.2 pyfritzhome>=0.6.8 requests>=2.31.0 -selenium>=4.11.2 -packaging>=23.1 \ No newline at end of file +selenium==4.7.2 +packaging>=23.1 From ccb6f222e6395a49a331d19972fe0807b6d39824 Mon Sep 17 00:00:00 2001 From: Nils Stein Date: Sat, 9 Sep 2023 13:24:54 +0200 Subject: [PATCH 5/9] test new selenium --- fritz_advanced_thermostat/fritz_advanced_thermostat.py | 2 +- requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fritz_advanced_thermostat/fritz_advanced_thermostat.py b/fritz_advanced_thermostat/fritz_advanced_thermostat.py index e75a4a2..063e0b8 100644 --- a/fritz_advanced_thermostat/fritz_advanced_thermostat.py +++ b/fritz_advanced_thermostat/fritz_advanced_thermostat.py @@ -58,7 +58,7 @@ def __init__(self, # Check Fritz!OS via FritzConnection fc = FritzConnection(address=host, user=user, password=password) self._fritzos = fc.system_version - self._supported_firmware = ['7.29', '7.56'] + self._supported_firmware = ['7.29', '7.30', '7.31', '7.56', '7.57'] # Set basic properties self._experimental = experimental self._user = user diff --git a/requirements.txt b/requirements.txt index 872900d..8640626 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ fritzconnection>=1.12.2 pyfritzhome>=0.6.8 requests>=2.31.0 -selenium==4.7.2 +selenium==4.12.0 packaging>=23.1 From 5ee58213e12eaedad1aaa928e926b0dab6031b3f Mon Sep 17 00:00:00 2001 From: Nils Stein Date: Sat, 9 Sep 2023 13:27:00 +0200 Subject: [PATCH 6/9] use 4.10 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 8640626..c518f1f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ fritzconnection>=1.12.2 pyfritzhome>=0.6.8 requests>=2.31.0 -selenium==4.12.0 +selenium==4.10.0 packaging>=23.1 From e11a63da2876e8f0946a87cef538fb88bcf851be Mon Sep 17 00:00:00 2001 From: Nils Stein Date: Sat, 9 Sep 2023 13:41:04 +0200 Subject: [PATCH 7/9] fix upper version --- .../fritz_advanced_thermostat.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/fritz_advanced_thermostat/fritz_advanced_thermostat.py b/fritz_advanced_thermostat/fritz_advanced_thermostat.py index 063e0b8..834eb30 100644 --- a/fritz_advanced_thermostat/fritz_advanced_thermostat.py +++ b/fritz_advanced_thermostat/fritz_advanced_thermostat.py @@ -91,11 +91,11 @@ def __init__(self, self._thermostats = [] # Setup selenium options self._selenium_options = Options() - self._selenium_options.add_argument('--headless') - self._selenium_options.add_argument('--no-sandbox') - self._selenium_options.add_argument('--disable-gpu') - self._selenium_options.add_argument('--disable-dev-shm-usage') - self._selenium_options.add_argument("--window-size=1920,1200") + #self._selenium_options.add_argument('--headless') + #self._selenium_options.add_argument('--no-sandbox') + #self._selenium_options.add_argument('--disable-gpu') + #self._selenium_options.add_argument('--disable-dev-shm-usage') + #self._selenium_options.add_argument("--window-size=1920,1200") if not self._ssl_verify: self._selenium_options.add_argument('ignore-certificate-errors') self._check_fritzos() @@ -154,7 +154,7 @@ def _scrape_thermostat_data(self, device_name): if version.parse('7.0') < version.parse(self._fritzos) <= version.parse('7.29'): if len(row_text) == 5: grouped = True - if version.parse('7.50') < version.parse(self._fritzos) <= version.parse('7.56'): + if version.parse('7.50') < version.parse(self._fritzos) <= version.parse('7.99'): if len(row_text) == 4: grouped = True row.find_element(By.TAG_NAME, "button").click() From 0c141d14867ed057f0deec9d8e25ed228ff2c47a Mon Sep 17 00:00:00 2001 From: Nils Stein Date: Sat, 9 Sep 2023 13:41:17 +0200 Subject: [PATCH 8/9] fix upper version --- fritz_advanced_thermostat/fritz_advanced_thermostat.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fritz_advanced_thermostat/fritz_advanced_thermostat.py b/fritz_advanced_thermostat/fritz_advanced_thermostat.py index 834eb30..c2c8541 100644 --- a/fritz_advanced_thermostat/fritz_advanced_thermostat.py +++ b/fritz_advanced_thermostat/fritz_advanced_thermostat.py @@ -151,7 +151,7 @@ def _scrape_thermostat_data(self, device_name): valid_device_type = any( [True for x in row_text if x in self._valid_device_types]) if valid_device_type or self._experimental: - if version.parse('7.0') < version.parse(self._fritzos) <= version.parse('7.29'): + if version.parse('7.0') < version.parse(self._fritzos) <= version.parse('7.31'): if len(row_text) == 5: grouped = True if version.parse('7.50') < version.parse(self._fritzos) <= version.parse('7.99'): From 69b9816864c2595e8205ae9dc945198c01e52200 Mon Sep 17 00:00:00 2001 From: Nils Stein Date: Sat, 9 Sep 2023 13:44:57 +0200 Subject: [PATCH 9/9] disable debug --- fritz_advanced_thermostat/fritz_advanced_thermostat.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/fritz_advanced_thermostat/fritz_advanced_thermostat.py b/fritz_advanced_thermostat/fritz_advanced_thermostat.py index c2c8541..ea15aef 100644 --- a/fritz_advanced_thermostat/fritz_advanced_thermostat.py +++ b/fritz_advanced_thermostat/fritz_advanced_thermostat.py @@ -91,11 +91,11 @@ def __init__(self, self._thermostats = [] # Setup selenium options self._selenium_options = Options() - #self._selenium_options.add_argument('--headless') - #self._selenium_options.add_argument('--no-sandbox') - #self._selenium_options.add_argument('--disable-gpu') - #self._selenium_options.add_argument('--disable-dev-shm-usage') - #self._selenium_options.add_argument("--window-size=1920,1200") + self._selenium_options.add_argument('--headless') + self._selenium_options.add_argument('--no-sandbox') + self._selenium_options.add_argument('--disable-gpu') + self._selenium_options.add_argument('--disable-dev-shm-usage') + self._selenium_options.add_argument("--window-size=1920,1200") if not self._ssl_verify: self._selenium_options.add_argument('ignore-certificate-errors') self._check_fritzos()