Changeset 478

Timestamp:

01/18/07 03:31:44 (6 years ago)

Author:

lincoln

Message:

paul noticed augment_timezone fails if it can't find the mysql.txt file

Files:

• grabbers/oztivo (modified) (4 diffs)
• postprocessors/augment_timezone (modified) (4 diffs)
• status (modified) (1 diff)

grabbers/oztivo

@@ -3 +3 @@
 # OzTivo grabber
 
-my $version = '0.13';
+my $version = '0.14';
 
 # Requires configuration!
@@ -27 +27 @@
 # 0.13  : all oztivo programming is in GMT.  add +0000 to its timezone
 #         so the rest of shepherd knows this.
+# 0.14  : rather than trying to guess channel mappings between OzTivo and
+#         Shepherd, ask the user at config time..
+#         only guess the first time around...
 
 use strict;
 
 use LWP::UserAgent;
-use Cwd;
 use Getopt::Long;
 use HTML::Entities;
@@ -37 +39 @@
 my $progname = 'oztivo';
 my $nicename = 'OzTivo';
-my $config_file = cwd() . "/$progname.pw";
-my $output_file = cwd() . "/output.xmltv";
+my $config_file = $progname.".pw";
+my $output_file = "output.xmltv";
 my $channels_file;
 my $channels, my $opt_channels;
@@ -263 +265 @@
 }
 
+
+
+<option value="31-Adl">31-Adl</option>
+<option value="31-Mel">31-Mel</option>
+<option value="31-Per">31-Per</option>
+<option value="31-Syd">31-Syd</option>
+<option value="BRIZ">BRIZ</option>
+
+<option value="7CEN">7CEN</option>
+
+<option value="ABC-Can">ABC-Can</option>
+<option value="ABC-NR">ABC-NR</option>
+<option value="ABC-NSW">ABC-NSW</option>
+<option value="ABC-NT">ABC-NT</option>
+<option value="ABC-Qld">ABC-Qld</option>
+<option value="ABC-RN">ABC-RN</option>
+<option value="ABC-SA">ABC-SA</option>
+<option value="ABC-Tas">ABC-Tas</option>
+<option value="ABC-Vic">ABC-Vic</option>
+<option value="ABC-WA">ABC-WA</option>
+
+<option value="ABC2">ABC2</option>
+
+<option value="IMP">IMP</option>
+
+<option value="Nine-Mel">Nine-Mel</option>
+<option value="Nine-NT">Nine-NT</option>
+<option value="Nine-Qld">Nine-Qld</option>
+<option value="Nine-SA">Nine-SA</option>
+<option value="Nine-Syd">Nine-Syd</option>
+<option value="Nine-WA">Nine-WA</option>
+<option value="NineHD-Mel">NineHD-Mel</option>
+<option value="WIN-Can">WIN-Can</option>
+<option value="WIN-NSW">WIN-NSW</option>
+<option value="WIN-Qld">WIN-Qld</option>
+<option value="WIN-Tas">WIN-Tas</option>
+<option value="WIN-Vic">WIN-Vic</option>
+<option value="WIN-WA">WIN-WA</option>
+
+<option value="SBS-AM">SBS-AM</option>
+<option value="SBS-Can">SBS-Can</option>
+<option value="SBS-FM">SBS-FM</option>
+<option value="SBS-NEWS">SBS-NEWS</option>
+<option value="SBS-NSW">SBS-NSW</option>
+<option value="SBS-NT">SBS-NT</option>
+<option value="SBS-Qld">SBS-Qld</option>
+<option value="SBS-SA">SBS-SA</option>
+<option value="SBS-Tas">SBS-Tas</option>
+<option value="SBS-Vic">SBS-Vic</option>
+<option value="SBS-WA">SBS-WA</option>
+<option value="SBSHD-Vic">SBSHD-Vic</option>
+<option value="SBSWN">SBSWN</option>
+
+<option value="Seven-Bris">Seven-Bris</option>
+<option value="Seven-Dar">Seven-Dar</option>
+<option value="Seven-Mel">Seven-Mel</option>
+<option value="Seven-Qld">Seven-Qld</option>
+<option value="Seven-SA">Seven-SA</option>
+<option value="Seven-Syd">Seven-Syd</option>
+<option value="Seven-WA">Seven-WA</option>
+<option value="SevenHD-Mel">SevenHD-Mel</option>
+<option value="Prime-Can">Prime-Can</option>
+<option value="Prime-GC">Prime-GC</option>
+<option value="Prime-Vic">Prime-Vic</option>
+<option value="PrimeN">PrimeN</option>
+<option value="PrimeS">PrimeS</option>
+
+<option value="Ten-Can">Ten-Can</option>
+<option value="Ten-NSW">Ten-NSW</option>
+<option value="Ten-Qld">Ten-Qld</option>
+<option value="Ten-SA">Ten-SA</option>
+<option value="Ten-Vic">Ten-Vic</option>
+<option value="Ten-WA">Ten-WA</option>
+<option value="TenHD-Vic">TenHD-Vic</option>
+<option value="SC-Tas">SC-Tas</option>
+<option value="SC10-GC">SC10-GC</option>
+<option value="SC10-NSW">SC10-NSW</option>
+<option value="SC10-Qld">SC10-Qld</option>
+<option value="SC10-Vic">SC10-Vic</option>
+
+<option value="ACC">ACC</option>
+<option value="ADULT">ADULT</option>
+<option value="ADULT1">ADULT1</option>
+<option value="ADULT2">ADULT2</option>
+<option value="ADV1">ADV1</option>
+<option value="AIRACT">AIRACT</option>
+<option value="ALJA">ALJA</option>
+<option value="ANIMAL">ANIMAL</option>
+<option value="ANT">ANT</option>
+<option value="ARCADE">ARCADE</option>
+<option value="ARNA">ARNA</option>
+<option value="ARNA+2">ARNA+2</option>
+<option value="ART">ART</option>
+<option value="AUR">AUR</option>
+<option value="AV">AV</option>
+<option value="BBC">BBC</option>
+<option value="BIOG">BIOG</option>
+<option value="BLM">BLM</option>
+<option value="BOOM">BOOM</option>
+<option value="CART">CART</option>
+<option value="CLAS">CLAS</option>
+<option value="CLAS+2">CLAS+2</option>
+<option value="CLUBV">CLUBV</option>
+<option value="CMC">CMC</option>
+<option value="CMDY">CMDY</option>
+<option value="CMDY+2">CMDY+2</option>
+<option value="CMTE">CMTE</option>
+<option value="CNBC">CNBC</option>
+<option value="CNNI">CNNI</option>
+<option value="CNNfn">CNNfn</option>
+<option value="CRIME">CRIME</option>
+<option value="Cinemax">Cinemax</option>
+<option value="DIG">DIG</option>
+<option value="DIG-jazz">DIG-jazz</option>
+<option value="DISC">DISC</option>
+<option value="DISN">DISN</option>
+<option value="DWTV">DWTV</option>
+<option value="Digital4">Digital4</option>
+<option value="E!">E!</option>
+<option value="ESPN">ESPN</option>
+<option value="EUROSPORT">EUROSPORT</option>
+<option value="EUROSPORT2">EUROSPORT2</option>
+<option value="EWTN">EWTN</option>
+<option value="EXPO">EXPO</option>
+<option value="FASH">FASH</option>
+<option value="FB01">FB01</option>
+<option value="FB02">FB02</option>
+<option value="FB03">FB03</option>
+<option value="FB04">FB04</option>
+<option value="FB05">FB05</option>
+<option value="FB06">FB06</option>
+<option value="FB07">FB07</option>
+<option value="FB08">FB08</option>
+<option value="FB09">FB09</option>
+<option value="FB10">FB10</option>
+<option value="FB11">FB11</option>
+<option value="FB12">FB12</option>
+<option value="FB13">FB13</option>
+<option value="FB14">FB14</option>
+<option value="FB15">FB15</option>
+<option value="FB16">FB16</option>
+<option value="FB17">FB17</option>
+<option value="FB18">FB18</option>
+<option value="FB19">FB19</option>
+<option value="FB20">FB20</option>
+<option value="FB21">FB21</option>
+<option value="FB22">FB22</option>
+<option value="FB23">FB23</option>
+<option value="FB24">FB24</option>
+<option value="FB25">FB25</option>
+<option value="FB26">FB26</option>
+<option value="FB27">FB27</option>
+<option value="FFC">FFC</option>
+<option value="FFC-NSW">FFC-NSW</option>
+<option value="FFC-Qld">FFC-Qld</option>
+<option value="FFC-SA">FFC-SA</option>
+<option value="FFC-Vic">FFC-Vic</option>
+<option value="FFC-WA">FFC-WA</option>
+<option value="FOOD">FOOD</option>
+<option value="FOX8">FOX8</option>
+<option value="FOX8+2">FOX8+2</option>
+<option value="FOXN">FOXN</option>
+<option value="FS1">FS1</option>
+<option value="FS2">FS2</option>
+<option value="FS3">FS3</option>
+<option value="FSN">FSN</option>
+<option value="FUEL">FUEL</option>
+<option value="GTS-BKN">GTS-BKN</option>
+<option value="GUIDE">GUIDE</option>
+<option value="GWN-WA">GWN-WA</option>
+<option value="GWORLD">GWORLD</option>
+<option value="H&amp;L">H&amp;L</option>
+<option value="HALL">HALL</option>
+<option value="HBOMovie">HBOMovie</option>
+<option value="HEALTH">HEALTH</option>
+<option value="HIST">HIST</option>
+<option value="HIST+2">HIST+2</option>
+<option value="HOUSE">HOUSE</option>
+<option value="HOWTO">HOWTO</option>
+<option value="JJJ">JJJ</option>
+<option value="LBC">LBC</option>
+<option value="LIFE">LIFE</option>
+<option value="LIFE+2">LIFE+2</option>
+<option value="LNTV">LNTV</option>
+<option value="MAIN">MAIN</option>
+<option value="MCMTop">MCMTop</option>
+<option value="MINDGAMES">MINDGAMES</option>
+<option value="MOV1">MOV1</option>
+<option value="MOV1+2">MOV1+2</option>
+<option value="MOVG">MOVG</option>
+<option value="MOVX">MOVX</option>
+<option value="MTV">MTV</option>
+<option value="NBN">NBN</option>
+<option value="NBN-GC">NBN-GC</option>
+<option value="NGEO">NGEO</option>
+<option value="NICK">NICK</option>
+<option value="NICKJR">NICKJR</option>
+<option value="ODY">ODY</option>
+<option value="OVAT">OVAT</option>
+<option value="PHDISN">PHDISN</option>
+<option value="PREVIEW">PREVIEW</option>
+<option value="RAI">RAI</option>
+<option value="RMTV">RMTV</option>
+<option value="SCIENCE">SCIENCE</option>
+<option value="SENATE">SENATE</option>
+<option value="SHOW">SHOW</option>
+<option value="SHW2">SHW2</option>
+<option value="SHWGRTS">SHWGRTS</option>
+<option value="SKYN">SKYN</option>
+<option value="SKYR">SKYR</option>
+<option value="SPORTSEL">SPORTSEL</option>
+<option value="STC">STC</option>
+<option value="Sci-Fi">Sci-Fi</option>
+<option value="ServiceNSW">ServiceNSW</option>
+<option value="StarMovies">StarMovies</option>
+<option value="StarWorld">StarWorld</option>
+<option value="TABNSW">TABNSW</option>
+<option value="TCM">TCM</option>
+<option value="TDT-Tas">TDT-Tas</option>
+<option value="TRAVEL">TRAVEL</option>
+<option value="TV1">TV1</option>
+<option value="TV1+2">TV1+2</option>
+<option value="TV5">TV5</option>
+<option value="TVN">TVN</option>
+<option value="TVSN">TVSN</option>
+<option value="TWC">TWC</option>
+<option value="Test">Test</option>
+<option value="UKTV">UKTV</option>
+<option value="UKTV+2">UKTV+2</option>
+<option value="V">V</option>
+<option value="VH1">VH1</option>
+<option value="W">W</option>
+<option value="W+2">W+2</option>
+<option value="WMOV">WMOV</option>
+<option value="max">max</option>
+

postprocessors/augment_timezone

@@ -31 +31 @@
 
 use strict;
-my $progname = "adjust_timezone";
-my $version = "0.06";
+my $progname = "augment_timezone";
+my $version = "0.07";
 
 use XMLTV;
@@ -102 +102 @@
 
 &get_database_settings;
-&get_timeoffset_setting;
 
 $opt->{timeoffset} = "None" if (!defined $opt->{timeoffset});
@@ -238 +237 @@
         my $cfgfile = &find_database_settings_file;
         return if (!defined $cfgfile);
+
+        #
+        # find database settings
+        #
 
         if (!(open(F,"<$cfgfile"))) {
@@ -260 +263 @@
         }
         close(F);
-}
-
-##############################################################################
-
-sub get_timeoffset_setting
-{
+
+        #
+        # 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".

status

@@ -12 +12 @@
 reconciler      reconciler_mk2      0.19
 postprocessor   imdb_augment_data   0.08
-postprocessor   augment_timezone    0.06
+postprocessor   augment_timezone    0.07