[Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/driver/dr...

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Branch:         
Changes by:     spiralvoice <address@hidden>    06/03/15 20:56:43

Modified files:
        distrib        : ChangeLog 
        src/daemon/driver: driverCommands.ml 
        src/networks/fileTP: fileTPInteractive.ml 

Log message:
        patch #4972

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/distrib/ChangeLog.diff?tr1=1.768&tr2=1.769&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/daemon/driver/driverCommands.ml.diff?tr1=1.128&tr2=1.129&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/networks/fileTP/fileTPInteractive.ml.diff?tr1=1.32&tr2=1.33&r1=text&r2=text

Patches:
Index: mldonkey/distrib/ChangeLog
diff -u mldonkey/distrib/ChangeLog:1.768 mldonkey/distrib/ChangeLog:1.769
--- mldonkey/distrib/ChangeLog:1.768    Wed Mar 15 20:55:15 2006
+++ mldonkey/distrib/ChangeLog  Wed Mar 15 20:56:43 2006
@@ -15,6 +15,7 @@
 =========
 
 2006/03/15
+4972: FileTP: Allow ftp:// downloads via dllink command
 4971: BT: Allow read-only access for shared files
 4967: CommonUserDb: Keep old user database updated for easy downgrades
 
Index: mldonkey/src/daemon/driver/driverCommands.ml
diff -u mldonkey/src/daemon/driver/driverCommands.ml:1.128 
mldonkey/src/daemon/driver/driverCommands.ml:1.129
--- mldonkey/src/daemon/driver/driverCommands.ml:1.128  Mon Mar  6 18:02:16 2006
+++ mldonkey/src/daemon/driver/driverCommands.ml        Wed Mar 15 20:56:43 2006
@@ -2829,6 +2829,9 @@
             _s output
             )
         else
+          if (String2.starts_with url "ftp") then
+           query_networks (Printf.sprintf "Location: %s" url)
+         else
             query_networks url
         ), "<link> :\t\t\t\tdownload ed2k, sig2dat, torrent or other link";
 
Index: mldonkey/src/networks/fileTP/fileTPInteractive.ml
diff -u mldonkey/src/networks/fileTP/fileTPInteractive.ml:1.32 
mldonkey/src/networks/fileTP/fileTPInteractive.ml:1.33
--- mldonkey/src/networks/fileTP/fileTPInteractive.ml:1.32      Thu Feb 23 
10:50:36 2006
+++ mldonkey/src/networks/fileTP/fileTPInteractive.ml   Wed Mar 15 20:56:43 2006
@@ -287,11 +287,11 @@
    It returns true if this file can be handled by fileTP,
    and false otherwise.
  *)
-let rec op_network_parse_url url =
+let op_network_parse_url url =
   let location_regexp = "Location: \\(.*\\)" in
   let real_url = get_regexp_string url (Str.regexp location_regexp) in
   if !verbose then
-    lprintf "real url: %s\n" real_url;
+    lprintf_nl () "real url: %s\n" real_url;
   if (is_http_torrent url real_url) then "", false
   else
     if (String2.check_prefix real_url "http://";) then (
@@ -300,16 +300,17 @@
          if (length > 0) then begin
            download_file real_url ""; "started FileTP download", true
          end
-         else "test1", false
+         else "can not parse Content-Length", false
        with Not_found -> 
            "Unknown file length. Use a web browser", false
     )
-    else if (String2.check_prefix url "ftp://";) || (String2.check_prefix url 
"ssh://") then (
-      download_file url "";
-      "started FileTP download", true
-    )
+    else 
+      if (String2.check_prefix real_url "ftp://";) ||
+         (String2.check_prefix real_url "ssh://") then (
+      download_file real_url "";
+      "started FileTP download", true)
     else
-      "test2", false
+      "invalid URL", false
 
 let _ =
   network.op_network_parse_url <- op_network_parse_url