Follow redirects in ClientGet

[jFCPlib.git] / src / main / java / net / pterodactylus / fcp / quelaton / ClientGetCommandImpl.java

diff --git a/src/main/java/net/pterodactylus/fcp/quelaton/ClientGetCommandImpl.java b/src/main/java/net/pterodactylus/fcp/quelaton/ClientGetCommandImpl.java
index 5137c96..e60fed7 100644 (file)
--- a/src/main/java/net/pterodactylus/fcp/quelaton/ClientGetCommandImpl.java
+++ b/src/main/java/net/pterodactylus/fcp/quelaton/ClientGetCommandImpl.java
@@ -2,20 +2,21 @@ package net.pterodactylus.fcp.quelaton;
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Optional;
+import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.Consumer;
+import java.util.function.Supplier;
 
 import net.pterodactylus.fcp.AllData;
 import net.pterodactylus.fcp.ClientGet;
-import net.pterodactylus.fcp.FcpMessage;
 import net.pterodactylus.fcp.FcpUtils.TempInputStream;
 import net.pterodactylus.fcp.GetFailed;
 import net.pterodactylus.fcp.Priority;
 import net.pterodactylus.fcp.ReturnType;
 
-import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.ListeningExecutorService;
 import com.google.common.util.concurrent.MoreExecutors;
 
@@ -28,6 +29,8 @@ class ClientGetCommandImpl implements ClientGetCommand {
 
        private final ListeningExecutorService threadPool;
        private final ConnectionSupplier connectionSupplier;
+       private final Supplier<String> identifierGenerator;
+       private final List<Consumer<String>> onRedirects = new ArrayList<>();
 
        private boolean ignoreDataStore;
        private boolean dataStoreOnly;
@@ -36,9 +39,16 @@ class ClientGetCommandImpl implements ClientGetCommand {
        private boolean realTime;
        private boolean global;
 
-       public ClientGetCommandImpl(ExecutorService threadPool, ConnectionSupplier connectionSupplier) {
+       public ClientGetCommandImpl(ExecutorService threadPool, ConnectionSupplier connectionSupplier, Supplier<String> identifierGenerator) {
                this.threadPool = MoreExecutors.listeningDecorator(threadPool);
                this.connectionSupplier = connectionSupplier;
+               this.identifierGenerator = identifierGenerator;
+       }
+
+       @Override
+       public ClientGetCommand onRedirect(Consumer<String> onRedirect) {
+               onRedirects.add(onRedirect);
+               return this;
        }
 
        @Override
@@ -79,12 +89,17 @@ class ClientGetCommandImpl implements ClientGetCommand {
 
        @Override
        public Executable<Optional<Data>> uri(String uri) {
-               ClientGet clientGet = createClientGetCommand(uri);
-               return () -> threadPool.submit(() -> new ClientGetReplySequence().send(clientGet).get());
+               return () -> threadPool.submit(() -> execute(uri));
+       }
+
+       private Optional<Data> execute(String uri) throws InterruptedException, ExecutionException, IOException {
+               ClientGet clientGet = createClientGetCommand(identifierGenerator.get(), uri);
+               try (ClientGetDialog clientGetDialog = new ClientGetDialog()) {
+                       return clientGetDialog.send(clientGet).get();
+               }
        }
 
-       private ClientGet createClientGetCommand(String uri) {
-               String identifier = new RandomIdentifierGenerator().generate();
+       private ClientGet createClientGetCommand(String identifier, String uri) {
                ClientGet clientGet = new ClientGet(uri, identifier, ReturnType.direct);
                if (ignoreDataStore) {
                        clientGet.setIgnoreDataStore(true);
@@ -107,27 +122,30 @@ class ClientGetCommandImpl implements ClientGetCommand {
                return clientGet;
        }
 
-       private class ClientGetReplySequence extends FcpReplySequence<Optional<Data>> {
+       private class ClientGetDialog extends FcpDialog<Optional<Data>> {
 
-               private final AtomicBoolean finished = new AtomicBoolean();
-               private final AtomicBoolean failed = new AtomicBoolean();
-
-               private String contentType;
-               private long dataLength;
-               private InputStream payload;
-
-               public ClientGetReplySequence() throws IOException {
-                       super(ClientGetCommandImpl.this.threadPool, ClientGetCommandImpl.this.connectionSupplier.get());
+               public ClientGetDialog() throws IOException {
+                       super(ClientGetCommandImpl.this.threadPool, ClientGetCommandImpl.this.connectionSupplier.get(),
+                               Optional.<Data>empty());
                }
 
                @Override
-               protected boolean isFinished() {
-                       return finished.get() || failed.get();
+               protected void consumeAllData(AllData allData) {
+                       synchronized (this) {
+                               String contentType = allData.getContentType();
+                               long dataLength = allData.getDataLength();
+                               try {
+                                       InputStream payload = new TempInputStream(allData.getPayloadInputStream(), dataLength);
+                                       setResult(Optional.of(createData(contentType, dataLength, payload)));
+                               } catch (IOException e) {
+                                       // TODO – logging
+                                       finish();
+                               }
+                       }
                }
 
-               @Override
-               protected Optional<Data> getResult() {
-                       return failed.get() ? Optional.empty() : Optional.of(new Data() {
+               private Data createData(String contentType, long dataLength, InputStream payload) {
+                       return new Data() {
                                @Override
                                public String getMimeType() {
                                        return contentType;
@@ -142,27 +160,17 @@ class ClientGetCommandImpl implements ClientGetCommand {
                                public InputStream getInputStream() {
                                        return payload;
                                }
-                       });
-               }
-
-               @Override
-               protected void consumeAllData(AllData allData) {
-                       synchronized (this) {
-                               contentType = allData.getContentType();
-                               dataLength = allData.getDataLength();
-                               try {
-                                       payload = new TempInputStream(allData.getPayloadInputStream(), dataLength);
-                                       finished.set(true);
-                               } catch (IOException e) {
-                                       // TODO – logging
-                                       failed.set(true);
-                               }
-                       }
+                       };
                }
 
                @Override
                protected void consumeGetFailed(GetFailed getFailed) {
-                       failed.set(true);
+                       if (getFailed.getCode() == 27) {
+                               onRedirects.forEach(onRedirect -> onRedirect.accept(getFailed.getRedirectURI()));
+                               sendMessage(createClientGetCommand(getIdentifier(), getFailed.getRedirectURI()));
+                       } else {
+                               finish();
+                       }
                }
 
        }