SimpleFuture: Add silent cancellation (no callback).

koush · koush · commit dba0e435b3f4 · 2014-04-19T12:35:02.000-07:00
This will unblock any calls to .get()

FileCache: key enumeration.
diff --git a/AndroidAsync/src/com/koushikdutta/async/future/SimpleFuture.java b/AndroidAsync/src/com/koushikdutta/async/future/SimpleFuture.java
@@ -8,13 +8,18 @@
 import java.util.concurrent.TimeoutException;
 
 public class SimpleFuture<T> extends SimpleCancellable implements DependentFuture<T> {
+    AsyncSemaphore waiter;
+    Exception exception;
+    T result;
+    boolean silent;
+    FutureCallback<T> callback;
+
     @Override
     public boolean cancel(boolean mayInterruptIfRunning) {
         return cancel();
     }
 
-    @Override
-    public boolean cancel() {
+    private boolean cancelInternal(boolean silent) {
         if (!super.cancel())
             return false;
         // still need to release any pending waiters
@@ -23,12 +28,21 @@ public boolean cancel() {
             exception = new CancellationException();
             releaseWaiterLocked();
             callback = handleCompleteLocked();
+            this.silent = silent;
         }
         handleCallbackUnlocked(callback);
         return true;
     }
 
-    AsyncSemaphore waiter;
+    public boolean cancelSilently() {
+        return cancelInternal(true);
+    }
+
+    @Override
+    public boolean cancel() {
+        return cancelInternal(silent);
+    }
+
     @Override
     public T get() throws InterruptedException, ExecutionException {
         AsyncSemaphore waiter;
@@ -40,7 +54,7 @@ public T get() throws InterruptedException, ExecutionException {
         waiter.acquire();
         return getResult();
     }
-    
+
     private T getResult() throws ExecutionException {
         if (exception != null)
             throw new ExecutionException(exception);
@@ -59,7 +73,7 @@ public T get(long timeout, TimeUnit unit) throws InterruptedException, Execution
             throw new TimeoutException();
         return getResult();
     }
-    
+
     @Override
     public boolean setComplete() {
         return setComplete((T)null);
@@ -78,7 +92,7 @@ private FutureCallback<T> handleCompleteLocked() {
     }
 
     private void handleCallbackUnlocked(FutureCallback<T> callback) {
-        if (callback != null)
+        if (callback != null && !silent)
             callback.onCompleted(exception, result);
     }
 
@@ -95,12 +109,10 @@ AsyncSemaphore ensureWaiterLocked() {
         return waiter;
     }
 
-    Exception exception;
     public boolean setComplete(Exception e) {
         return setComplete(e, null);
     }
 
-    T result;
     public boolean setComplete(T value) {
         return setComplete(null, value);
     }
@@ -134,7 +146,10 @@ public SimpleFuture<T> setComplete(Future<T> future) {
         return this;
     }
 
-    FutureCallback<T> callback;
+    // TEST USE ONLY!
+    public FutureCallback<T> getCallback() {
+        return callback;
+    }
 
     @Override
     public SimpleFuture<T> setCallback(FutureCallback<T> callback) {
@@ -150,11 +165,6 @@ public SimpleFuture<T> setCallback(FutureCallback<T> callback) {
         return this;
     }
 
-    // TEST USE ONLY!
-    public FutureCallback<T> getCallback() {
-        return callback;
-    }
-
     @Override
     public <C extends FutureCallback<T>> C then(C callback) {
         if (callback instanceof DependentCancellable)
@@ -180,6 +190,7 @@ public SimpleFuture<T> reset() {
         exception = null;
         waiter = null;
         callback = null;
+        silent = false;
 
         return this;
     }
diff --git a/AndroidAsync/src/com/koushikdutta/async/util/FileCache.java b/AndroidAsync/src/com/koushikdutta/async/util/FileCache.java
@@ -9,7 +9,9 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
+import java.util.HashSet;
 import java.util.Random;
+import java.util.Set;
 
 /**
  * Created by koush on 4/12/14.
@@ -249,6 +251,20 @@ public void clear() {
         cache.evictAll();
     }
 
+    public Set<String> keySet() {
+        HashSet<String> ret = new HashSet<String>();
+        File[] files = directory.listFiles();
+        if (files == null)
+            return ret;
+        for (File file: files) {
+            String name = file.getName();
+            int last = name.lastIndexOf('.');
+            if (last != -1)
+                ret.add(name.substring(0, last));
+        }
+        return ret;
+    }
+
     public void setMaxSize(long maxSize) {
         cache.setMaxSize(maxSize);
     }
