Changeset 860 in ProjectBuilder

Timestamp:

Oct 11, 2009, 3:18:59 AM (15 years ago)

Author:

Bruno Cornec

Message:

• Highly improved version which allows caching of CDDB resuls, and sending to freedb

File:

• projects/CDDBeditor/bin/CDDBeditor (modified) (11 diffs)

projects/CDDBeditor/bin/CDDBeditor

@@ -24 +24 @@
 use CDDB_get qw( get_cddb get_discids );
 use Encode;
+#use Linux::CDROM;
+use Device::Cdio::Device;
+use Device::Cdio::Track;
+use File::Copy;
+use File::Basename;
 
 # Global variables
@@ -145 +150 @@
 my $artist_label = Newt::Label("Artist: ");
 my $empty_label = Newt::Label("      ");
-#my $data_label = Newt::Label("Data: ");
-#my $raw_label = Newt::Label("Raw: ");
 my $title_label = Newt::Label("Title: ");
 my $year_label = Newt::Label("Year: ");
-my $id_label = Newt::Label("Id: ");
+my $id_label = "Id: ";
+my $rev_label = "Revision: ";
 my $genre_label = Newt::Label("Genre: ");
 my $category_label = Newt::Label("Category: ");
@@ -172 +176 @@
 my %ce_config;
 $ce_config{"CDDB_HOST"}="freedb.freedb.org";
+$ce_config{"CDDB_USER"}="freedb-submit\@freedb.org";
+$ce_config{"CDDB_CC"}="bruno\@victoria.frmug.org";
 $ce_config{"CDDB_PORT"}=888;
 #$ce_config{"CDDB_PORT"}=80;
@@ -182 +188 @@
 $ce_config{"HTTP_PROXY"}=$ENV{http_proxy} if $ENV{http_proxy};
 $ce_config{"input"}=0;
-$ce_config{"HELLO_ID"} = "bruno musique-ancienne.org fastrip 0.77";
 $ce_config{"PROTO_VERSION"} = 6;
+$ce_config{"DOMAIN"} = "musique-ancienne.org";
+$ce_config{"USER"} = "bruno";
+$ce_config{"HELLO_ID"} = "$ce_config{\"USER\"} $ce_config{\"DOMAIN\"} fastrip 0.77";
+
+# Copied from CDDB.pm
+# Determine whether we can submit changes by e-mail.
 
 # First panel for configuration parameters
@@ -267 +278 @@
 $send_button->Tag("Send");
 
+my $firsttime = 1;
+my $ce_cd;
+my $artist_entry;
+my $title_entry;
+my $category_entry;
+my $genre_entry;
+my $tno_entry;
+my $year_entry;
+my @track_entry;
+
 # Entering the loop
 for (my $i=0 ; ; $i++) {
@@ -279 +300 @@
     Newt::Refresh();
 
-    # CDDB query
-    my %ce_cd = get_cddb(\%ce_config);
-
+    # CDDB query if first time
+    if ($firsttime eq 1) {
+        ($ce_cd) = get_cddb(\%ce_config) 
+    }
+    $firsttime = 0;
+
+    if (not defined $ce_cd->{title}) {
+        # Get the disc id first
+        my $id = get_discids($ce_config{"CD_DEVICE"});
+        $ce_cd->{id} = sprintf "%08x", $id->[0];
+
+        # Try to find it locally
+        my @d = glob("$ENV{'HOME'}/.cddb/*/$ce_cd->{id}");
+        foreach my $d (@d) {
+            $ce_cd->{cat} = basename(dirname($d));
+            open(DISC,$d) || die "Unable to open $d";
+            # Idea taken from CDDB_get
+            while (<DISC>) {
+                push @{$ce_cd->{raw}},$_;
+                if (/^TTITLE(\d+)\=\s*(\S.*)/) {
+                    chomp($2);
+                    $ce_cd->{track}[$1]=$2;
+                } elsif(/^DTITLE=\s*(\S.*)/) {
+                    my $t = $1;
+                    if ($t =~ /\//) {
+                        ($ce_cd->{artist},$ce_cd->{title}) = split(/\s\/\s/,$t);
+                    } else {
+                        $ce_cd->{artist}=$t;
+                        $ce_cd->{title}=$t;
+                    }
+                    chomp($ce_cd->{title});
+                } elsif(/^DYEAR=\s*(\d+)/) {
+                    $ce_cd->{year} = $1;
+                } elsif(/^DGENRE=\s*(\S.*)/) {
+                    $ce_cd->{genre} = $1;
+                } elsif(/^\#\s+Revision:\s+(\d+)/) {
+                    $ce_cd->{revision} = $1;
+                }
+            }
+            close(DISC);
+        }
+
+        # Pre allocate from the physical media
+        my $device = Device::Cdio::Device->new(-source=>$ce_config{"CD_DEVICE"});
+        my $track  = $device->get_last_track();
+        $ce_cd->{tno} = $track->{track};
+        my $n = 0;
+
+        # If they were not found
+        $ce_cd->{artist} = "" if (not defined $ce_cd->{artist});
+        $ce_cd->{title} = "" if (not defined $ce_cd->{title});
+        $ce_cd->{genre} = "" if (not defined $ce_cd->{genre});
+        $ce_cd->{cat} = "" if (not defined $ce_cd->{cat});
+        $ce_cd->{year} = "" if (not defined $ce_cd->{year});
+        $ce_cd->{revision} = 0 if (not defined $ce_cd->{revision});
+
+        # Going one track further for frame computation.
+        # Cf: http://www.gnu.org/software/libcdio/doxygen/track_8h.html
+        while ( $n <= $ce_cd->{tno}) {
+            $track->set_track($n+1);
+            # Again only if not found previously
+            $ce_cd->{track}[$n] = "" if (not defined $ce_cd->{track}[$n]);
+            my ($m, $s, $f) = split(/:/,$track->get_msf());
+            $ce_cd->{frames}[$n] = $f + 75*$s + 75*60*$m;
+            $n++;
+        }
+    }
     # Modify enconding of some fields if proto < 5
-    #$ce_cd{artist} = decode("iso8859-1",$ce_cd{artist});
-    #$ce_cd{title} = decode("iso8859-1",$ce_cd{title});
+    #$ce_cd->{artist} = decode("iso8859-1",$ce_cd->{artist});
+    #$ce_cd->{title} = decode("iso8859-1",$ce_cd->{title});
 
     # Third panel to display CD Infos
@@ -293 +378 @@
     $flag = NEWT_ENTRY_SCROLL;
     $width = 40;
-    my $artist_entry = Newt::Entry($width, $flag, $ce_cd{artist});
-    my $title_entry = Newt::Entry($width, $flag, $ce_cd{title});
+    $artist_entry = Newt::Entry($width, $flag, $ce_cd->{artist});
+    $title_entry = Newt::Entry($width, $flag, $ce_cd->{title});
     # http://www.freedb.org/en/faq.3.html
     # Category list is data, folk, jazz, misc, rock, country, blues, newage, reggae, classical, and soundtrack
-    my $category_entry = Newt::Entry($width, $flag, $ce_cd{cat});
-    my $genre_entry = Newt::Entry($width, $flag, $ce_cd{genre});
-    #my $data_entry = Newt::Entry($width, $flag, Dumper(@{$ce_cd{data}}));
-    #my $raw_entry = Newt::Entry($width, $flag, Dumper(@{$ce_cd{raw}}));
-    my $tno_entry = Newt::Label($ce_cd{tno});
+    $category_entry = Newt::Entry($width, $flag, $ce_cd->{cat});
+    $genre_entry = Newt::Entry($width, $flag, $ce_cd->{genre});
+    $tno_entry = Newt::Label($ce_cd->{tno}."   -   ".$id_label.$ce_cd->{id}."   -   ".$rev_label.$ce_cd->{revision});
     $width = 5;
-    my $year_entry = Newt::Entry($width, $flag, $ce_cd{year});
+    $year_entry = Newt::Entry($width, $flag, $ce_cd->{year});
     
     # Build interface
-    $ce_panel = Newt::Panel(3, $ce_sh, "CDDB Info");
+    $ce_panel = Newt::Panel(4, $ce_sh, "CDDB Info");
     $flage = NEWT_ANCHOR_RIGHT;
     $ce_panel->Add(0, 0, $artist_label,$flage);
@@ -331 +414 @@
     $flage = NEWT_ANCHOR_LEFT;
     $ce_panel->Add(1, 5, $tno_entry, $flage);
-    #$ce_panel->Add(0, 5, $data_label);
-    #$ce_panel->Add(1, 5, $data_entry, $flage);
-    #$ce_panel->Add(0, 6, $raw_label);
-    #$ce_panel->Add(1, 6, $raw_entry, $flage);
-    #$ce_panel->Add(0, 5, $info_label);
-    #$ce_panel->Add(1, 5, $info_entry, $flage);
-
-    my $n=1;
+
+    my $n=0;
     $width = 40;
-    while ( $n <= $ce_cd{tno} ) {
-        last if ($n > $ce_sh - 8);
-        my $from=$ce_cd{frames}[$n-1];
-        my $to=$ce_cd{frames}[$n]-1;
+    while ( $n < $ce_cd->{tno} ) {
+        last if ($n > $ce_sh - 9);
+        my $from=$ce_cd->{frames}[$n];
+        my $to=$ce_cd->{frames}[$n+1]-1;
         my $dur=$to-$from;
         my $min=int($dur/75/60);
         my $sec=int($dur/75)-$min*60;
-        #my $frm=($dur-$sec*75-$min*75*60)*100/75;
-        my $tr = sprintf "Track %2d:", $n;
+        my $tr = sprintf "Track %2d:", $n+1;
         my $track_label = Newt::Label($tr);
         $tr = sprintf " %2d':%.2d", $min, $sec;
         # Adapt encoding of track if proto < 5
-        #$ce_cd{track}[$n -1] = decode("iso8859-1",$ce_cd{track}[$n -1]);
+        #$ce_cd->{track}[$n] = decode("iso8859-1",$ce_cd->{track}[$n]);
 
         my $dur_label = Newt::Label($tr);
         $flag = NEWT_FLAG_WRAP|NEWT_ENTRY_SCROLL;
-        my $track_entry = Newt::Entry($width, $flag, $ce_cd{track}[$n-1]);
-        $ce_panel->Add(0, 8+$n, $track_label);
-        $ce_panel->Add(1, 8+$n, $track_entry, $flage);
-        $ce_panel->Add(2, 8+$n, $dur_label, $flage);
+        $track_entry[$n] = Newt::Entry($width, $flag, $ce_cd->{track}[$n]);
+        $ce_panel->Add(0, 9+$n, $track_label);
+        $ce_panel->Add(1, 9+$n, $track_entry[$n], $flage);
+        $ce_panel->Add(2, 9+$n, $dur_label, $flage);
         $n++;
-    }
-    $ce_panel->Add(0, 8+$n, $empty_label);
-
-    $ce_panel->Add(0, 8+$n+1, $send_button);
-    $ce_panel->Add(1, 8+$n+1, $reload_button);
-    $ce_panel->Add(2, 8+$n+1, $quit_button);
+    }
+    $ce_panel->Add(0, 9+$n, $empty_label);
+
+    $ce_panel->Add(0, 9+$n+1, $send_button);
+    $ce_panel->Add(1, 9+$n+1, $reload_button);
+    $ce_panel->Add(2, 9+$n+1, $quit_button);
     
     Newt::Cls();
     Newt::Refresh();
+
     # Build interface
     ($reason, $data) = $ce_panel->Run();
 
-    $ce_cd{artist} = $artist_entry->Get();
-    $ce_cd{title} = $title_entry->Get();
-    $ce_cd{year} = $year_entry->Get();
-    $ce_cd{cat} = $category_entry->Get();
-    $ce_cd{genre} = $genre_entry->Get();
+    $ce_cd->{artist} = $artist_entry->Get();
+    $ce_cd->{title} = $title_entry->Get();
+    $ce_cd->{year} = $year_entry->Get();
+    $ce_cd->{cat} = $category_entry->Get();
+    $ce_cd->{genre} = $genre_entry->Get();
+    $n=1;
+    while ( $n <= $ce_cd->{tno} ) {
+        $ce_cd->{track}[$n-1] = $track_entry[$n-1]->Get();
+        $n++;
+    }
     Newt::Refresh();
     Newt::Cls();
@@ -386 +468 @@
         $flag = NEWT_FLAG_WRAP;
         $width = 40;
-        my $height = 25;
+        my $height = 10;
 
         Newt::DrawRootText(ce_center_string($ce_title), 1, $ce_title);
         Newt::PushHelpLine($ce_help);
 
-        ce_prepare_mail(\%ce_cd);
-        open(TEXT,"$ENV{'PBTMP'}/mail.txt") || die "Unable to open $ENV{'PBTMP'}/mail.txt";
-        my $txt = "";
-        #my $txt = pb_get_content("$ENV{'PBTMP'}/mail.txt");
-        while (<TEXT>) {
-            next if (/^#/);
-            $txt .= $_;
-        }
+        my $txt = "Please wait while sending disc $ce_cd->{id} ($ce_cd->{cat}) to $ce_config{\"CDDB_USER\"}";
         my $info_tb = Newt::Textbox($width, $height, $flag, $txt);
 
         Newt::Cls();
         $ce_panel = Newt::Panel(3, $width, "CDDB Sending Infos");
-        $ce_panel->Add(0, 0, $wait_label);
-        $ce_panel->Add(0, 1, $info_tb);
-        $ce_panel->Add(0, 2, $quit_button);
+        $ce_panel->Add(0, 0, $info_tb);
+        $ce_panel->Add(0, 1, $quit_button);
         Newt::Refresh();
+        # TODO: Mail::Sendmail ?
+        ce_prepare_mail($ce_cd);
+        pb_system("mutt -s \"cddb $ce_cd->{cat} $ce_cd->{id}\" -c $ce_config{\"CDDB_CC\"} $ce_config{\"CDDB_USER\"} < $ENV{'HOME'}/.cddb/$ce_cd->{cat}/$ce_cd->{id}", "quiet");
         ($reason, $data) = $ce_panel->Run();
+
+        # Force reloading info from cache
+        $ce_cd->{title} = undef;
+    }
+    if ($data->Tag() eq "Reload") {
+        # Then force CDDB query
+        $firsttime = 1;
     }
 }
@@ -430 +514 @@
 my $ce_cd = shift;
 
-open(MAIL, "> $ENV{'PBTMP'}/mail.txt") || die "Unable to create $ENV{'PBTMP'}/mail.txt";
+pb_mkdir_p("$ENV{'HOME'}/.cddb/$ce_cd->{cat}");
+open(MAIL, "> $ENV{'HOME'}/.cddb/$ce_cd->{cat}/$ce_cd->{id}") || die "Unable to create $ENV{'HOME'}/.cddb/$ce_cd->{cat}/$ce_cd->{id}";
 print MAIL "# xmcd CD database file\n#\n# Track frame offsets:\n";
-my $n=1;
-while ( $n <= $ce_cd->{tno} ) {
-    print MAIL "#       ".$ce_cd->{frames}[$n-1]."\n";
+my $n=0;
+while ( $n < $ce_cd->{tno} ) {
+    print MAIL "#       ".$ce_cd->{frames}[$n]."\n";
     $n++;
 }
-my $from=$ce_cd->{frames}[0];
-my $to=$ce_cd->{frames}[$ce_cd->{tno}];
-my $dur=$to-$from;
-my $sec=int($dur/75);
+#my $from=int($ce_cd->{frames}[0]/75);
+my $sec=int($ce_cd->{frames}[$ce_cd->{tno}]/75);
+#my $sec=$to-$from;
 my $rev = $ce_cd->{revision} + 1;
+# Taken from CDDB.pm
 print MAIL "#\n# Disc length: $sec seconds\n#\n";
 print MAIL "# Revision: $rev\n";
@@ -447 +532 @@
 print MAIL "# Submitted via: CDDBEditor $projver-$projrev\n";
 print MAIL "DISCID=$ce_cd->{id}\n";
-print MAIL "DTITLE=$ce_cd->{title}\n";
+print MAIL "DTITLE=$ce_cd->{artist} / $ce_cd->{title}\n";
 print MAIL "DYEAR=$ce_cd->{year}\n";
 print MAIL "DGENRE=$ce_cd->{genre}\n";
-$n=1;
-while ( $n <= $ce_cd->{tno} ) {
-    print MAIL "TTITLE$n=$ce_cd->{track}[$n-1]\n";
+$n=0;
+while ( $n < $ce_cd->{tno} ) {
+    print MAIL "TTITLE$n=$ce_cd->{track}[$n]\n";
     $n++;
 }
 print MAIL "EXTD=\n";
-$n=1;
-while ( $n <= $ce_cd->{tno} ) {
+$n=0;
+while ( $n < $ce_cd->{tno} ) {
     print MAIL "EXTT$n=\n";
     $n++;