[Mldonkey-commits] mldonkey/distrib ChangeLog ed2k_submit/mldonkey...

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       07/04/19 13:25:57

Modified files:
        distrib        : ChangeLog 
        distrib/ed2k_submit: mldonkey_submit 

Log message:
        patch #5870

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1232&r2=1.1233
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ed2k_submit/mldonkey_submit?cvsroot=mldonkey&r1=1.4&r2=1.5

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1232
retrieving revision 1.1233
diff -u -b -r1.1232 -r1.1233
--- ChangeLog   13 Apr 2007 10:35:30 -0000      1.1232
+++ ChangeLog   19 Apr 2007 13:25:57 -0000      1.1233
@@ -14,6 +14,10 @@
 ChangeLog
 =========
 
+2007/04/19
+5870: Updated distrib/mldonkey_submit, it now uses command dllink instead of 
dd,
+      it also supports http and sig2dat links (atordo)
+
 2007/04/13
 5866: HTML: fix third button row to also successful act within frames 
(schlumpf)
 

Index: ed2k_submit/mldonkey_submit
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ed2k_submit/mldonkey_submit,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- ed2k_submit/mldonkey_submit 3 Jan 2006 18:39:57 -0000       1.4
+++ ed2k_submit/mldonkey_submit 19 Apr 2007 13:25:57 -0000      1.5
@@ -45,24 +45,25 @@
 my $ua = LWP::UserAgent->new;
 
 while (my $uri = shift @ARGV) {
-       $_ = URI::Escape::uri_unescape($uri);
-       if (/^ed2k:\/\/\|file\|[^|]+\|(\d+)\|([\dabcdefABCDEF]+)\|/) {  
-               my $size = $1;
-               my $md4 = $2;
+       if ($uri=~m/^(ed2k|http|ftp|sig2dat):\/\//) {
+               my $url=$uri;
+               $url=~s/([^A-Za-z0-9])/sprintf("%%%02X", ord($1))/seg;
                my $req = HTTP::Request->new(
-                       GET => "$vars{'HTTPURL'}/submit?q=dd+$size+$md4"
-               );
+                       GET => "$vars{'HTTPURL'}/submit?q=dllink+$url" );
                if (($vars{'HTTPUSER'}) && ($vars{'HTTPPASS'})) {
                        $req->authorization_basic($vars{'HTTPUSER'},
                                $vars{'HTTPPASS'});
                }
                my $response = $ua->request($req);
-               if (!($response->is_success)) {
+               unless ($response->is_success) {
                        print $response->error_as_HTML;
                        exit 1;
                }
-       } else {
-               print "Not an ed2k URI: $_\n";
+               else {
+                       print "Link sent.\n";
+               }
+       }
+       else {
+               print "$uri does not seem a valid URI.\n";
        }
 }
-