* tools/kdeservicemenu/sylpheed-kdeservicemenu.pl

		output files to /tmp instead of littering the
		current dir
		refactor

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 3d0a99af62ead7f5fc3a6149f0e9b8debcec6ec6..83af6ec84e6382e37fcf9cd2003fe5dfe2bbccfd 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,8 +1,24 @@
+2004-10-27 [paul]
+
+       * tools/kdeservicemenu/sylpheed-kdeservicemenu.pl
+               output files to /tmp instead of littering the
+               current dir
+               refactor
+
 2004-10-26 [christoph] 0.9.12cvs134
 
        * src/procmime.c
                better check if parameters have to be in quoted string
 
+2004-10-25 [paul]
+
+       * tools/kdeservicemenu/README
+       * tools/kdeservicemenu/install.sh
+       * tools/kdeservicemenu/sylpheed-kdeservicemenu.pl
+       * tools/kdeservicemenu/template_sylpheed-attach-files.desktop
+       * tools/kdeservicemenu/template_sylpheed-compress-attach.desktop
+               add files for Sylpheed Service Menu in Konqueror
+
 2004-10-22 [paul]      0.9.12cvs133
 
        * src/compose.c

diff --git a/tools/kdeservicemenu/sylpheed-kdeservicemenu.pl b/tools/kdeservicemenu/sylpheed-kdeservicemenu.pl
index 1446e72f998db36a5ea898da37cc42495ce987a8..27c45e3d21e49c5048acbd45a5982abf4f6f97d3 100644 (file)
--- a/tools/kdeservicemenu/sylpheed-kdeservicemenu.pl
+++ b/tools/kdeservicemenu/sylpheed-kdeservicemenu.pl
@@ -18,46 +18,57 @@
 
 unless ($ARGV[0]) { exit; }
 
-$count = $#ARGV;
-
-($str,$strpt) = split_parts();
-
-if ($ARGV[0] eq "zip") {
-       exec "zip -r archive.zip $str;"
-           ."sylpheed --compose --attach \"archive.zip\"";
-} elsif ($ARGV[0] eq "tar") {
-       exec "tar -c -f archive.tar $str;"
-           ."sylpheed --compose --attach \"archive.tar\"";
-} elsif ($ARGV[0] eq "tarbzip2") {
-       exec "tar -cj -f archive.tar.bz2 $str;"
-           ."sylpheed --compose --attach \"archive.tar.bz2\"";
-} elsif ($ARGV[0] eq "targz") {
-       exec "tar -cz -f archive.tar.gz $str;"
-           ."sylpheed --compose --attach \"archive.tar.gz\"";
-} elsif ($ARGV[0] eq "gzip") {
-       exec "gzip  $str;"
-           ."sylpheed --compose --attach $strpt";
-} elsif ($ARGV[0] eq "bzip2") {
-       exec "bzip2  $str;"
-           ."sylpheed --compose --attach $strpt";
+my $count = $#ARGV;
+my $prefix = "/tmp/archive.";
+my ($suffix,$command) = find_sufncom($ARGV[0]);
+my ($sel,$att) = split_parts();
+
+if ($ARGV[0] eq "gzip" || $ARGV[0] eq "bzip2") {
+       exec "$sel"."sylpheed --compose --attach $att";
 } elsif ($ARGV[0] eq "attachfile") {
-       exec "sylpheed --compose --attach $str";
+       exec "sylpheed --compose --attach $sel";
+} else {
+       exec "$command $prefix$suffix $sel;"
+           ."sylpheed --compose --attach $prefix$suffix";
 }
+
 exit;
 
+sub find_sufncom {
+       local($s) = @_;
+       my ($suf,$com);
+       
+       if ($s eq "gzip") { $suf = "gz"; $com = "$s -c"; }
+       elsif ($s eq "bzip2") { $suf = "bz2"; $com = "$s -c"; }
+       elsif ($s eq "zip") { $suf = "zip"; $com = "$s -r"; }
+       elsif ($s eq "tar") { $suf = "tar"; $com = "$s -c -f"; }
+       elsif ($s eq "tarbzip2") { $suf = "tar.bz2"; $com = "tar -cj -f"; }
+       elsif ($s eq "targz") { $suf = "tar.gz"; $com = "tar -cz -f"; }
+       
+       return ($suf,$com);
+}
+
 sub split_parts {
-       local $selectedParts = "";
-       local $sParts = "";
+       my $selectedParts = "";
+       my $attachedParts = "";
        while ($count > 0) {
-               @s = split("/", $ARGV[$count]);
-               $count--;
-               $p = pop(@s);
-               $selectedParts .= "\"$p\" ";
-               if ($ARGV[0] eq "gzip") {
-                       $sParts .= "\"$p.gz\" ";
-               } elsif ($ARGV[0] eq "bzip2") {
-                       $sParts .= "\"$p.bz2\" ";
+               my @s = split("/", $ARGV[$count]);
+               my $p = pop(@s);
+               if ($ARGV[0] eq "gzip" || $ARGV[0] eq "bzip2") {
+                       my $psub = substitute($p);
+                       my $output = "/tmp/$psub.$suffix";
+                       $selectedParts .= "$command \"$p\" > $output;";
+                       $attachedParts .= "$output ";
+               } else {
+                       $selectedParts .= "\"$p\" ";
                }
+               $count--;
        }
-       return ($selectedParts,$sParts);
-}
\ No newline at end of file
+       return ($selectedParts,$attachedParts);
+}
+
+sub substitute {
+       local($s) = @_;
+       $s =~ s/\s/_/g;
+       return $s;
+}