Changeset 3377

Timestamp:

03/17/08 21:19:41 (9 months ago)

Author:

lmartin92

Message:

Updated to get the final Folder part of FtpFolder?.d implemented. A bit of FtpFile? is implemented. All constructors minus one are implemented. Need to finish FtpFiles? and FtpFile?, add comments, and maybe rearange stuff to make the code more clear or for other reasons

Files:

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

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

@@ -17 +17 @@
-
-    public this(char[] server, char[] path, char[] username = "anonymous",
-            
+       
-    in {
-        assert(server != "");
@@ -71 +71 @@
-
-    public this(char[] server, char[] path, char[] username = "anonymous",
-            
+       
-    in {
-        assert(server != "");
@@ -104 +104 @@
-    VfsFolders self() {
-        return new VfsFolders(toString_, name_, username_, password_, port_,
-
+   
-    }
-
-    VfsFolders tree() {
-        return new VfsFolders(toString_, name_, username_, password_, port_,
-
+   
-    }
-
@@ -123 +123 @@
-            if(fi.type = FtpFileType.dir) {
-                FtpFolder x = new FtpFolder(toString_, fi.name, username_,
-
+   
-                if((result = dg(x)) != 0)
-                    break;
@@ -178 +178 @@
-
-    public this(char[] server, char[] path, char[] username = "anonymous",
-            
+       
-    in {
-        assert(server != "");
@@ -195 +195 @@
-    int opApply(int delegate(inout VfsFolder) dg) {
-        FtpFolder ftp = new FtpFolder(toString_, name_, username, password_,
-
+   
-        ftp.opApply(dg);
-    }
@@ -250 +250 @@
-    VfsFiles catalog(char[] pattern) {
-        return new FtpFiles(toString_, name_, username_, password_, port_,
-
+   
-    }
-
-    VfsFiles catalog(VfsFilter filter = null) {
-        return new FtpFiles(toString_, name_, username_, password_, port_,
-
+   
-    }
-}
-
-class FtpFile: VfsFile {
+
+    FTPConnection ftp_;
+    char[] toString_, name_, username_, password_;
+    uint port_;
+    bool writeable_, writeableSet_;
+
+    public this(char[] server, char[] path, char[] username = "anonymous",
+            char[] password = "anonymous@anonymous", uint port = 21)
+    in {
+        assert(server != "");
+    }
+    out {
+        assert(server != "");
+    }
+    body {
+        toString_ = server;
+        name_ = name != "" ? path : server;
+        username_ = username;
+        password_ = password;
+        port_ = port;
+    }
+
-    char[] name() {
-ull
+ame_
-    }
-
-    char[] toString() {
-null
+toString_ ~ '/' ~ name_
-    }
-
-    bool exists() {
-
+
+
+
+
+
-    }
-
-    ulong size() {
-
+
+
+
+
+
+
+
+
-    }
-
@@ -310 +343 @@
-
-class FtpFiles: VfsFiles {
+
+    FTPConnection ftp_;
+    char[] toString_, name_, username_, password_;
+    uint port_;
+    bool writeable_, writeableSet_;
+    char[] filter_;
+    VfsFilter ffilter_;
+    bool useFilter = false;
+
+    public this(char[] server, char[] path, char[] username = "anonymous",
+            char[] password = "anonymous@anonymous", uint port = 21,
+            char[] filtPattern = "")
+    in {
+        assert(server != "");
+    }
+    out {
+        assert(server != "");
+    }
+    body {
+        toString_ = server;
+        name_ = name != "" ? path : server;
+        username_ = username;
+        password_ = password;
+        port_ = port;
+        filter_ = filtPattern;
+        useFilter = true;
+    }
+
+    public this(char[] server, char[] path, char[] username = "anonymous",
+            char[] password = "anonymous@anonymous", uint port = 21,
+            VfsFilter filter = null)
+    in {
+        assert(server != "");
+    }
+    out {
+        assert(server != "");
+    }
+    body {
+        toString_ = server;
+        name_ = name != "" ? path : server;
+        username_ = username;
+        password_ = password;
+        port_ = port;
+        ffilter_ = filter;
+    }
+
-    int opApply(int delegate(inout VfsFile) dg) {
-        return null;