Skip to content

Load of FRITZ!OS version via direct request. #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Load of FRITZ!OS version via direct request. #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 13 additions & 4 deletions fritz_advanced_thermostat/fritz_advanced_thermostat.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
import re
import requests
from .errors import FritzAdvancedThermostatConnectionError, FritzAdvancedThermostatCompatibilityError, FritzAdvancedThermostatExecutionError, FritzAdvancedThermostatKeyError
from fritzconnection import FritzConnection
from pyfritzhome import Fritzhome
from selenium import webdriver
from selenium.webdriver.chrome.options import Options
Expand Down Expand Up @@ -55,9 +54,7 @@ def __init__(self,
self._sid = fh._sid
self._devices = fh._devices
self._prefixed_host = fh.get_prefixed_host()
# Check Fritz!OS via FritzConnection
fc = FritzConnection(address=host, user=user, password=password)
self._fritzos = fc.system_version
self._fritzos = self._load_fritzos()
self._supported_firmware = ['7.29', '7.30', '7.31', '7.56', '7.57']
# Set basic properties
self._experimental = experimental
Expand Down Expand Up @@ -100,6 +97,18 @@ def __init__(self,
self._selenium_options.add_argument('ignore-certificate-errors')
self._check_fritzos()

def _load_fritzos(self):
data = {
"xhr": 1,
"sid": self._sid,
"page": "overview",
}

response = requests.post(self._prefixed_host + "/data.lua", data=data, allow_redirects=True, timeout=300)
response.raise_for_status()

return json.loads(response.text)["data"]["fritzos"]["nspver"]

def _check_fritzos(self):
if self._fritzos not in self._supported_firmware:
if self._experimental:
Expand Down
1 change: 0 additions & 1 deletion requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
fritzconnection>=1.12.2
pyfritzhome>=0.6.8
requests>=2.31.0
selenium==4.10.0
Expand Down