Add feature flag for read with offset support.

iterate-ch · Nov 22, 2024 · bfc530b · bfc530b
1 parent 685bca9
commit bfc530b
Show file tree

Hide file tree

Showing 6 changed files with 41 additions and 15 deletions.
diff --git a/core/src/main/java/ch/cyberduck/core/features/Read.java b/core/src/main/java/ch/cyberduck/core/features/Read.java
@@ -24,6 +24,7 @@
 
 import java.io.InputStream;
 import java.text.MessageFormat;
+import java.util.EnumSet;
 
 /**
  * Read file from server
@@ -43,7 +44,10 @@ public interface Read {
      * @return True if read with offset is supported
      */
     default boolean offset(Path file) throws BackgroundException {
-        return true;
+        if(this.features(file).contains(Flags.offset)) {
+            return true;
+        }
+        return false;
 
     }
 
@@ -53,4 +57,18 @@ default void preflight(final Path file) throws BackgroundException {
                     file.getName())).withFile(file);
         }
     }
+
+    /**
+     * @return Supported features
+     */
+    default EnumSet<Flags> features(Path file) {
+        return EnumSet.of(Flags.offset);
+    }
+
+    /**
+     * Feature flags
+     */
+    enum Flags {
+        offset
+    }
 }
diff --git a/dracoon/src/main/java/ch/cyberduck/core/sds/triplecrypt/TripleCryptReadFeature.java b/dracoon/src/main/java/ch/cyberduck/core/sds/triplecrypt/TripleCryptReadFeature.java
@@ -37,6 +37,7 @@
 import org.apache.logging.log4j.Logger;
 
 import java.io.InputStream;
+import java.util.EnumSet;
 
 import com.dracoon.sdk.crypto.Crypto;
 import com.dracoon.sdk.crypto.error.CryptoException;
@@ -107,7 +108,7 @@ private UserKeyPair getUserKeyPair(final EncryptedFileKey encFileKey) throws Bac
     }
 
     @Override
-    public boolean offset(final Path file) {
-        return false;
+    public EnumSet<Flags> features(final Path file) {
+        return EnumSet.noneOf(Flags.class);
     }
 }
diff --git a/ftp/src/main/java/ch/cyberduck/core/ftp/FTPReadFeature.java b/ftp/src/main/java/ch/cyberduck/core/ftp/FTPReadFeature.java
@@ -31,15 +31,25 @@
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.util.EnumSet;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 public class FTPReadFeature implements Read {
     private static final Logger log = LogManager.getLogger(FTPReadFeature.class);
 
     private final FTPSession session;
+    /**
+     * Server process supports RESTart in STREAM mode
+     */
+    private final boolean rest;
 
     public FTPReadFeature(final FTPSession session) {
+        this(session, true);
+    }
+
+    public FTPReadFeature(final FTPSession session, final boolean rest) {
         this.session = session;
+        this.rest = rest;
     }
 
     @Override
@@ -70,14 +80,8 @@ public InputStream execute() throws BackgroundException {
     }
 
     @Override
-    public boolean offset(final Path file) throws BackgroundException {
-        // Where a server process supports RESTart in STREAM mode
-        try {
-            return session.getClient().hasFeature("REST", "STREAM");
-        }
-        catch(IOException e) {
-            throw new FTPExceptionMappingService().map("Download {0} failed", e, file);
-        }
+    public EnumSet<Flags> features(final Path file) {
+        return rest ? EnumSet.of(Flags.offset) : EnumSet.noneOf(Flags.class);
     }
 
     private final class ReadReplyInputStream extends ProxyInputStream {

diff --git a/ftp/src/main/java/ch/cyberduck/core/ftp/FTPSession.java b/ftp/src/main/java/ch/cyberduck/core/ftp/FTPSession.java
@@ -71,6 +71,7 @@ public class FTPSession extends SSLSession<FTPClient> {
     private final PreferencesReader preferences
             = new HostPreferences(host);
 
+    private Read read;
     private Timestamp timestamp;
     private UnixPermission permission;
     private Symlink symlink;
@@ -263,6 +264,7 @@ public void login(final LoginCallback prompt, final CancelCallback cancel) throw
                 catch(IOException e) {
                     log.warn("SYST command failed {}", e.getMessage());
                 }
+                read = new FTPReadFeature(this, client.hasFeature("REST", "STREAM"));
                 listService = new FTPListService(this, system, zone);
                 if(client.hasFeature(FTPCmd.MFMT.getCommand())) {
                     timestamp = new FTPMFMTTimestampFeature(this);
@@ -302,7 +304,7 @@ public <T> T _getFeature(final Class<T> type) {
             return (T) new FTPDeleteFeature(this);
         }
         if(type == Read.class) {
-            return (T) new FTPReadFeature(this);
+            return (T) read;
         }
         if(type == Upload.class) {
             return (T) new FTPUploadFeature(this);

diff --git a/spectra/src/main/java/ch/cyberduck/core/spectra/SpectraReadFeature.java b/spectra/src/main/java/ch/cyberduck/core/spectra/SpectraReadFeature.java
@@ -30,6 +30,7 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
+import java.util.EnumSet;
 import java.util.HashMap;
 import java.util.List;
 
@@ -88,7 +89,7 @@ public InputStream open() throws IOException {
     }
 
     @Override
-    public boolean offset(final Path file) {
-        return false;
+    public EnumSet<Flags> features(final Path file) {
+        return EnumSet.noneOf(Flags.class);
     }
 }
diff --git a/spectra/src/test/java/ch/cyberduck/core/spectra/SpectraReadFeatureTest.java b/spectra/src/test/java/ch/cyberduck/core/spectra/SpectraReadFeatureTest.java
@@ -84,7 +84,7 @@ public void testRead() throws Exception {
     }
 
     @Test
-    public void testOffsetSupport() {
+    public void testOffsetSupport() throws Exception {
         assertFalse(new SpectraReadFeature(session).offset(null));
     }
 }