Changeset 2522

Timestamp:

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

Author:

Nicklas Nordborg

Message:

References #611: Create package for supporting external files via SFTP

Implement support for ResumableConnectionManager.

File:

• extensions/net.sf.basedb.xfiles/trunk/src/net/sf/basedb/xfiles/sftp/SftpConnectionManager.java (modified) (5 diffs)

extensions/net.sf.basedb.xfiles/trunk/src/net/sf/basedb/xfiles/sftp/SftpConnectionManager.java

@@ -36 +36 @@
 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;
@@ -51 +51 @@
 */
 public class SftpConnectionManager
-  implements ConnectionManager
+  implements ResumableConnectionManager
 {
 
@@ -65 +65 @@
   
   /*
-    From the UriHandler interface
-    -----------------------------
+    From the ResumableConnectionManager interface
+    ---------------------------------------------
   */
   @Override
@@ -76 +76 @@
   @Override
   public InputStream getInputStream() 
+    throws IOException
+  {
+    return getInputStream(0);
+  }
+
+  @Override
+  public InputStream getInputStream(long offset) 
     throws IOException
   {
@@ -88 +95 @@
       sftp = ssh.newSFTPClient();
       remote = sftp.open(uri.getPath(), EnumSet.of(OpenMode.READ));
+      // Constructor is only accepting an 'int' parameter so we need to use skip() instead
+      InputStream tmp = remote.new RemoteFileInputStream();
+      if (offset > 0) tmp.skip(offset);
       stream = new CloseResourceInputStream(
-        new BufferedInputStream(remote.new RemoteFileInputStream(), XFiles.DEFAULT_BUFFER_SIZE), 
+        new BufferedInputStream(tmp, XFiles.DEFAULT_BUFFER_SIZE), 
         new MultiCloseable(remote, sftp, ssh));
     }