70_DENON_AVR: introducing new way of reading model information

git-svn-id: https://svn.fhem.de/fhem/trunk@21262 2b470e98-0d58-463d-a4d8-8e2adae1ed80

fhem/CHANGED

@@ -1,5 +1,6 @@
 # Add changes at the top of the list. Keep it in ASCII, and 80-char wide.
 # Do not insert empty lines here, update check depends on it.
+ - feature: 70_DENON_AVR: introducing new way of reading model information
  - change:  70_DENON_AVR: more modes, commands, and readings (thx Shadow3561)
  - change:  98_weekprofile: use module Attribute configFile also by configDB
  - bugfix:  98_weekprofile: use global logdir

fhem/FHEM/70_DENON_AVR.pm

@@ -32,6 +32,7 @@ package main;
 use strict;
 use warnings;
 use Time::HiRes qw(gettimeofday);
+use HttpUtils;
 
 sub DENON_AVR_Get($@);
 sub DENON_AVR_Set($@);
@@ -940,6 +941,49 @@ DENON_GetKey($$;$) {
     }
 }
 
+sub DENON_AVR_PerformHttpRequest {
+    my ($hash) = @_;
+    my $name = $hash->{NAME};
+
+    my $url = "http://$hash->{IP}/goform/Deviceinfo.xml";
+    Log3 $name, 4, "DENON_AVR ($name) - requesting $url";
+    my $param = {
+                    url        => "$url",
+                    timeout    => 5,
+                    hash       => $hash,
+                    method     => "GET",
+                    header     => "User-Agent: FHEM\r\nAccept: application/xml",
+                    callback   => \&DENON_AVR_ParseHttpResponse
+                };
+
+    HttpUtils_NonblockingGet($param);
+}
+
+sub DENON_AVR_ParseHttpResponse {
+  my ($param, $err, $data) = @_;
+  my $hash = $param->{hash};
+  my $name = $hash->{NAME};
+  my $return;
+
+  if($err ne "") {
+      Log3 $name, 0, "DENON_AVR ($name) - Error while requesting ".$param->{url}." - $err";
+      readingsBeginUpdate($hash);
+      readingsBulkUpdate($hash, 'httpState', 'ERROR', 0);
+      readingsBulkUpdate($hash, 'httpError', $err, 0);
+      readingsEndUpdate($hash, 0);
+  } elsif($data ne "") {
+      Log3 $name, 5, "DENON_AVR ($name) - Deviceinfo.xml\n$data";
+      my $ref = XMLin($data, KeyAttr => { }, ForceArray => [ ]);
+
+      my $codes = {
+        '0' => 'Denon',
+        '1' => 'Marantz'
+      };
+      my $brandCode = $ref->{BrandCode};
+
+      $hash->{model} = $codes->{$brandCode} . ' ' . $ref->{ModelName};
+  }
+}
 
 ###################################
 sub
@@ -1028,6 +1072,10 @@ DENON_AVR_Define($$)
 	# connect using TCP connection (non-blocking style)
 	else
 	{
+                $hash->{IP} = $a[2];
+                use XML::Simple qw(:strict);
+                DENON_AVR_PerformHttpRequest($hash);
+
 		$hash->{DeviceName} = $hash->{DeviceName} . ":23"
 			if ( $hash->{DeviceName} !~ m/^(.+):([0-9]+)$/ );