Changeset 1650 in ProjectBuilder for projects/CDDBeditor

Timestamp:

Oct 6, 2012, 9:10:51 PM (12 years ago)

Author:

Bruno Cornec

Message:

• Adds support for logging, and an exit function
• Fix a bug where the ind value was incorrect with only one CD leading to empty content !

File:

• projects/CDDBeditor/devel/CDDBeditor/bin/CDDBeditor (modified) (14 diffs)

projects/CDDBeditor/devel/CDDBeditor/bin/CDDBeditor

@@ -21 +21 @@
 use lib qw (lib);
 use locale;
-# > 2.27
+# >= 2.27
 use CDDB_get qw( get_cddb get_discids );
 use Encode;
@@ -139 +139 @@
     $pbdebug=-1;
 }
-pb_log_init($pbdebug, $pbLOG);
-
+open(LOG, "> $ENV{HOME}/.CDDBeditor.log") || die "Unable to open $ENV{HOME}/.CDDBeditor.log";
+pb_log_init($pbdebug, \*LOG);
 
 Newt::Init();
@@ -190 +190 @@
 $ce_config{"DOMAIN"} = "musique-ancienne.org";
 $ce_config{"USER"} = "bruno";
-$ce_config{"HELLO_ID"} = "$ce_config{\"USER\"} $ce_config{\"DOMAIN\"} fastrip 0.77";
+# Requires 4 words exactly
+$ce_config{"HELLO_ID"} = "$ce_config{\"USER\"} $ce_config{\"DOMAIN\"} CDDBEditor 0.5";
 
 # Copied from CDDB.pm
@@ -206 +207 @@
 # Need 23 char for track and time
 my $width = $ce_sl - 23;
-# Othe fields are limited to 5
+# Other fields are limited to 5
 my $width2 = 5;
 my $host_entry = Newt::Entry($width, $flag, $ce_config{"CDDB_HOST"});
@@ -259 +260 @@
 
 Newt::Cls();
-exit 0 if ($data->Tag() eq "Quit");
+cddbe_exit(0) if ($data->Tag() eq "Quit");
 
 if ($ce_config{"CDDB_MODE"} eq "http" ) {
@@ -268 +269 @@
 $ce_config{"CDDB_MODE"}=$ce_cddb_mode{$mode_group->Get()};
 $ce_config{"CD_DEVICE"}=$dev_entry->Get();
+
+pb_log(1,"After first screen\n");
+pb_log(1,"ce_config is:\n");
+pb_log(1,Dumper(%ce_config)."\n");
 
 # Components
@@ -287 +292 @@
 
 # Entering the loop
-for (my $i=0 ; ; $i++) {
-    # Second panel to make user wait
+for (my $i=0 ; ; $i++) { # Second panel to make user wait
     Newt::Cls();
     Newt::DrawRootText(ce_center_string($ce_title), 1, $ce_title);
@@ -303 +307 @@
         # by default use first one
         $ce_cd = $cecd[0] if (defined $cecd[0]);
+        pb_log(1,"After get_cddb\n");
+        pb_log(1,"cecd is:\n");
+        pb_log(1,Dumper(@cecd)."\n");
     }
     $firsttime = 0;
@@ -320 +327 @@
         $ind++;
     }
+    pb_log(1,"ind is: $ind\n");
 
     if ($ind gt 1) {
@@ -346 +354 @@
 
         Newt::Cls();
-        exit 0 if ($data->Tag() eq "Quit");
+        cddbe_exit(0) if ($data->Tag() eq "Quit");
         
         $ind=$user_group->Get();
+    } else {
+        # if only one CD, back to its number which is 0
+        $ind--;
     }
     # Point now to the right CD
     $ce_cd = $cecd[$ind];
+    pb_log(1,"After CD choice\n");
+    pb_log(1,"ce_cd is: \n");
+    pb_log(1,Dumper($ce_cd)."\n");
 
     if (not defined $ce_cd->{title}) {
@@ -358 +372 @@
         $ce_cd->{id} = sprintf "%08x", $id->[0];
 
+        pb_log(1,"After get_discids\n");
+        pb_log(1,"id is:\n");
+        pb_log(1,Dumper($id)."\n");
+        pb_log(1,"ce_cd is:\n");
+        pb_log(1,Dumper($ce_cd)."\n");
         # Try to find it locally
         my @d = glob("$ENV{'HOME'}/.cddb/*/$ce_cd->{id}");
@@ -507 +526 @@
     Newt::Refresh();
     Newt::Cls();
-    exit 0 if ($data->Tag() eq "Quit");
+    cddbe_exit(0) if ($data->Tag() eq "Quit");
+
+    pb_log(1,"Before sending\n");
+    pb_log(1,"ce_cd is:\n");
+    pb_log(1,Dumper($ce_cd)."\n");
 
     # Send the data
@@ -539 +562 @@
 }
 Newt::Finished();
-exit 0;
+cddbe_exit(0);
 
 # return the char to start printing a centered string based on screen size
@@ -594 +617 @@
 }
 
+sub cddbe_exit {
+
+my $ret = shift;
+close(LOG);
+exit $ret
+}
+
 1;