Changeset 3388

Timestamp:

03/21/08 11:14:11 (9 months ago)

Author:

lmartin92

Message:

Now instead of listing the top level subdirs it lists every subdir including sudirs subdirs.
May take a while on a large server to do certain things.

Files:

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

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

@@ -7 +7 @@
-
-//fix flatness
-
-module tango.io.vfs.FtpFolder;
-
@@ -15 +14 @@
-import tango.io.Conduit;
-import tango.text.Util;
+
+private FtpFileInfo[] getFiles(FTPConnection ftp, char[] path = "") {
+    FtpFileInfo[] orig = ftp.ls(path);
+    FtpFileInfo[] temp;
+    foreach(FtpFileInfo inf; orig) {
+        if(inf.type == FtpFileType.dir) {
+            temp ~= inf;
+        }
+    }
+    foreach(FtpFileInfo inf; temp) {
+        orig ~= getFiles((ftp.cd(inf.name) , ftp));
+        ftp.cdup();
+    }
+    return orig;
+}
-
-class FtpFolderEntry: VfsFolderEntry {
@@ -115 +129 @@
-        ftp_ = new FTPConnection();
-        ftp_.connect(toString_, username_, password_, port_);
-ftp_.ls(
+getFiles(ftp_, 
-        ftp_.close();
-
@@ -149 +163 @@
-            try {
-                ftp_.mkdir("diw");
-
-
-
-
-
+
+
-            } catch(Exception e) {
-                writeable_ = false;
@@ -223 +234 @@
-        ftp_ = new FTPConnection();
-        ftp_.connect(toString_, username_, password_, port_);
-ftp_.ls(
+getFiles(ftp_
-        ftp_.close();
-        uint size;
@@ -238 +249 @@
-        ftp_ = new FTPConnection();
-        ftp_.connect(toString_, username_, password_, port_);
-ftp_.ls(
+getFiles(ftp_
-        ftp_.close();
-        uint size;
-
-        foreach(FtpFileInfo fi; fis) {
-!= FtpFileType.unknown || fi.type != FtpFileType.file || fi.type != FtpFileType.othe
+== FtpFileType.di
-                size++;
-        }
@@ -257 +268 @@
-        ftp_ = new FTPConnection();
-        ftp_.connect(toString_, username_, password_, port_);
-ftp_.ls(
+getFiles(ftp_
-        ftp_.close();
-        uint size;
@@ -463 +474 @@
-        }
-        if(doFilter_) {
-ftp_.ls(
+getFiles(ftp_
-            FtpFileInfo[] toReturn;
-            if(useFilter_) {
@@ -491 +502 @@
-            return toReturn;
-        } else
-ftp_.ls(
+getFiles(ftp_
-    }
-
@@ -507 +518 @@
-}
-
-
+ 
-    /*
-     * 
-     */
-
+    import tango.io.vfs.model.Vfs;
+    import FtpFolder;
+    import tango.net.ftp.FtpClient;
-    import tango.io.Stdout;
-    import tango.util.Convert;
-
-    int main() {
-
+
-        //variables
-
+
-        VfsFolder folder;
-        VfsFile file;
@@ -525 +539 @@
-        VfsFolderEntry entry;
-        char[] toPrint;
-
+
-        //init code
-
-ftp.digitalmars.com", ""
+
+127.0.0.1", "", "lmartin92", "asunset!", 21
-        Stdout("Inited entry.").newline.flush;
-        folder = entry.open();
-    
+   
-        Stdout("Inited folder.").newline.flush;
-        folders = folder.tree();
-        Stdout("Inited tree.").newline.flush;
-dmd.1.00.zip
+client.exe
-        Stdout("Inited file.").newline.flush;
-dmd
+cli
-        Stdout("Inited catalog.").newline.flush;
-        Stdout("Initialization Passed.").newline.newline.flush;
@@ -543 +557 @@
-        //print information gatherable from all of
-        //the variables
-
+
-        //entry
-        Stdout("Folder exists: ").flush;
-        toPrint = to!(char[])(entry.exists());
-        Stdout(toPrint).newline.flush;
-
+
-        //folder
-        Stdout("Folder:").newline.flush;
-        toPrint = "\n\t writeable: " ~ to!(char[])(folder.writable());
-        toPrint ~= "\n\t name: " ~ folder.name();
-
+ 
-        Stdout(toPrint).newline.flush;
-
+
-        //folders
-        Stdout("Folders: ").newline.flush;
@@ -561 +575 @@
-        toPrint ~= "\n\t #of Folders: " ~ to!(char[])(folders.folders());
-        toPrint ~= "\n\t Total Objects: " ~ to!(char[])(folders.entries());
-
+
+
-        Stdout(toPrint).newline.flush;
-
+
-        //file
-        Stdout("File: ").newline.flush;
@@ -571 +586 @@
-        toPrint ~= "\n\t path: " ~ file.toString();
-        Stdout(toPrint).newline.flush;
-
+
-        //files
-        Stdout("Files: ").newline.flush;
@@ -578 +593 @@
-        Stdout("\n\t #of Files: ").flush;
-        Stdout(files.files()).newline.flush;
-
+
-        return 0;
-    }
-
-
+