Changeset 355

Timestamp:

12/12/06 15:03:32 (7 years ago)

Author:

lincoln

Message:

augment_timezone is alive

Files:

• postprocessors/augment_timezone (modified) (8 diffs)
• postprocessors/augment_timezone.conf (modified) (1 diff)
• status (modified) (1 diff)

postprocessors/augment_timezone

@@ -1 +1 @@
 #!/usr/bin/perl -w
 
-# Augment XMLTV start/stop times with the local timezone
+# Augment XMLTV start/stop times with the local timezone if MythTV's
+# TimeOffset setting is anything other than "None"
 #  * to be used as a postprocessor for XMLTV data
 #  * can be used in conjunction with 'shepherd' XMLTV reconciler or standalone
@@ -11 +12 @@
 #  start/stop times are in 'localtime'.
 #
-#  If MythTV's "TimeOffset" setting is set to 'All', this will cause all
-#  programming information to be out, because MythTV's 'All' setting
-#  means data with no timezone is in GMT.
+#  If MythTV's "TimeOffset" setting is set to anything other than 'None',
+#  this can cause programming information to be out:
+#   - if set to 'All', all programs will be out by the difference between
+#     GMT and locatime ('All' means MythTV is expecting all start/stop times
+#     in GMT)
+#   - if explicitly set to GMT +/- XX then this will cause programming to
+#     be out whenever there is a switchover to/from daylight savings
 #
 #  this postprocessor addresses this by explicitly putting a timezone
-#  on every programme that doesn't already have one.
+#  on every programme that doesn't already have one, BUT ONLY IF
+#  MythTV is configured to anything other than 'None'.
+#
 #  provided your unix system is configured into the correct timezone,
 #  this will work just fine including boundaries crossing daylight savings.
 #
 #  it means that it doesn't matter if MythTV's "TimeOffset" is set to
-#  'All' or 'None', the data will be right regardless.
+#  'All' or 'None', or something inbetween, the data will be right regardless.
 
 use strict;
 my $progname = "adjust_timezone";
-my $version = "0.01";
+my $version = "0.02";
 
 use XMLTV;
 use POSIX qw(strftime mktime);
 use Getopt::Long;
+use DBI;
+
 
 $| = 1;
+my $dbh;
 
 my $opt = { };
-$opt->{output_file} =           "output.xmltv";
+$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;
 
@@ -40 +57 @@
 GetOptions(
         'output=s'              => \$opt->{output_file},
+        'mysql_file=s'          => \$opt->{mysql_file},
 
         'help'                  => \$opt->{help},
@@ -66 +84 @@
 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})
   --debug              enable debugging
 
@@ -74 +93 @@
 }
 
-@ARGV = ('-') if not @ARGV;
-
-# go go go!
+&get_database_settings;
+&get_timeoffset_setting;
+
+if ($opt->{timeoffset} eq "None") {
+        print " - MythTV's TimeOffset setting is set to \"None\". No need to do anything.\n";
+} else {
+        print " - MythTV's TimeOffset setting is set to \"%s\". Adding timezones.\n",$$opt->{timeoffset};
+}
 
 my %writer_args = ( encoding => 'ISO-8859-1' );
@@ -87 +111 @@
         'generator-info-name' => "$progname $version"} );
 
+@ARGV = ('-') if not @ARGV;
 foreach my $file (@ARGV) {
-        printf "Parsing: %s", ($file eq "-" ? "(from-stdin, hit control-D to finiah)" : $file);
+        printf " - parsing: %s\n", ($file eq "-" ? "(from-stdin, hit control-D to finiah)" : $file);
         XMLTV::parsefiles_callback(undef, undef, \&channel_cb,\&programme_cb, $file);
 }
@@ -111 +136 @@
         my $prog=shift;
 
-        # if there is no timezone present in start time, put one there
-        if (($prog->{start} !~ /\+/) && ($prog->{start} !~ /\-/)) {
-                $prog->{start} = POSIX::strftime("%Y%m%d%H%M %z",localtime(parse_xmltv_date($prog->{start})));
-        }
-
-        # if there is no timezone present in stop time, put one there
-        if (($prog->{stop} !~ /\+/) && ($prog->{stop} !~ /\-/)) {
-                $prog->{stop} = POSIX::strftime("%Y%m%d%H%M %z",localtime(parse_xmltv_date($prog->{stop})));
+        if ($opt->{timeoffset} ne "None") {
+                # if there is no timezone present in start time, put one there
+                if (($prog->{start} !~ /\+/) && ($prog->{start} !~ /\-/)) {
+                        $prog->{start} = POSIX::strftime("%Y%m%d%H%M %z",localtime(parse_xmltv_date($prog->{start})));
+                }
+
+                # if there is no timezone present in stop time, put one there
+                if (($prog->{stop} !~ /\+/) && ($prog->{stop} !~ /\-/)) {
+                        $prog->{stop} = POSIX::strftime("%Y%m%d%H%M %z",localtime(parse_xmltv_date($prog->{stop})));
+                }
         }
 
@@ -171 +198 @@
         return $gmt_offset;
 }
-##############################################################################
+
+##############################################################################
+
+sub find_database_settings_file
+{
+        foreach my $cfgfile (split(/:/,$opt->{mysql_file})) {
+                return $cfgfile if ((-f $cfgfile) && (-r $cfgfile));
+        }
+
+        die "could not find MythTV mysql.txt config file, cannot proceed. ".
+            "(looked in ".$opt->{mysql_file}.")\n";
+}
+
+##############################################################################
+
+sub get_database_settings
+{
+        my $cfgfile = &find_database_settings_file;
+        open(F,"<$cfgfile") || die "could not read $cfgfile: $!\n";
+        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);
+}
+
+##############################################################################
+
+sub get_timeoffset_setting
+{
+        $dbh = DBI->connect("dbi:mysql:database=".$opt->{dbname}.":host=".$opt->{dbhost},
+            $opt->{dbuser}, $opt->{dbpass}) || die "couldn't connect to database ".$opt->{dbname}.": $!\n";
+
+        my $q = "SELECT data FROM settings WHERE value LIKE 'TimeOffset'";
+        $opt->{timeoffset} = $dbh->selectrow_array($q) || die "could not execute query $q: $!\n";
+}
+

postprocessors/augment_timezone.conf

@@ -2 +2 @@
             'option_ready' => '--version',
             'max_runtime' => '2',
-            'desc' => 'Augment XMLTV start/stop times with local timezone ensuring start/stop times are correct regardless of MythTV\'s TImeOffset setting'
+            'desc' => 'Augment XMLTV start/stop times with local timezone ensuring start/stop times are correct if MythTV\'s TImeOffset setting is set to anything other than None'
           };

status

@@ -12 +12 @@
 reconciler      reconciler_mk2      0.16
 postprocessor   imdb_augment_data   0.06
+postprocessor   augment_timezone    0.02