Ticket #13293: perl-config-parser-v0.patch

mythtv/bindings/perl/MythTV.pm

@@ -8 +8 @@
 #
 
 # Version
-    $VERSION = '.28git';
+    $VERSION = 'v30git';
 
 # Load sub libraries
     use IO::Socket::INET::MythTV;
@@ -24 +24 @@
     use HTTP::Request;
     use LWP::UserAgent;
     use POSIX;
+    use XML::Simple qw(:strict);
+    #use XML::LibXML;
+    #use Data::Dumper;
 
 # Load the UPNP libraries if we have them, but die nicely if we don't.
     BEGIN {
@@ -170 +173 @@
         ? $ENV{'MYTHCONFDIR'}
         : "$homedir/.mythtv"
         ;
-    unless (-T "$conf/config.xml") {
+    my $config_file = "$conf/config.xml";
+    unless (-T "$config_file") {
+
         unless ($has_upnp) {
             die "Please install Net::UPnP or copy ~/.mythtv/config.xml\n"
-               ."from a working MythTV installation to $conf/config.xml.\n";
+               ."from a working MythTV installation to $config_file.\n";
         }
     # Try to create the config directory first, so we can die sooner if it fails.
         unless (-d $conf) {
@@ -243 +248 @@
             #print $dev->getfriendlyname(), "\n";
         }
     # Save the config.xml
-        open CONF, ">$conf/config.xml" or die "Can't write to $conf/config.xml:  $!\n";
+        open CONF, ">$config_file" or die "Can't write to $config_file:  $!\n";
         print CONF <<EOF;
 <Configuration>
   <UPnP>
@@ -286 +291 @@
                        'db_name'  => 'mythconverg',
                        'upnp_pin' => '',
                       );
-    open(CONF, "$conf/config.xml") or die "Unable to read $conf/config.xml:  $!\n";
-    while (my $line = <CONF>) {
-    # Search through the XML data
-        if ($line =~ m#<SecurityPin>(.*?)</SecurityPin>#) {
-            $mysql_conf{'upnp_pin'} = $1;
-        }
-        elsif (($line =~ m#<Host>(.*?)</Host>#) ||
-               ($line =~ m#<DBHostName>(.*?)</DBHostName>#)) {
-            $mysql_conf{'db_host'}  = $1;
-        }
-        elsif (($line =~ m#<UserName>(.*?)</UserName>#) ||
-               ($line =~ m#<DBUserName>(.*?)</DBUserName>#)) {
-            $mysql_conf{'db_user'}  = $1;
-        }
-        elsif (($line =~ m#<Password>(.*?)</Password>#) ||
-               ($line =~ m#<DBPassword>(.*?)</DBPassword>#)) {
-            $mysql_conf{'db_pass'}  = $1;
-            $mysql_conf{'db_pass'} =~ s/&amp;/&/sg;
-            $mysql_conf{'db_pass'} =~ s/&gt;/>/sg;
-            $mysql_conf{'db_pass'} =~ s/&lt;/</sg;
-        }
-        elsif (($line =~ m#<DatabaseName>(.*?)</DatabaseName>#) ||
-               ($line =~ m#<DBName>(.*?)</DBName>#)) {
-            $mysql_conf{'db_name'}  = $1;
-        }
-        elsif (($line =~ m#<Port>(\d*?)</Port>#) ||
-               ($line =~ m#<DBPort>(.*?)</DBPort>#)) {
-            $mysql_conf{'db_port'}  = $1;
-        }
-    # Hostname override.  Not sure if this is still valid or not
-        elsif ($line =~ m#<LocalHostName>(.*?)</LocalHostName>#) {
-            $profileoverride = $1;
-            if ($profileoverride =~ /^\s*$/) {
-                print STDERR "Warning: LocalHostName tag is empty. Ignoring.\n";
-            } elsif ($profileoverride ne "my-unique-identifier-goes-here") {
-                $mysql_conf{'hostname'} = $profileoverride;
-            }
+
+    my $xml = new XML::Simple;
+    my $config = $xml->XMLin($config_file, ForceArray => 0, KeyAttr => [ ]);
+
+    my $cfg_err = 0;
+
+    foreach my $cfg_element ('Host', 'UserName', 'Password', 'DatabaseName', 'Port') {
+        if (ref $config->{'Database'}->{$cfg_element} eq 'ARRAY') {
+            print STDERR "<$cfg_element> appers more than once in $config_file\n";
+            $cfg_err++;
+        }
+        if (!length $config->{'Database'}->{$cfg_element}) {
+            print STDERR "<$cfg_element> is missing from $config_file\n";
+            $cfg_err++;
         }
     }
-    close CONF;
 
-# Cleanup
+    if ($cfg_err > 0) {
+        return;
+    }
+
+    $mysql_conf{'db_host'} = $config->{'Database'}->{'Host'};
+    $mysql_conf{'db_user'} = $config->{'Database'}->{'UserName'};
+    $mysql_conf{'db_pass'} = $config->{'Database'}->{'Password'};
+    $mysql_conf{'db_name'} = $config->{'Database'}->{'DatabaseName'};
+    $mysql_conf{'db_port'} = $config->{'Database'}->{'Port'};
+    $mysql_conf{'hostname'} = $config->{'LocalHostName'};
+
+=pod # XMLLib:
+    my $config = eval {
+        XML::LibXML->load_xml(location => $config_file);
+    };
+    if($@) {
+        print STDERR "XML format error in '$config_file':\n$@";
+        return;
+    }
+
+    foreach my $credentials ($config->findnodes('//Database')) {
+        $mysql_conf{'db_host'} = $credentials->findvalue('./Host');
+        $mysql_conf{'db_user'} = $credentials->findvalue('./UserName');
+        $mysql_conf{'db_pass'} = $credentials->findvalue('./Password');
+        $mysql_conf{'db_name'} = $credentials->findvalue('./DatabaseName');
+        $mysql_conf{'db_port'} = $credentials->findvalue('./Port');
+    }
+    $mysql_conf{'hostname'} = $config->findnodes('Configuration/LocalHostName');
+=cut
+
+    #print Dumper($config);
+
+# Default DB port
     $mysql_conf{'db_port'} ||= 3306;
 
 # Constructor