Replace all db calls with the proper MythTV object parameter/methods. This closes #3201

ex-nerd · ex-nerd · commit fb7a62fe75d5 · 2007-03-13T05:16:23.000Z
diff --git a/nuvexport/export/NUV_SQL.pm b/nuvexport/export/NUV_SQL.pm
@@ -19,7 +19,6 @@ package export::NUV_SQL;
     use nuv_export::shared_utils;
     use nuv_export::cli;
     use nuv_export::ui;
-    use mythtv::db;
     use mythtv::recordings;
 
     sub new {
@@ -109,7 +108,7 @@ package export::NUV_SQL;
         print DATA "USE mythconverg;\n\n";
         foreach $table ('recorded', 'oldrecorded', 'recordedmarkup', 'recordedseek') {
             $q = "SELECT * FROM $table WHERE chanid=? AND starttime=FROM_UNIXTIME(?)";
-            $sh = $dbh->prepare($q);
+            $sh = $Myth->{'dbh'}->prepare($q);
             $sh->execute($episode->{'chanid'}, $episode->{'starttime'})
                 or die "Count not execute ($q):  $!\n\n";
             my $count = 0;
@@ -146,17 +145,17 @@ package export::NUV_SQL;
         #
         # Remove the entry from recordedmarkup
             $q = 'DELETE FROM recordedmarkup WHERE chanid=? AND starttime=FROM_UNIXTIME(?)';
-            $sh = $dbh->prepare($q);
+            $sh = $Myth->{'dbh'}->prepare($q);
             $sh->execute($episode->{'chanid'}, $episode->{'starttime'})
                 or die "Could not execute ($q):  $!\n\n";
         # Remove this entry from the database
             $q = 'DELETE FROM recorded WHERE chanid=? AND starttime=FROM_UNIXTIME(?)';
-            $sh = $dbh->prepare($q);
+            $sh = $Myth->{'dbh'}->prepare($q);
             $sh->execute($episode->{'chanid'}, $episode->{'starttime'})
                 or die "Could not execute ($q):  $!\n\n";
         # Tell the other nodes that changes have been made
             $q = 'UPDATE settings SET data="yes" WHERE value="RecordChanged"';
-            $sh = $dbh->prepare($q);
+            $sh = $Myth->{'dbh'}->prepare($q);
             $sh->execute()
                 or die "Could not execute ($q):  $!\n\n";
         }
diff --git a/nuvexport/export/ffmpeg/ASF.pm b/nuvexport/export/ffmpeg/ASF.pm
@@ -14,7 +14,6 @@ package export::ffmpeg::ASF;
     use nuv_export::shared_utils;
     use nuv_export::cli;
     use nuv_export::ui;
-    use mythtv::db;
     use mythtv::recordings;
 
 # Load the following extra parameters from the commandline
diff --git a/nuvexport/export/ffmpeg/DVCD.pm b/nuvexport/export/ffmpeg/DVCD.pm
@@ -14,7 +14,6 @@ package export::ffmpeg::DVCD;
     use nuv_export::shared_utils;
     use nuv_export::cli;
     use nuv_export::ui;
-    use mythtv::db;
     use mythtv::recordings;
 
 # Load the following extra parameters from the commandline
diff --git a/nuvexport/export/ffmpeg/DVD.pm b/nuvexport/export/ffmpeg/DVD.pm
@@ -14,7 +14,6 @@ package export::ffmpeg::DVD;
     use nuv_export::shared_utils;
     use nuv_export::cli;
     use nuv_export::ui;
-    use mythtv::db;
     use mythtv::recordings;
 
 # Load the following extra parameters from the commandline
diff --git a/nuvexport/export/ffmpeg/DivX.pm b/nuvexport/export/ffmpeg/DivX.pm
@@ -14,7 +14,6 @@ package export::ffmpeg::DivX;
     use nuv_export::shared_utils;
     use nuv_export::cli;
     use nuv_export::ui;
-    use mythtv::db;
     use mythtv::recordings;
 
 # Load the following extra parameters from the commandline
diff --git a/nuvexport/export/ffmpeg/MP3.pm b/nuvexport/export/ffmpeg/MP3.pm
@@ -14,7 +14,6 @@ package export::ffmpeg::MP3;
     use nuv_export::shared_utils;
     use nuv_export::cli;
     use nuv_export::ui;
-    use mythtv::db;
     use mythtv::recordings;
 
 # Load the following extra parameters from the commandline
diff --git a/nuvexport/export/ffmpeg/MP4.pm b/nuvexport/export/ffmpeg/MP4.pm
@@ -20,7 +20,6 @@ package export::ffmpeg::MP4;
     use nuv_export::shared_utils;
     use nuv_export::cli;
     use nuv_export::ui;
-    use mythtv::db;
     use mythtv::recordings;
 
 # Load the following extra parameters from the commandline
diff --git a/nuvexport/export/ffmpeg/PSP.pm b/nuvexport/export/ffmpeg/PSP.pm
@@ -15,7 +15,6 @@ package export::ffmpeg::PSP;
     use nuv_export::shared_utils;
     use nuv_export::cli;
     use nuv_export::ui;
-    use mythtv::db;
     use mythtv::recordings;
 
 # Load the following extra parameters from the commandline
diff --git a/nuvexport/export/ffmpeg/SVCD.pm b/nuvexport/export/ffmpeg/SVCD.pm
@@ -14,7 +14,6 @@ package export::ffmpeg::SVCD;
     use nuv_export::shared_utils;
     use nuv_export::cli;
     use nuv_export::ui;
-    use mythtv::db;
     use mythtv::recordings;
 
 # Load the following extra parameters from the commandline
diff --git a/nuvexport/export/ffmpeg/VCD.pm b/nuvexport/export/ffmpeg/VCD.pm
@@ -14,7 +14,6 @@ package export::ffmpeg::VCD;
     use nuv_export::shared_utils;
     use nuv_export::cli;
     use nuv_export::ui;
-    use mythtv::db;
     use mythtv::recordings;
 
 # Load the following extra parameters from the commandline
diff --git a/nuvexport/export/ffmpeg/XviD.pm b/nuvexport/export/ffmpeg/XviD.pm
@@ -15,7 +15,6 @@ package export::ffmpeg::XviD;
     use nuv_export::shared_utils;
     use nuv_export::cli;
     use nuv_export::ui;
-    use mythtv::db;
     use mythtv::recordings;
 
 # Load the following extra parameters from the commandline
diff --git a/nuvexport/export/mencoder/XviD.pm b/nuvexport/export/mencoder/XviD.pm
@@ -15,7 +15,6 @@ package export::mencoder::XviD;
     use nuv_export::shared_utils;
     use nuv_export::cli;
     use nuv_export::ui;
-    use mythtv::db;
     use mythtv::recordings;
 
 # Load the following extra parameters from the commandline
diff --git a/nuvexport/export/transcode/DVCD.pm b/nuvexport/export/transcode/DVCD.pm
@@ -14,7 +14,6 @@ package export::transcode::DVCD;
     use nuv_export::shared_utils;
     use nuv_export::cli;
     use nuv_export::ui;
-    use mythtv::db;
     use mythtv::recordings;
 
 # Load the following extra parameters from the commandline
diff --git a/nuvexport/export/transcode/DVD.pm b/nuvexport/export/transcode/DVD.pm
@@ -14,7 +14,6 @@ package export::transcode::DVD;
     use nuv_export::shared_utils;
     use nuv_export::cli;
     use nuv_export::ui;
-    use mythtv::db;
     use mythtv::recordings;
 
 # Load the following extra parameters from the commandline
diff --git a/nuvexport/export/transcode/SVCD.pm b/nuvexport/export/transcode/SVCD.pm
@@ -14,7 +14,6 @@ package export::transcode::SVCD;
     use nuv_export::shared_utils;
     use nuv_export::cli;
     use nuv_export::ui;
-    use mythtv::db;
     use mythtv::recordings;
 
 # Load the following extra parameters from the commandline
diff --git a/nuvexport/export/transcode/VCD.pm b/nuvexport/export/transcode/VCD.pm
@@ -14,7 +14,6 @@ package export::transcode::VCD;
     use nuv_export::shared_utils;
     use nuv_export::cli;
     use nuv_export::ui;
-    use mythtv::db;
     use mythtv::recordings;
 
 # Load the following extra parameters from the commandline
diff --git a/nuvexport/export/transcode/XviD.pm b/nuvexport/export/transcode/XviD.pm
@@ -14,7 +14,6 @@ package export::transcode::XviD;
     use nuv_export::shared_utils;
     use nuv_export::cli;
     use nuv_export::ui;
-    use mythtv::db;
     use mythtv::recordings;
 
 # Load the following extra parameters from the commandline
diff --git a/nuvexport/mythtv/db.pm b/nuvexport/mythtv/db.pm
diff --git a/nuvexport/mythtv/recordings.pm b/nuvexport/mythtv/recordings.pm
@@ -13,7 +13,6 @@ package mythtv::recordings;
     use DBI;
     use nuv_export::shared_utils;
     use nuv_export::cli;
-    use mythtv::db;
     use mythtv::nuvinfo;
     use Date::Manip;
 
diff --git a/nuvexport/nuv_export/task.pm b/nuvexport/nuv_export/task.pm
@@ -10,7 +10,6 @@ package nuv_export::task;
 
 # Load the myth and nuv utilities, and connect to the database
     use nuvexport::shared_utils;
-    use mythtv::db;
     use mythtv::recordings;
 
     BEGIN {
diff --git a/nuvexport/nuv_export/ui.pm b/nuvexport/nuv_export/ui.pm
@@ -60,7 +60,7 @@ package nuv_export::ui;
         # Filename specified on the command line -- extract the chanid and starttime
             if (arg('infile')) {
             # Try to pick out the chanid and starttime from the database
-                my $sh = $dbh->prepare('SELECT chanid, UNIX_TIMESTAMP(starttime) FROM recorded WHERE basename=?');
+                my $sh = $Myth->{'dbh'}->prepare('SELECT chanid, UNIX_TIMESTAMP(starttime) FROM recorded WHERE basename=?');
                 if ($sh) {
                 # Stip off the video directory so the basename will actually match
                     my $infile = arg('infile');
diff --git a/nuvexport/nuvexport b/nuvexport/nuvexport
@@ -212,5 +212,12 @@
 # Exit gracefully
     exit;
 
+# Escape a string for db insertion
+    sub mysql_escape {
+        $string = shift;
+        return 'NULL' unless (defined $string);
+        $string =~ s/'/\\'/sg;
+        return "'$string'";
+    }
 
 # vim:ts=4:sw=4:ai:et:si:sts=4
