Changeset 858

Timestamp:

10/10/09 02:37:54 (4 years ago)

Author:

bruno

Message:

• Proto version 6 for UTF-8 support
• CDDB_get 2.27 now required for revision support
• new ce_prepare_mail function

File:

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

projects/CDDBeditor/bin/CDDBeditor

@@ -21 +21 @@
 use lib qw (lib);
 use locale;
+# > 2.27
 use CDDB_get qw( get_cddb get_discids );
-use CDDB;
 use Encode;
 
@@ -31 +31 @@
 my @date = pb_get_date();
 my $pbdate = strftime("%Y-%m-%d", @date);
+
+pb_temp_init();
 
 =pod
@@ -180 +182 @@
 $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;
 
 # First panel for configuration parameters
@@ -256 +260 @@
 $ce_config{"CD_DEVICE"}=$dev_entry->Get();
 $ce_config{"input"}=$user_group->Get();
-$ce_config{"HELLO_ID"} = "bruno musique-ancienne.org fastrip 0.77";
 
 # Components
@@ -279 +282 @@
     my %ce_cd = get_cddb(\%ce_config);
 
-    # Modify enconding of some fields
-    $ce_cd{artist} = decode("iso8859-1",$ce_cd{artist});
-    $ce_cd{title} = decode("iso8859-1",$ce_cd{title});
+    # 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});
 
     # Third panel to display CD Infos
@@ -344 +347 @@
         my $min=int($dur/75/60);
         my $sec=int($dur/75)-$min*60;
-        my $frm=($dur-$sec*75-$min*75*60)*100/75;
+        #my $frm=($dur-$sec*75-$min*75*60)*100/75;
         my $tr = sprintf "Track %2d:", $n;
         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]);
+
         my $dur_label = Newt::Label($tr);
         $flag = NEWT_FLAG_WRAP|NEWT_ENTRY_SCROLL;
-        # Adapt encoding of track
-        $ce_cd{track}[$n -1] = decode("iso8859-1",$ce_cd{track}[$n -1]);
         my $track_entry = Newt::Entry($width, $flag, $ce_cd{track}[$n-1]);
         $ce_panel->Add(0, 8+$n, $track_label);
@@ -383 +387 @@
         $width = 40;
         my $height = 25;
-        my $info_tb = Newt::Textbox($width, $height, $flag, Dumper(keys %ce_cd));
 
         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 $info_tb = Newt::Textbox($width, $height, $flag, $txt);
 
         Newt::Cls();
@@ -413 +426 @@
 }
 
+sub ce_prepare_mail() {
+
+my $ce_cd = shift;
+
+open(MAIL, "> $ENV{'PBTMP'}/mail.txt") || die "Unable to create $ENV{'PBTMP'}/mail.txt";
+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";
+    $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 $rev = $ce_cd->{revision} + 1;
+print MAIL "#\n# Disc length: $sec seconds\n#\n";
+print MAIL "# Revision: $rev\n";
+print MAIL "# Processed by: cddbd v1.5PL3 Copyright (c) Steve Scherf et al.\n";
+print MAIL "# Submitted via: CDDBEditor $projver-$projrev\n";
+print MAIL "DISCID=$ce_cd->{id}\n";
+print MAIL "DTITLE=$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++;
+}
+print MAIL "EXTD=\n";
+$n=1;
+while ( $n <= $ce_cd->{tno} ) {
+    print MAIL "EXTT$n=\n";
+    $n++;
+}
+print MAIL "PLAYORDER=\n";
+close(MAIL);
+}
+
 1;