Changeset 680

Timestamp:

05/23/07 23:14:07 (6 years ago)

Author:

max

Message:

Added Shepherd::MythTV for interaction with MythTV database
Migrated augment_timezone postprocessor to use it

Files:

• postprocessors/Shepherd (added)
• postprocessors/augment_timezone (modified) (5 diffs)
• references/Shepherd/MythTV.pm (added)
• status (modified) (1 diff)

postprocessors/augment_timezone

@@ -32 +32 @@
 use strict;
 my $progname = "augment_timezone";
-my $version = "0.12";
+my $version = "0.13";
 
 use XMLTV;
 use POSIX qw(strftime mktime);
 use Getopt::Long;
-use DBI;
 use IO::File;
+use Shepherd::MythTV;
 
 $| = 1;
-my $dbh;
 my %stats;
 
 my $opt = { };
 $opt->{output_file} =   "output.xmltv";
-$opt->{mysql_file} =    "/usr/local/share/mythtv/mysql.txt".
-                        ":/usr/share/mythtv/mysql.txt".
-                        ":$ENV{HOME}/.mythtv/mysql.txt".
-                        ":/home/mythtv/.mythtv/mysql.txt".
-                        ":/root/.mythtv/mysql.txt".
-                        ":/etc/mythtv/mysql.txt";
-
 $opt->{debug} =                 0;
 
@@ -87 +79 @@
 
         if ($opt->{help} || $opt->{output_file} eq "") {
+                my $default_loc = &Shepherd::MythTV::standard_mysql_locations;
                 print<<EOF
 
@@ -93 +86 @@
 Supported options include:
   --output={file}      Send final XMLTV output to {file} (default: $opt->{output_file})
-  --mysql_file={file}  File where we look for mythtv database user/pass/dbi (default: $opt->{mysql_file})
+  --mysql_file={file}  File where we look for mythtv database user/pass/dbi (default: $default_loc)
   --timeoffset={s}     Specify MythTV's setting, rather than try to look it up
                        in MythTV's database. (E.g. "Auto", "None", "+1000")
@@ -103 +96 @@
 }
 
-&get_database_settings unless ($opt->{timeoffset});
+unless ($opt->{timeoffset}) {
+        # Specify a non-standard location for mysql.txt
+        Shepherd::MythTV::setup($opt->{mysql_file}) if ($opt->{mysql_file});
+
+        my $sql = "SELECT data FROM settings WHERE value LIKE 'TimeOffset'";
+        ($opt->{timeoffset}) = Shepherd::MythTV::query($sql);
+        unless ($opt->{timeoffset}) {
+                print "         Won't augment any timezones!\n" .
+                      "         Assuming MythTV's timezone is \"None\".\n".
+                      "         *** If this is wrong, guide data may be in wrong timezone! ***\n\n";
+        }
+}
 
 $opt->{timeoffset} = "None" if (!defined $opt->{timeoffset});
@@ -217 +221 @@
 }
 
-##############################################################################
-
-sub find_database_settings_file
-{
-        foreach my $cfgfile (split(/:/,$opt->{mysql_file})) {
-                return $cfgfile if ((-f $cfgfile) && (-r $cfgfile));
-        }
-
-        printf "\nWARNING: Could not find MythTV mysql.txt config file\n".
-               "         (looked in ".$opt->{mysql_file}.")\n".
-               "         Assuming MythTV's timezone is \"None\".\n".
-               "         *** If this is wrong, guide data may be in wrong timezone! ***\n\n";
-        $stats{missing_mysql_database_file}++;
-        return undef;
-}
-
-##############################################################################
-
-sub get_database_settings
-{
-        my $cfgfile = &find_database_settings_file;
-        return if (!defined $cfgfile);
-
-        #
-        # find database settings
-        #
-
-        if (!(open(F,"<$cfgfile"))) {
-                print "WARNING: could not read $cfgfile: $!\n".
-                      "Won't augment any timezones!\n";
-                $stats{mysql_database_file_unreadable}++;
-                return;
-        }
-
-        while (<F>) {
-                chop;
-
-                if ($_ =~ /^DBHostName=(.*)$/) {
-                        $opt->{dbhost} = $1;
-                } elsif ($_ =~ /^DBUserName=(.*)$/) {
-                        $opt->{dbuser} = $1;
-                } elsif ($_ =~ /^DBPassword=(.*)$/) {
-                         $opt->{dbpass} = $1;
-                } elsif ($_ =~ /^DBName=(.*)$/) {
-                        $opt->{dbname} = $1;
-                }
-        }
-        close(F);
-
-        #
-        # look up the timeoffset setting
-        #
-
-        if (!($dbh = DBI->connect("dbi:mysql:database=".$opt->{dbname}.":host=".$opt->{dbhost},$opt->{dbuser}, $opt->{dbpass}))) {
-                print "WARNING: Couldn't connect to database ".$opt->{dbname}.": $!\n".
-                      "         Won't augment any timezones!\n";
-                $stats{mysql_database_connect_failed}++;
-                return;
-        }
-
-        my $q = "SELECT data FROM settings WHERE value LIKE 'TimeOffset'";
-        if (!($opt->{timeoffset} = $dbh->selectrow_array($q))) {
-                print "WARNING: Couldn't query database: $q: $!\n".
-                      "         Won't augment any timezones!\n";
-                $stats{mysql_database_query_failed}++;
-                return;
-        }
-}
-

status

@@ -12 +12 @@
 postprocessor   imdb_augment_data   0.14
 postprocessor   flag_aus_hdtv       0.16
-postprocessor   augment_timezone    0.12
+postprocessor   augment_timezone    0.13
 reference       channel_list        2
 reference       Shepherd/Common.pm  0.9
+reference       Shepherd/MythTV.pm  0.1