From c17a80a550692a24a8a165c5674de6220054389f Mon Sep 17 00:00:00 2001 From: scarface-4711 Date: Fri, 26 May 2017 13:46:08 +0200 Subject: [PATCH] Pushed to version 0.4.2 --- HELP.md | 2 +- README.md | 5 +- README.rst | 5 +- denonavr/__init__.py | 2 +- denonavr/ssdp.py | 1 + setup.py | 2 +- tests/test_denonavr.py | 2 +- tests/xml/AVR-X2000-AppCommand.xml | 3 + tests/xml/AVR-X2000-Deviceinfo.xml | 1522 +++++++++++++++++ .../AVR-X2000-formMainZone_MainZoneXml.xml | 35 + ...R-X2000-formMainZone_MainZoneXmlStatus.xml | 51 + .../xml/AVR-X2000-formNetAudio_StatusXml.xml | 62 + 12 files changed, 1686 insertions(+), 6 deletions(-) create mode 100644 tests/xml/AVR-X2000-AppCommand.xml create mode 100644 tests/xml/AVR-X2000-Deviceinfo.xml create mode 100644 tests/xml/AVR-X2000-formMainZone_MainZoneXml.xml create mode 100644 tests/xml/AVR-X2000-formMainZone_MainZoneXmlStatus.xml create mode 100644 tests/xml/AVR-X2000-formNetAudio_StatusXml.xml diff --git a/HELP.md b/HELP.md index 192732d..95c358f 100644 --- a/HELP.md +++ b/HELP.md @@ -29,7 +29,7 @@ DATA __title__ = 'denonavr' VERSION - 0.4.1 + 0.4.2 ==================================================================================== diff --git a/README.md b/README.md index c8b303f..d858fb7 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # denonavr [![Build Status](https://travis-ci.org/scarface-4711/denonavr.svg?branch=master)](https://travis-ci.org/scarface-4711/denonavr) -Automation Library for Denon AVR receivers - current version 0.4.1 +Automation Library for Denon AVR receivers - current version 0.4.2 ## Installation @@ -118,6 +118,9 @@ MIT ## Contributors @soldag: https://github.com/soldag +@shapiromatron: https://github.com/shapiromatron +@glance-: https://github.com/glance- +@p3dda: https://github.com/p3dda ## Users Home Assistant: https://github.com/home-assistant/home-assistant/ diff --git a/README.rst b/README.rst index bbc6aed..0efa172 100644 --- a/README.rst +++ b/README.rst @@ -3,7 +3,7 @@ denonavr |Build Status| -Automation Library for Denon AVR receivers - current version 0.4.1 +Automation Library for Denon AVR receivers - current version 0.4.2 Installation ------------ @@ -137,6 +137,9 @@ Contributors ------------ @soldag: https://github.com/soldag +@shapiromatron: https://github.com/shapiromatron +@glance-: https://github.com/glance- +@p3dda: https://github.com/p3dda Users ----- diff --git a/denonavr/__init__.py b/denonavr/__init__.py index 05c8d84..134592a 100644 --- a/denonavr/__init__.py +++ b/denonavr/__init__.py @@ -18,7 +18,7 @@ logging.getLogger(__name__).addHandler(logging.NullHandler()) __title__ = "denonavr" -__version__ = "0.4.1" +__version__ = "0.4.2" def discover(): diff --git a/denonavr/ssdp.py b/denonavr/ssdp.py index d50bb73..4c060f1 100755 --- a/denonavr/ssdp.py +++ b/denonavr/ssdp.py @@ -58,6 +58,7 @@ SUPPORTED_MANUFACTURERS = ["Denon", "Marantz"] + def identify_denonavr_receivers(): """ Identify DenonAVR using SSDP and SCPD queries. diff --git a/setup.py b/setup.py index e7fa7cc..cbdaaab 100644 --- a/setup.py +++ b/setup.py @@ -4,7 +4,7 @@ from setuptools import find_packages, setup setup(name='denonavr', - version='0.4.1', + version='0.4.2', description='Automation Library for Denon AVR receivers', long_description='Automation Library for Denon AVR receivers', url='https://github.com/scarface-4711/denonavr', diff --git a/tests/test_denonavr.py b/tests/test_denonavr.py index a7c2c6a..9981f95 100644 --- a/tests/test_denonavr.py +++ b/tests/test_denonavr.py @@ -14,7 +14,7 @@ FAKE_IP = "10.0.0.0" TESTING_RECEIVERS = ("AVR-X4100W", "AVR-2312CI", "AVR-1912", "AVR-3311CI", - "M-RC610", "AVR-X2100W-2") + "M-RC610", "AVR-X2100W-2", "AVR-X2000") APPCOMMAND_URL = "/goform/AppCommand.xml" STATUS_URL = "/goform/formMainZone_MainZoneXmlStatus.xml" diff --git a/tests/xml/AVR-X2000-AppCommand.xml b/tests/xml/AVR-X2000-AppCommand.xml new file mode 100644 index 0000000..92f6c40 --- /dev/null +++ b/tests/xml/AVR-X2000-AppCommand.xml @@ -0,0 +1,3 @@ +Document Error: Data follows +

Access Error: Data follows

+

Form Deviceinfo.xml is not defined

\ No newline at end of file diff --git a/tests/xml/AVR-X2000-Deviceinfo.xml b/tests/xml/AVR-X2000-Deviceinfo.xml new file mode 100644 index 0000000..4eaaaf7 --- /dev/null +++ b/tests/xml/AVR-X2000-Deviceinfo.xml @@ -0,0 +1,1522 @@ + + +0001 +0210 +0 +01 +01 +*AVR-X2000 +0005CD3A0525 +00 +0 +2 + + + + +English +Spanish +French + +0 + + +0 +NetLink +0 + + +0 +ClockAdjust +0 + + +1 +SleepTimer +120 +10 + +1 + +1 + + +0 +WakeupTimer +0 + + +0 +PartyMode +01 +0 + + +0 +BatteryMode +0 + + +0 +DeviceColor + +0 + + + + +0 +Clock +0 + + +1 +AllZonePower +0 + +1 +AllZoneMute +0 + +0 +SystemFavorites +50 + +0 + +0 +1 +3 +Favorite Station1 +Favorite Station1 +1 +Favorite Station2 +Favorite Station2 +1 +Favorite Station3 +Favorite Station3 +1 + + + + +0 + +1 + +1 +210 +Restorer +Restorer + + +2 +110 +Cursor +Cursor + + +2 +107 +Favorite Station1 +Favorite Station1 + + +2 +108 +Favorite Station2 +Favorite Station2 + + +2 +109 +Favorite Station3 +Favorite Station3 + + +1 +204 +Sleep Timer +SleepTimer + + +3 +111 +Quick Select1 +Quick Select1 + + +3 +111 +Quick Select2 +Quick Select2 + + +3 +111 +Quick Select3 +Quick Select3 + + +3 +111 +Quick Select4 +Quick Select4 + + +4 +34 +Favorites +Favorites + + +4 +26 +Internet Radio +Internet Radio + + +4 +32 +Pandora +Pandora + + +4 +35 +SiriusXM +SiriusXM + + +4 +36 +Spotify +Spotify + + +4 +25 +Media Server +Media Server + + +4 +29 +Flickr +Flickr + + +4 +4 +CBL/SAT +CBL/SAT + + +4 +2 +DVD +DVD + + +4 +1 +Blu-ray +Blu-ray + + +4 +8 +GAME +GAME + + +4 +10 +AUX +AUX + + +4 +46 +MEDIA PLAYER +Media Player + + +4 +22 +iPod/USB +iPod/USB + + +4 +17 +CD +CD + + +4 +19 +TUNER +TUNER + + +4 +3 +TV AUDIO +TV AUDIO + + +5 +212 +DIRECT +DIRECT + + +5 +212 +STEREO +STEREO + + +5 +213 +PURE DIRECT +PURE DIRECT + + +5 +214 +DOLBY DIGITAL +DOLBY DIGITAL + + +5 +214 +DTS SURROUND +DTS SURROUND + + +5 +215 +MULTI CH STEREO +MULTI CH STEREO + + +5 +215 +ROCK ARENA +ROCK ARENA + + +5 +215 +JAZZ CLUB +JAZZ CLUB + + +5 +215 +MONO MOVIE +MONO MOVIE + + +5 +215 +VIDEO GAME +VIDEO GAME + + +5 +215 +MATRIX +MATRIX + + +5 +215 +VIRTUAL +VIRTUAL + + +5 +220 +MOVIE +MOVIE + + +5 +221 +MUSIC +MUSIC + + +5 +222 +GAME +GAME + + +5 +223 +PURE +PURE + + +1 +4 +Internet Radio + + +2 +4 +iPod/USB + + +3 +4 +TUNER + + +4 +4 +Media Server + + +5 +4 +CBL/SAT + + +6 +4 +Blu-ray + + +7 +4 +Media Player + + +8 +4 +GAME + + +1 + +1 +98.0 +0.5 +OFF +OFF +98.0 +86.0 ++6.0dB +86.0 +83.0 ++3.0dB +83.0 +80.0 +0.0dB +80.0 +74.0 +-6.0dB +74.0 +68.0 +-12.0dB +68.0 +60.0 +-20.0dB +60.0 +50.0 +-30.0dB +50.0 +40.0 +-40.0dB +40.0 +-6.0dB + +1 + + +1 + +1 + + +34 +Favorites +Favorites +root/NETWORK/Favorites +2 + + + +26 +Internet Radio +Internet Radio +root/NETWORK/Internet Radio +2 + + + +32 +Pandora +Pandora +root/NETWORK/Pandora +2 + + + +35 +SiriusXM +SiriusXM +root/NETWORK/SiriusXM +2 + + + +36 +Spotify +Spotify +root/NETWORK/Spotify +2 + + + +25 +Media Server +Media Server +root/NETWORK/Media Server +2 + + + +29 +Flickr +Flickr +root/NETWORK/Flickr +2 + + + +4 +CBL/SAT +CBL/SAT +root/CBLSAT +3 + + + +2 +DVD +DVD +root/DVD +3 + + + +1 +Blu-ray +Blu-ray +root/Blu-ray +3 +BdOperation + + +8 +GAME +GAME +root/GAME +3 + + + +10 +AUX +AUX +root/AUX +3 + + + +46 +Media Player +Media Player +root/Media Player +3 + + + +22 +iPod/USB +iPod/USB +root/iPodUSB +3 +iPod + + +17 +CD +CD +root/CD +3 + + + +19 +TUNER +TUNER +root/TUNER +3 +TunerOperation + + +23 +NETWORK +NETWORK +root/NETWORK +3 +NetUsb + + +3 +TV AUDIO +TV AUDIO +root/TV AUDIO +3 + + + + +1 +1 +1 + + +1 +Sound Mode + + +DIRECT/STEREO + + +PURE DIRECT + + +Standard + + +DSP Simulation + + + + +212 +DIRECT/STEREO +DIRECT + + +212 +DIRECT/STEREO +STEREO + + +213 +PURE DIRECT +PURE DIRECT + + +214 +Standard +DOLBY DIGITAL + + +214 +Standard +DTS SURROUND + + +215 +DSP Simulation +MULTI CH STEREO + + +215 +DSP Simulation +ROCK ARENA + + +215 +DSP Simulation +JAZZ CLUB + + +215 +DSP Simulation +MONO MOVIE + + +215 +DSP Simulation +VIDEO GAME + + +215 +DSP Simulation +MATRIX + + +215 +DSP Simulation +VIRTUAL + + + +1 + +1 + + +1 +Restorer +Restorer +217 +High +MODE1 +218 +Medium +MODE2 +219 +Low +MODE3 +216 +OFF +OFF + +1 + +1 + +0 +ToneControl + + + +1 +Cursor +1 +1 + +1 +4 +Quick Select1 +Quick Select1 +1 +1 +Quick Select2 +Quick Select2 +1 +2 +Quick Select3 +Quick Select3 +1 +3 +Quick Select4 +Quick Select4 +1 +4 +1 +0 +TUNER +56 +FM +AM + +1 +1 +1 +1 +1 +1 + +1 + +1 +Blu-ray +1 + +1 + +0 +CD + +0 + +0 + +0 +Dock + +0 + +0 + +0 +0 + + +1 +1 +Favorites +34 +root/NETWORK/Favorites +1 +100 + +1 +1 +1 + +1 +1 +Internet Radio +26 +root/NETWORK/Internet Radio +1 +60 + +0 +0 +1 +1 +0 +0000100 +0 + +1 +1 +SiriusXM +35 +root/NETWORK/SiriusXM +1 + +0 +1 +1 +0000100 +0 +1 +1 + +1 +1 +Pandora +32 +root/NETWORK/Pandora +1 + +0 +1 +1 +1101100 +0 +1 +1 + +1 + +1 +Spotify +36 +root/NETWORK/Spotify +1 + +0 +1 +1 +1111100 +1 +1 +1 + +1 + +1 +Media Server +25 +root/NETWORK/Media Server +2 + +1 +1 +1 +0 +1111100 +1 + +1 +1 +Flickr +29 +root/NETWORK/Flickr +1 + +0 +1 +1 +1111100 +0 +1 + +1 +1 +iPod/USB +22 +root/iPodUsb +1 + +0 +1 +1 +1111111 +1 +1 +1 +1 + +1 + + +1 +28 +root/iPodPlayer +1 + +1111100 +1 + +1 + + + +1 + +1 + +1 +210 +Restorer +Restorer + + +2 +110 +Cursor +Cursor + + +2 +107 +Favorite Station1 +Favorite Station1 + + +2 +108 +Favorite Station2 +Favorite Station2 + + +2 +109 +Favorite Station3 +Favorite Station3 + + +1 +204 +Sleep Timer +SleepTimer + + +3 +111 +Quick Select1 +Quick Select1 + + +3 +111 +Quick Select2 +Quick Select2 + + +3 +111 +Quick Select3 +Quick Select3 + + +3 +111 +Quick Select4 +Quick Select4 + + +4 +34 +Favorites +Favorites + + +4 +26 +Internet Radio +Internet Radio + + +4 +32 +Pandora +Pandora + + +4 +35 +SiriusXM +SiriusXM + + +4 +36 +Spotify +Spotify + + +4 +25 +Media Server +Media Server + + +4 +29 +Flickr +Flickr + + +4 +4 +CBL/SAT +CBL/SAT + + +4 +2 +DVD +DVD + + +4 +1 +Blu-ray +Blu-ray + + +4 +8 +GAME +GAME + + +4 +10 +AUX +AUX + + +4 +46 +MEDIA PLAYER +Media Player + + +4 +22 +iPod/USB +iPod/USB + + +4 +17 +CD +CD + + +4 +19 +TUNER +TUNER + + +4 +3 +TV AUDIO +TV AUDIO + + +1 +4 +Internet Radio + + +2 +4 +iPod/USB + + +3 +4 +TUNER + + +4 +4 +Media Server + + +5 +4 +CBL/SAT + + +6 +4 +Blu-ray + + +7 +4 +Media Player + + +8 +4 +GAME + + +1 + +1 +98.0 +0.5 +OFF +OFF +98.0 +86.0 ++6.0dB +86.0 +83.0 ++3.0dB +83.0 +80.0 +0.0dB +80.0 +74.0 +-6.0dB +74.0 +68.0 +-12.0dB +68.0 +60.0 +-20.0dB +60.0 +50.0 +-30.0dB +50.0 +40.0 +-40.0dB +40.0 +-6.0dB + +1 + + +1 + +1 + + +34 +Favorites +Favorites +root/NETWORK/Favorites +2 + + + +26 +Internet Radio +Internet Radio +root/NETWORK/Internet Radio +2 + + + +32 +Pandora +Pandora +root/NETWORK/Pandora +2 + + + +35 +SiriusXM +SiriusXM +root/NETWORK/SiriusXM +2 + + + +36 +Spotify +Spotify +root/NETWORK/Spotify +2 + + + +25 +Media Server +Media Server +root/NETWORK/Media Server +2 + + + +29 +Flickr +Flickr +root/NETWORK/Flickr +2 + + + +0 +SOURCE +SOURCE +root/SOURCE +3 + + + +4 +CBL/SAT +CBL/SAT +root/CBLSAT +3 + + + +2 +DVD +DVD +root/DVD +3 + + + +1 +Blu-ray +Blu-ray +root/Blu-ray +3 +BdOperation + + +8 +GAME +GAME +root/GAME +3 + + + +10 +AUX +AUX +root/AUX +3 + + + +46 +Media Player +Media Player +root/Media Player +3 + + + +22 +iPod/USB +iPod/USB +root/iPodUSB +3 +iPod + + +17 +CD +CD +root/CD +3 + + + +19 +TUNER +TUNER +root/TUNER +3 +TunerOperation + + +23 +NETWORK +NETWORK +root/NETWORK +3 +NetUsb + + +3 +TV AUDIO +TV AUDIO +root/TV AUDIO +3 + + + + +1 +1 +1 + + +0 + + +0 +Restorer +Restorer +217 +High +MODE1 +218 +Medium +MODE2 +219 +Low +MODE3 +216 +OFF +OFF + +1 + +1 + +0 +ToneControl + + + +1 +Cursor +1 +1 + +1 +4 +Quick Select1 +Quick Select1 +1 +1 +Quick Select2 +Quick Select2 +1 +2 +Quick Select3 +Quick Select3 +1 +3 +Quick Select4 +Quick Select4 +1 +4 +1 +0 +TUNER +56 +FM +AM + +1 +1 +1 +1 +1 +1 + +1 + +1 +Blu-ray +1 + +1 + +0 +CD + +0 + +0 + +0 +Dock + +0 + +0 + +0 +0 + + +1 +1 +Favorites +34 +root/NETWORK/Favorites +1 +100 + +1 +1 +1 + +1 +1 +Internet Radio +26 +root/NETWORK/Internet Radio +1 +60 + +0 +0 +1 +1 +0 +0000100 +0 + +1 +1 +SiriusXM +35 +root/NETWORK/SiriusXM +1 + +0 +1 +1 +0000100 +0 +1 +1 + +1 +1 +Pandora +32 +root/NETWORK/Pandora +1 + +0 +1 +1 +1101100 +0 +1 +1 + +1 + +1 +Spotify +36 +root/NETWORK/Spotify +1 + +0 +1 +1 +1111100 +1 +1 +1 + +1 + +1 +Media Server +25 +root/NETWORK/Media Server +2 + +1 +1 +1 +0 +1111100 +1 + +1 +1 +Flickr +29 +root/NETWORK/Flickr +1 + +0 +1 +1 +1111100 +0 +1 + +1 +1 +iPod/USB +22 +root/iPodUsb +1 + +0 +1 +1 +1111111 +1 +1 +1 +1 + +1 + + + diff --git a/tests/xml/AVR-X2000-formMainZone_MainZoneXml.xml b/tests/xml/AVR-X2000-formMainZone_MainZoneXml.xml new file mode 100644 index 0000000..9b8f024 --- /dev/null +++ b/tests/xml/AVR-X2000-formMainZone_MainZoneXml.xml @@ -0,0 +1,35 @@ + + +Denon AVR-X2000 +ON +ON +LivingRoom +ON +OFF + +OFF + + + + + + + + + + + + +4 +DENON_MODEL +0 +HTPC +FLICKR +MULTI CH IN +Absolute +-64.0 +off +OFF +FALSE +TRUE + diff --git a/tests/xml/AVR-X2000-formMainZone_MainZoneXmlStatus.xml b/tests/xml/AVR-X2000-formMainZone_MainZoneXmlStatus.xml new file mode 100644 index 0000000..da74d1c --- /dev/null +++ b/tests/xml/AVR-X2000-formMainZone_MainZoneXmlStatus.xml @@ -0,0 +1,51 @@ + + +LivingRoom +ON + +TUNER +CD +NETWORK +DVD +Blu-ray +TV AUDIO +CBL/SAT +GAME +AUX +Media Player +iPod/USB + + +TUNER +CCAUX +NETWORK +DVD +Chromecast +TV AUDIO +HTPC +GAME +AUX +ROKU +iPod/USB + + +USE +USE + +USE +USE +USE +USE +USE +USE +USE +USE + +SAT/CBL +Absolute +---- +MULTI CH IN +-64.0 +off +21XX E3 + diff --git a/tests/xml/AVR-X2000-formNetAudio_StatusXml.xml b/tests/xml/AVR-X2000-formNetAudio_StatusXml.xml new file mode 100644 index 0000000..6b8f724 --- /dev/null +++ b/tests/xml/AVR-X2000-formNetAudio_StatusXml.xml @@ -0,0 +1,62 @@ + + + +0 +0 +0 +0 +0 +0 +0 +0 +0 +0 + + +iPod/USB +No Connection + + + + + + + [ 0/0 ] + + +0 +0 + +0 + + + + + + + + + + + +0 +0 +0 +0 +0 +0 +0 +0 +4 +DENON_MODEL +0 +HTPC +FLICKR +MULTI CH IN +Absolute +-64.0 +off +OFF +FALSE +TRUE +