Changeset 2523

Timestamp:

Jun 25, 2014, 1:46:13 PM (9 years ago)

Author:

Nicklas Nordborg

Message:

References #305: Create package for supporting external files on FTP servers

Implement support for ResumableConnectionManager.

File:

• extensions/net.sf.basedb.xfiles/trunk/src/net/sf/basedb/xfiles/ftp/FtpConnectionManager.java (modified) (7 diffs)

extensions/net.sf.basedb.xfiles/trunk/src/net/sf/basedb/xfiles/ftp/FtpConnectionManager.java

@@ -37 +37 @@
 import net.sf.basedb.util.uri.CloseResourceInputStream;
 import net.sf.basedb.util.uri.ConnectionParameters;
-import net.sf.basedb.util.uri.ConnectionManager;
+import net.sf.basedb.util.uri.ResumableConnectionManager;
 import net.sf.basedb.util.uri.UriMetadata;
 import net.sf.basedb.xfiles.MultiCloseable;
@@ -50 +50 @@
 */
 public class FtpConnectionManager
-  implements ConnectionManager
+  implements ResumableConnectionManager
 {
 
@@ -64 +64 @@
   
   /*
-    From the UriHandler interface
-    -----------------------------
+    From the ResumableConnectionManager interface
+    ---------------------------------------------
   */
   @Override
@@ -75 +75 @@
   @Override
   public InputStream getInputStream() 
+    throws IOException
+  {
+    return getInputStream(0);
+  }
+  
+  @Override
+  public InputStream getInputStream(long offset) 
     throws IOException
   {
@@ -83 +90 @@
     {
       ftp = connect(uri, parameters);
-      stream = new CloseResourceInputStream(startDownload(ftp, uri.getPath()), new FTPClientCloseable(ftp));
+      stream = new CloseResourceInputStream(startDownload(ftp, uri.getPath(), offset), new FTPClientCloseable(ftp));
     }
     finally
@@ -207 +214 @@
     reading it. The download is started in a separate thread.
   */
-  private InputStream startDownload(final FTPClient ftp, final String file)
+  private InputStream startDownload(final FTPClient ftp, final String file, final long offset)
   {
     final PipedInputStream in = new PipedInputStream(XFiles.DEFAULT_BUFFER_SIZE);
@@ -218 +225 @@
         {
           OutputStream out = new PipedOutputStream(in);
-          ftp.download(file, out, 0, null);
+          ftp.download(file, out, offset, null);
         }
         catch (Exception ex)