Ticket #1582: myth.rebuilddatabase.pl.diff

myth.rebuilddatabase.pl

@@ -49 +49 @@
 ##    - changed all the DB calls to use parameters (avoids escape issues,
 ##      and it looks better)
 
+## 23-03-2006: (red321)
+## Swapped the rename stage and the DB fill stage, script was adding the old basename 
+## to the database, and then renaming the file, leaving
+## a dead link in 0.19
+
 use strict;
 use DBI;
 use Getopt::Long;
@@ -330 +335 @@
                         print "Enter description: ";
                         chomp(my $tmp_description = <STDIN>);
                         if ($tmp_description) {$description = $tmp_description;}
+                        
+## rename file to proper format
+            
+                        if ($starttime =~ m/$db_date_regx/) {
+                                ($syear, $smonth, $sday, $shour, $sminute, $ssecond) =
+                                ($1, $2, $3, $4, $5, $6);
+                        }
 
+                        if ($endtime =~ m/$db_date_regx/) {
+                                ($eyear, $emonth, $eday, $ehour, $eminute, $esecond) =
+                                ($1, $2, $3, $4, $5, $6);
+                        }
+
+                        my $new_file = "$dir/$channel"."_$syear$smonth$sday$shour$sminute$ssecond"."_$eyear$emonth$eday$ehour$eminute$esecond.nuv";
+                        my $basename = $new_file;
+                        $basename =~ s/$dir\/(.*)/$1/s;
+                        if (!$test_mode) {
+                                                rename("$show", "$new_file");
+                        } else {
+                                print("Test mode: rename would have done\n");
+                                print("  From: '$show'\n");
+                                print("  To: '$new_file'\n");
+                        } 
+                
+
 ## add records to db
                         my $i = "insert into recorded (chanid, starttime, endtime, title, subtitle, description, hostname, basename, progstart, progend) values ((?), (?), (?), (?), (?), (?), (?), (?), (?), (?))";
 
@@ -349 +378 @@
                                 
                         }
 
-## rename file to proper format
-            
-                if ($starttime =~ m/$db_date_regx/) {
-                        ($syear, $smonth, $sday, $shour, $sminute, $ssecond) =
-                                ($1, $2, $3, $4, $5, $6);
-                }
 
-                if ($endtime =~ m/$db_date_regx/) {
-                        ($eyear, $emonth, $eday, $ehour, $eminute, $esecond) =
-                                ($1, $2, $3, $4, $5, $6);
-                }
-
-        my $new_file = "$dir/$channel"."_$syear$smonth$sday$shour$sminute$ssecond"."_$eyear$emonth$eday$ehour$eminute$esecond.nuv";
-        if (!$test_mode) {
-            rename("$show", "$new_file");
-        } else {
-            print("Test mode: rename would have done\n");
-            print("  From: '$show'\n");
-            print("  To: '$new_file'\n");
-        } 
-
 ## commercial flag
  
         print("Building a seek table should improve FF/RW and JUMP functions when watching this video\n");