Changeset 3344

Timestamp:

03/12/08 11:44:26 (9 months ago)

Author:

lmartin92

Message:

Changes to FtpFile? class. Is unfinished. Need newest FtpClient? that is compatible with the latest regex to add on to to make a new better input/output through input/output streams capable FtpConnection? class that will make it possible to do input and output in the FtpFile? class. Also need to know exactly what copy/move is expected to do and to know how to create a empty file in memory and send to ftp server.

Files:

• branches/lmartin/ftp/tango/io/vfs/FtpFolder.d (modified) (6 diffs)

branches/lmartin/ftp/tango/io/vfs/FtpFolder.d

@@ -63 +63 @@
-        writable();
-    }
+    
-    public this(char[] server, char[] path = "", char[] username = "anonymous", char[] password = "anonymous@anonymous", uint port = 21)
-    in
@@ -476 +477 @@
-            {
-                FtpFile f = cast(FtpFile) file;
-cast(VfsFilterInfo*)
+
-                    toCreateNewVfsFilesInstance ~= file;
-            }
@@ -484 +485 @@
-}
-
+/*******************************************************************************
+
+        A specific file representation 
+
+*******************************************************************************/
+
+class FtpFile : VfsFile
+{
+    /***********************************************************************
+
+        Return a short name
+
+    ***********************************************************************/
+
+    FtpFolder _folder;
+    char[] _toString;
+    char[] _name;
+    VfsInfo _filt;
+
+    package this(FtpFolder fol, char[] path)
+    {
+        _name = path[locatePrior(path, '/', cast(int)path.length) > locatePrior(path, '\\', path.length) && locatePrior(path, '/', path.length) != path.length ? locatePrior(path, '/', path.length) : locatePrior(path, '\\', path.length) .. path.length];
+        _toString = path;
+        _folder = new FtpFolder(fol);
+        _filt.name = _name;
+        _filt.path = _toString;
+        _filt.folder = false;
+        try
+        {
+            _filt.bytes = _folder._ftp.getFileInfo(_toString).size;
+        }
+        catch(Exception e)
+        {
+            _filt.bytes = 0;
+        }
+    }
+
+    public this(VfsFolder fol, char[] path)
+    {
+        this(cast(FtpFolder) fol, path);
+    }
+
+    char[] name()
+    {
+        return _name;
+    }
+
+    /***********************************************************************
+
+        Return a long name
+
+    ***********************************************************************/
+
+    char[] toString()
+    {
+        return _toString;
+    }
+
+    /***********************************************************************
+
+        Does this file exist?
+
+    ***********************************************************************/
+
+    bool exists()
+    {
+        if(((_folder._ftp.exist(_name) || _folder._ftp.exist(_toString)) == 0) || ((_folder._ftp.exist(_name) || _folder._ftp.exist(_toString)) == 2))
+            return false;
+        else
+            return true;
+    }
+
+    /***********************************************************************
+
+        Return the file size
+
+    ***********************************************************************/
+
+    ulong size ()
+    {
+        return _filt.bytes;
+    }
+
+    /***********************************************************************
+
+        Create and copy the given source
+
+    ***********************************************************************/
+
+    VfsFile copy (VfsFile source)
+    {
+        return null;
+    }
+
+    /***********************************************************************
+
+        Create and copy the given source, and remove the source
+
+    ***********************************************************************/
+
+    VfsFile move (VfsFile source)
+    {
+        return null;
+    }
+
+    /***********************************************************************
+
+        Create a new file instance
+
+    ***********************************************************************/
+
+    VfsFile create ()
+    {
+        _folder._ftp.del(this.toString);
+        return create(null); //needs to replace null with an empty stream
+    }
+
+    /***********************************************************************
+
+        Create a new file instance and populate with stream
+
+        ***********************************************************************/
+
+    VfsFile create (InputStream stream)
+    {
+        _folder._ftp.del(this.toString);
+        _folder._ftp.put(this.toString, stream, null, FtpFormat.image);
+        return new FtpFile(this._folder, this.toString);
+    }
+
+    /***********************************************************************
+
+        Remove this file
+
+    ***********************************************************************/
+
+    VfsFile remove ()
+    {
+        _folder._ftp.del(this.toString);
+        return new FtpFile(this._folder, this.toString);
+    }
+
+    /***********************************************************************
+
+        Return the input stream. Don't forget to close it
+
+    ***********************************************************************/
+
+    //cant work until I make new FtpClient
+    InputStream input ()
+    {
+        return null;
+    }
+
+    /***********************************************************************
+
+        Return the output stream. Don't forget to close it
+
+    ***********************************************************************/
+
+    //cant work until I make new FtpClient
+    OutputStream output ()
+    {
+        return null;
+    }
+
+    /***********************************************************************
+
+        Duplicate this entry
+
+    ***********************************************************************/
+
+    VfsFile dup ()
+    {
+        return new FtpFile(_folder, toString);
+    }
+}
+
-
-/*******************************************************************************
@@ -507 +686 @@
-    }
-
+    public this(VfsFolders folders)
+    {
+        this(cast(FtpFolders) folders);
+    }
+
+    public this(VfsFile[] files)
+    {
+        this(cast(FtpFile[]) files);
+    }
+
-    int opApply (int delegate(inout VfsFile) dg)
-    {
@@ -534 +723 @@
-    }
-}
-
-
-/*******************************************************************************
-
-        A specific file representation 
-
-*******************************************************************************/
-
-class FtpFile : VfsFile
-{
-    /***********************************************************************
-
-        Return a short name
-
-    ***********************************************************************/
-
-    VfsFilter _filt;
-
-    package this(FtpFolder fol, char[] path)
-    {
-    }
-
-    char[] name()
-    {
-        return null;
-    }
-
-    /***********************************************************************
-
-        Return a long name
-
-    ***********************************************************************/
-
-    char[] toString()
-    {
-        return null;
-    }
-
-    /***********************************************************************
-
-        Does this file exist?
-
-    ***********************************************************************/
-
-    bool exists()
-    {
-        return 0;
-    }
-
-    /***********************************************************************
-
-        Return the file size
-
-    ***********************************************************************/
-
-    ulong size ()
-    {
-        return 0;
-    }
-
-    /***********************************************************************
-
-        Create and copy the given source
-
-    ***********************************************************************/
-
-    VfsFile copy (VfsFile source)
-    {
-        return null;
-    }
-
-    /***********************************************************************
-
-        Create and copy the given source, and remove the source
-
-    ***********************************************************************/
-
-    VfsFile move (VfsFile source)
-    {
-        return null;
-    }
-
-    /***********************************************************************
-
-        Create a new file instance
-
-    ***********************************************************************/
-
-    VfsFile create ()
-    {
-        return null;
-    }
-
-    /***********************************************************************
-
-        Create a new file instance and populate with stream
-
-        ***********************************************************************/
-
-    VfsFile create (InputStream stream)
-    {
-        return null;
-    }
-
-    /***********************************************************************
-
-        Remove this file
-
-    ***********************************************************************/
-
-    VfsFile remove ()
-    {
-        return null;
-    }
-
-    /***********************************************************************
-
-        Return the input stream. Don't forget to close it
-
-    ***********************************************************************/
-
-    InputStream input ()
-    {
-        return null;
-    }
-
-    /***********************************************************************
-
-        Return the output stream. Don't forget to close it
-
-    ***********************************************************************/
-
-    OutputStream output ()
-    {
-        return null;
-    }
-
-    /***********************************************************************
-
-        Duplicate this entry
-
-    ***********************************************************************/
-
-    VfsFile dup ()
-    {
-        return null;
-    }
-}
-
-
-/*******************************************************************************
@@ -702 +742 @@
-    }
-
+    public this(VfsFolder fol, char[] path)
+    {
+        this(cast(FtpFolder) fol, path);
+    }
+
-    VfsFolder open ()
-    {