Changeset 1389 in ProjectBuilder for projects/md2mb

Timestamp:

Jan 7, 2012, 9:20:20 PM (13 years ago)

Author:

Bruno Cornec

Message:

• Fix problems with md2mb by using bsd_glob to avoid space issues.

File:

• projects/md2mb/devel/md2mb/bin/md2mb.pl (modified) (5 diffs)

projects/md2mb/devel/md2mb/bin/md2mb.pl

@@ -8 +8 @@
 use File::Basename;
 use File::Path;
+use File::Glob ':glob';
 
 my $cmd="formail";
 # CHANGE AS YOU WISH
 my $oldroot = "/users/segolene/.Mail";
-my $newroot = "/users/segolene/.thunderbird/60q6hqwp.default/Mail/Local Folders/";
+my $newroot = "/users/segolene/.thunderbird/60q6hqwp.default/Mail/pop.home.musique-ancienne.org/";
 # Is the newroot a file (1) or a dir (0)
 my $nrisfile = 0;
@@ -21 +22 @@
 print "DEBUG MODE, not doing anything, just printing\n" if ($debug);
 if ($debug) { 
-    print "CMD1: mkdir -p $newroot\n" if ((not -d "$newroot") && (not $nrisfile));
+    print "TARGET DIR: mkdir -p $newroot\n" if ((not -d "$newroot") && (not $nrisfile));
+    print "CMD: mkdir -p $newroot\n" if ((not -d "$newroot") && (not $nrisfile));
 } else {
     mkpath("$newroot",0, 0755) if ((not -d "$newroot") && (not $nrisfile));
@@ -32 +34 @@
 
 if (-f $File::Find::name) {
-    return if (
-        ($File::Find::name =~ /\.ids$/) ||
+    if (($File::Find::name =~ /\.ids$/) ||
         ($File::Find::name =~ /\.sorted$/) ||
-        ($File::Find::name =~ /\.index$/) ||
-        ($File::Find::name =~ /\/cur\//) ||
-        ($File::Find::name =~ /\/new\//) ||
-        ($File::Find::name =~ /\/tmp\//));
+        ($File::Find::name =~ /\.index$/)) {
+        print "SKIP FILE: $File::Find::name\n" if ($debug);
+        return;
+    }
 }
 if (-d $File::Find::name) {
-    return if (
-        ($File::Find::name =~ /\/cur$/) ||
+    if (($File::Find::name =~ /\/cur$/) ||
         ($File::Find::name =~ /\/new$/) ||
-        ($File::Find::name =~ /\/tmp$/));
-}
-if ($debug) { 
-    print "CURR: $File::Find::name\n";
+        ($File::Find::name =~ /\/tmp$/)) {
+        print "SKIP DIR: $File::Find::name\n" if ($debug);
+        return;
+    }
 }
 my $destname = $File::Find::name;
+# Target name is under a different root dir
 $destname =~ s|^$oldroot||;
+# Target name is not under a .directory dir but under a .sdb one
 $destname =~ s|\.([[:alnum:]éèçàù\s]*)\.directory|$1.sbd|g;
-if ($debug) { 
-    print "DEST: $destname\n";
-}
+# Here we create the target dir and target name
 my $cdir = dirname("$newroot/$destname");
 my $outputfile="$newroot/$destname";
+# Handle case where target file name is empty
 $outputfile="$newroot" if ($destname =~ /^\s*$/);
+# When we treat a dir, we will have to handle what it has below
 if (-d $File::Find::name) {
     if ($debug) { 
-        print "HANDLING: $File::Find::name content\n";
+        print "DIR SRC: $File::Find::name\n";
     }
-    my @files = (<"$File::Find::name"/cur/*>,<"$File::Find::name"/new/*>);
+    my @files = (bsd_glob("$File::Find::name/cur/*"),bsd_glob("$File::Find::name/new/*"));
     if (@files) {
         if ($debug) { 
-            print "CMD2: mkdir -p $cdir\n" if (not -d "$cdir");
+            print "DIR ($File::Find::name) DIR TARGET: mkdir -p $cdir\n" if (not -d "$cdir");
         } else {
             mkpath("$cdir",0, 0755) if (not -d "$cdir");
@@ -74 +76 @@
         next unless -s $file; # skip empty files
         next unless -r $file; # skip unreadable files
-        $file =~ s/'/'"'"'/;  # escape ' (single quote)
+        $file =~ s/'/'"'"'/g;  # escape ' (single quote)
         # NOTE! The output file must not contain single quotes (')!
         my $run = "cat '$file' | $cmd >> '$outputfile'";
         if ($debug) { 
-            print "CMD3: $run\n";
+            print "COPYING CONTENT maildir($file) to $outputfile\n";
+            print "CMD: $run\n";
         } else {
-            print "Copying maildir content from $File::Find::name to $outputfile\n";
+            print "Copying maildir content from $file to $outputfile\n";
             system($run) == 0 or warn "cannot run \"$run\".";
         }
@@ -86 +89 @@
 }
 if (-f $File::Find::name) {
+    if (($File::Find::name =~ /\/cur\//) ||
+        ($File::Find::name =~ /\/new\//) ||
+        ($File::Find::name =~ /\/tmp\//)) {
+        print "SKIP FILE: $File::Find::name\n" if ($debug);
+        return;
+    }
     if ($debug) { 
-        print "CMD2: mkdir -p $cdir\n" if (not -d "$cdir");
-        print "CMD3: cp $File::Find::name $cdir\n";
+        print "FILE ($File::Find::name) TARGET DIR: mkdir -p $cdir\n" if (not -d "$cdir");
+        print "CMD: cp $File::Find::name $cdir\n";
     } else {
+        print "Copying mailbox content from $File::Find::name to $cdir\n";
         mkpath("$cdir",0, 0755) if (not -d "$cdir");
         copy($File::Find::name,$cdir);
-        print "Copying mailbox content from $File::Find::name to $outputfile\n";
     }
 }