Changeset 3481

Timestamp:

05/03/08 04:49:33 (7 months ago)

Author:

lmartin92

Message:

Now input and output in ftp/FtpClient.d work perfectly

Files:

• branches/lmartin/ftp/tango/net/ftp/FtpClient.d (modified) (6 diffs)

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

@@ -326 +326 @@
-
-    public void close() {
+        //make sure no open data connection and if open data connection then kill
+        if(dataSocket_ !is null)
+            this.finishDataCommand(dataSocket_);
-        if(socket_ !is null) {
-            try {
@@ -889 +892 @@
-
-        // We shouldn't get a 250 in STREAM mode.
-
+
+
+
+
-    }
-
@@ -1368 +1374 @@
-        } else {
-            // Allocate space for the file, if we need to.
-
+//
-        }
-
@@ -1531 +1537 @@
-
-    public InputStream input(char[] path){
-SocketConduit 
+
-        return dataSocket_;
-    }
-
-    public OutputStream output(char[] path){
-SocketConduit 
+
-        return dataSocket_;
-    }
@@ -1551 +1557 @@
-        FileSystem.setDirectory(FileSystem.toAbsolute("Z:/"));
-        auto fp = new FilePath(FileSystem.toAbsolute("Z:/"));
+        
-        Stdout("Testing the new parts in FtpClient.d").newline.flush;
-        FTPConnection conn = new FTPConnection("localhost", "me", "pass", 21);
-        Stdout("Connecting works!").newline.flush;
+        
-        Stdout("Making directory SS.").newline.flush;
-        conn.mkdir("/SS");
+        
-        Stdout("Setting current directory to SS.").newline.flush;
-        conn.cd("/SS");
+        
-        Stdout("Setting current directory to parent directory.").newline.flush;
-        conn.cdup();
+        
-        Stdout("Removing directory SS.").newline.flush;
-        conn.rm("/SS");
+        
-        Stdout("Checking for the existence of a file.").newline.flush;
-        if(conn.exist("ServingSchedule.tif")) {
@@ -1575 +1587 @@
-            Stdout("The file was modified: ");
-            Stdout(layout("{:ddd, dd MMMM yyyy HH:mm:ss z}", modified)).newline.flush;
-            Stdout("Press enter.").newline.flush;
-            Cin.get();
-            Stdout("Deleting the file No.").newline.flush;
-            conn.del("No");
-        } else
-            Stdout("The file does not exist.").newline.flush;
+            
+        Stdout("Listing content.").newline.flush;
-        FtpFileInfo[] infs = conn.ls();
-        foreach(FtpFileInfo inf; infs) {
-            Stdout(inf.name).newline.flush;
-        }
+        
-        Stdout("Now getting a file and writing it to a place.").newline.flush;
-        conn.get("/Backup/ServingSchedule.tif", "/newFile.whatever");
+        
-        Stdout("Now putting a file to the server.").newline.flush;
-        conn.put("ServingSchedule.tif", "/newFile.whatever");
+
+        Stdout("Testing input.").newline.flush;
+        FileConduit fcon = new FileConduit("Z:/whatever", FileConduit.ReadWriteCreate);
+        fcon.copy(conn.input("/Backup/ServingSchedule.tif"));
+            
+        Stdout("Testing output.").newline.flush;
+        OutputStream os = conn.output("ServingSchedule.tif");
+        os.copy(fcon.input());
+        
-        conn.close();
-
+
+
-        fp.remove();
-        Stdout("Finished.").newline.flush;