Skip to content

improve logging, prevent unnecessary errors #131

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

Merged
ol-iver merged 3 commits into from
May 8, 2020
Merged

improve logging, prevent unnecessary errors #131

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
40d7abb
improve logging, prevent unnecessary errors
starkillerOG Apr 27, 2020
bc99de7
fix line to long
starkillerOG Apr 27, 2020
4d3440e
fix line too long
starkillerOG Apr 27, 2020
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
39 changes: 30 additions & 9 deletions denonavr/denonavr.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,7 @@ def __init__(self, host, name=None, show_all_inputs=False, timeout=2.0,
self._get_receiver_name()
# Determine if update_avr_2016 can be used for AVR_X receiver
if self._receiver_type == AVR_X.type:
self._support_update_avr_2016 = self._update_avr_2016()
self._support_update_avr_2016 = self._update_avr_2016(False)
# Determine if sound mode is supported
self._get_support_sound_mode()
# Get initial setting of values
Expand Down Expand Up @@ -458,9 +458,14 @@ def _update_avr(self):

# if update_avr_2016 is supported try that first, that reports better
if self._receiver_type == AVR_X.type and self._support_update_avr_2016:
if self._update_avr_2016():
if self._update_avr_2016(False):
# Success --> skip xml update
relevant_tags = {}
else:
_LOGGER.debug(
"Primary update method (AppCommand.xml) "
"failed for zone %s", self._zone
)

# Get status XML from Denon receiver via HTTP
if relevant_tags:
Expand All @@ -478,6 +483,10 @@ def _update_avr(self):

# Second option to update variables from different source
if relevant_tags and self._power != POWER_OFF:
_LOGGER.debug(
"Secondary update method (Status.xml) failed for zone %s",
self._zone
)
try:
root = self.get_status_xml(self._urls.mainzone)
except (ValueError,
Expand All @@ -490,6 +499,10 @@ def _update_avr(self):

# Error message if still some variables are not updated yet
if relevant_tags and self._power != POWER_OFF:
_LOGGER.debug(
"Third update method (MainZone.xml) failed for zone %s",
self._zone
)
_LOGGER.error("Missing status information from XML of %s for: %s",
self._zone, ", ".join(relevant_tags.keys()))

Expand Down Expand Up @@ -540,7 +553,7 @@ def _update_avr(self):
# Finished
return True

def _update_avr_2016(self):
def _update_avr_2016(self, log_errors=True):
"""
Get the latest status information from device.

Expand All @@ -557,7 +570,8 @@ def _update_avr_2016(self):
root = self.exec_appcommand_post(tags)
# Check result
if root is None:
_LOGGER.error("Update failed.")
if log_errors:
_LOGGER.error("Update failed.")
return False

# Extract relevant information
Expand All @@ -566,27 +580,31 @@ def _update_avr_2016(self):
try:
self._power = root[0].find(zone).text
except (AttributeError, IndexError):
_LOGGER.error("No PowerStatus found for zone %s", self.zone)
if log_errors:
_LOGGER.error("No PowerStatus found for zone %s", self.zone)
success = False

try:
self._mute = root[3].find(zone).text
except (AttributeError, IndexError):
_LOGGER.error("No MuteStatus found for zone %s", self.zone)
if log_errors:
_LOGGER.error("No MuteStatus found for zone %s", self.zone)
success = False

try:
self._volume = root.find(
"./cmd/{zone}/volume".format(zone=zone)).text
except AttributeError:
_LOGGER.error("No VolumeStatus found for zone %s", self.zone)
if log_errors:
_LOGGER.error("No VolumeStatus found for zone %s", self.zone)
success = False

try:
inputfunc = root.find(
"./cmd/{zone}/source".format(zone=zone)).text
except AttributeError:
_LOGGER.error("No Source found for zone %s", self.zone)
if log_errors:
_LOGGER.error("No Source found for zone %s", self.zone)
success = False
else:
try:
Expand All @@ -609,7 +627,10 @@ def _update_avr_2016(self):
try:
self._sound_mode_raw = root[4][0].text.rstrip()
except (AttributeError, IndexError):
_LOGGER.error("No SoundMode found for the main zone %s", self.zone)
if log_errors:
_LOGGER.error(
"No SoundMode found for the main zone %s", self.zone
)
success = False

# Now playing information is not implemented for 2016+ models, because
Expand Down