Changeset 3137

Timestamp:

01/27/08 08:44:54 (10 months ago)

Author:

lmartin92

Message:

Updates all the FtpClient? issues

Files:

• branches/lmartin/ftp/tango/net/SocketConduit.d (modified) (5 diffs)
• branches/lmartin/ftp/tango/net/ftp/FtpClient.d (modified) (9 diffs)
• branches/lmartin/ftp/tango/net/ftp/Telnet.d (modified) (1 diff)

branches/lmartin/ftp/tango/net/SocketConduit.d

@@ -36 +36 @@
-        private timeval                 tv;
-        private SocketSet               ss;
-ackage
+rotected
-        private bool                    timeout;
-
@@ -203 +203 @@
-        /***********************************************************************
-
+                Read content from socket. This is implemented as a callback
+                from the reader() method so we can expose the timout support
+                to subclasses
+                
+        ***********************************************************************/
+
+        protected uint socketReader (void[] dst)
+        {
+                return socket_.receive (dst);
+        }
+        
+        /***********************************************************************
+
-                Release this SocketConduit
-
@@ -223 +236 @@
-       /***********************************************************************
-
-Read content from the socket. Note that the operation 
-may timeout if method setTimeout() has been invoked with 
-
+Callback routine to read content from the socket. Note
+that the operation may timeout if method setTimeout()
+has been invoked with 
-
-                Returns the number of bytes read from the socket, or
@@ -240 +253 @@
-        override uint read (void[] dst)
-        {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-                // reset timeout; we assume there's no thread contention
-                timeout = false;
@@ -296 +282 @@
-
-                // invoke the actual read op
-dg
+socketReader
-                if (count <= 0)
-                    count = Eof;
-                return count;
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        /***********************************************************************
-

branches/lmartin/ftp/tango/net/ftp/FtpClient.d

@@ -1 +1 @@
-/*******************************************************************************
-
- 
+    
-
-        license:        BSD style: $(LICENSE)
@@ -9 +9 @@
-        author:         UWB
-
+        modifications are:
+
+            copyrighted as      Copyright (c) 2008 (c) Lester L. Martin II. All rights reserved
+
+            licensed    as      BSD style: $(LICENSE)
+
+            versioned   as      Initial modified release: _________ 2008
+
+            authored    by      Lester L. Martin II
+
-*******************************************************************************/
-
-module tango.net.ftp.FtpClient;
-
-
+
+
-
-private import  tango.net.ftp.Telnet;
@@ -34 +45 @@
-
-private import  Timestamp = tango.text.convert.TimeStamp;
+
+private import tango.text.Util;
-
-
@@ -53 +66 @@
-    /// Indicates IMAGE format (8 bit binary octets.)
-    image,
+}
+
+///A FtpAddress structure that contains all that is needed to access a FTPConnection; Contributed by Bobef
+struct FtpAddress
+{
+    static FtpAddress* opCall(char[] str)
+    {
+        if(str.length==0) return null;
+        try
+        {
+            auto ret=new FtpAddress;
+            //remove ftp://
+            auto i=locatePattern(str,"ftp://");
+            if(i==0) str=str[6..$];
+
+            //check for username and/or password user[:pass]@
+            i=locatePrior(str,'@');
+            if(i!=str.length)
+            {
+                char[] up=str[0..i];
+                str=str[i+1..$];
+                i=locate(up,':');
+                if(i!=up.length)
+                {
+                    ret.user=up[0..i];
+                    ret.pass=up[i+1..$];
+                }
+                else ret.user=up;
+            }
+
+            //check for port
+            i=locatePrior(str,':');
+            if(i!=str.length)
+            {
+                ret.port=cast(uint)Integer.toLong(str[i+1..$]);
+                str=str[0..i];
+            }
+
+            //check any directories after the adress
+            i=locate(str,'/');
+            if(i!=str.length) ret.directory=str[i+1..$];
+
+            //the rest should be the address
+            ret.address=str[0..i];
+            if(ret.address.length==0) return null;
+
+            return ret;
+
+        }catch(Object o) {return null;}
+    }
+
+    char[] address;
+    char[] directory;
+    char[] user = "anonymous";
+    char[] pass = "anonymous@anonymous";
+    uint port=21;
-}
-
@@ -154 +223 @@
-}
-
+class FtpSocketConduit : SocketConduit
+{
+    public this(Socket sock)
+    {
+        this.socket_ = sock;
+    }
+
+    void setSocket(Socket sock)
+    {
+        this.socket_ = sock;
+    }
+}
+
-/// A connection to an FTP server.
-///
@@ -221 +303 @@
-    ///    username =        username to be sent
-    ///    password =        password to be sent, if requested
+
+    
+    this(FtpAddress fad)
+    {
+        this.connect(fad.address, fad.user, fad.pass, fad.port);
+    }
+    
+    public void connect(FtpAddress fad)
+    {
+        this.connect(fad.address, fad.user, fad.pass, fad.port);
+    }
+
-    public void connect(char[] hostname, char[] username, char[] password, int port = 21)
-        in
@@ -359 +453 @@
-    {
-        this.sendCommand("CDUP");
-
+
+
+
+
+
-    }
-
@@ -450 +548 @@
-        this.readResponse("250");
-    }
+
+    ///returns 1 if it's a file 2 if it's a directory and 0 if it doesn't exist; contributed by Bobef
+    int exist(char[] file)
+    {
+        try
+        {
+            auto fi=getFileInfo(file);
+            if(fi.type==FtpFileType.file) return 1;
+            else if(fi.type==FtpFileType.dir || fi.type==FtpFileType.cdir || fi.type==FtpFileType.pdir) return 2;
+        }
+        catch(FTPException o) {if(o.response_code!="501") throw o;}
+        return 0;
+    }
+
+    ///determines the size of a file; Contributed by Bobef
+    long size(char[] file)
+    {
+        try return getFileInfo(file).size;
+        catch(FTPException o) {if(o.response_code!="501") throw o;}
+        return -1;
+    }
-
-    /// Determine the size in bytes of a file.
@@ -1817 +1936 @@
-        return Integer.parse (s);
-    }
+
+    public InputStream input()
+    {
+        return new FtpSocketConduit(getDataSocket);
+    }
+
+    public OutputStream output()
+    {
+        return new FtpSocketConduit(getDataSocket);
+    }
+
+    ///get's the modification time of a file; contributed by Bobef
+    Time* modified(char[] file)
+    {
+        auto ret=new Time;
+        try
+        {
+            *ret=filemtime(file);
+            return ret;
+        }
+        catch(FTPException o)
+        {
+            if(o.response_code!="501") try
+            {
+                *ret=getFileInfo(file).modify;
+                return ret;
+            }
+            catch(FTPException o) {if(o.response_code!="501") throw o;}
+        }
+        return null;
+    }
+
+}
+
+enum FtpCommand : int
+{
+    LIST, //get
+    APPE, //put
+    NLST, //get
+    REST, //put | get
+    RETR, //get
+    STOR, //put
+    
+}
+
+bool usedRest = false;
+
+bool prepareInputStream(FTPConnection ftp, InputStream input, FtpCommand ftpc, char[][] parameters)
+{
+    bool success;
+    
+    with(FtpCommand)
+    {
+        FtpSocketConduit fsc = cast(FtpSocketConduit) input;
+        fsc.setSocket(ftp.getDataSocket());
+        if(usedRest && ftpc != RETR)
+            ftp.exception("You must use RETR or STOR after a REST command.");
+        switch(ftpc)
+        {
+            case LIST:
+                ftp.sendCommand("LIST", parameters);
+                break;
+            case NLST:
+                ftp.sendCommand("NLST", parameters);
+                break;
+            case REST:
+                ftp.sendCommand("REST", parameters);
+                usedRest = true;
+                break;
+            case RETR:
+                ftp.sendCommand("RETR", parameters);
+                usedRest = usedRest ? false : usedRest;
+                break;
+        }
+    }
+    
+    return success;
+}
+
+bool prepareOutputStream(FTPConnection ftp, OutputStream output, FtpCommand ftpc, char[][] parameters)
+{
+    bool success;
+    
+    with(FtpCommand)
+    {
+        output = ftp.output;
+        if(usedRest && ftpc != STOR)
+            ftp.exception("You must use RETR or STOR after a REST command.");
+        switch(ftpc)
+        {
+            case APPE:
+                ftp.sendCommand("APPE", parameters);
+                break;
+            case STOR:
+                ftp.sendCommand("STOR", parameters);
+                usedRest = usedRest ? false : usedRest;
+                break;
+            case REST:
+                ftp.sendCommand("REST", parameters);
+                usedRest = true;
+                break;
+        }
+    }
+    
+    return success;
-}
-

branches/lmartin/ftp/tango/net/ftp/Telnet.d

@@ -34 +34 @@
-
-        /// The number of milliseconds to wait for socket communication or connection.
-50
+25
-
-        /// provided by host