#112: Cache trimmed only after cache hits

library/src/main/java/com/danikula/videocache/HttpProxyCacheServerClients.java

@@ -32,7 +32,7 @@ final class HttpProxyCacheServerClients {
     public HttpProxyCacheServerClients(String url, Config config) {
         this.url = checkNotNull(url);
         this.config = checkNotNull(config);
-        this.uiCacheListener = new UiListenerHandler(url, listeners);
+        this.uiCacheListener = new UiListenerHandler(url, listeners,config);
     }
 
     public void processRequest(GetRequest request, Socket socket) throws ProxyCacheException, IOException {
@@ -90,17 +90,25 @@ private static final class UiListenerHandler extends Handler implements CacheLis
 
         private final String url;
         private final List<CacheListener> listeners;
+        private final Config config;
 
-        public UiListenerHandler(String url, List<CacheListener> listeners) {
+        public UiListenerHandler(String url, List<CacheListener> listeners, Config config) {
             super(Looper.getMainLooper());
             this.url = url;
             this.listeners = listeners;
+            this.config=config;
         }
 
         @Override
         public void onCacheAvailable(File file, String url, int percentsAvailable) {
             Message message = obtainMessage();
             message.arg1 = percentsAvailable;
+
+            //if the file is fully cached, trim cache.
+            if(percentsAvailable==100){
+                config.diskUsage.trim(file.getParentFile());
+            }
+
             message.obj = file;
             sendMessage(message);
         }

library/src/main/java/com/danikula/videocache/file/DiskUsage.java

@@ -12,4 +12,6 @@ public interface DiskUsage {
 
     void touch(File file) throws IOException;
 
+    void trim(File folder);
+
 }

library/src/main/java/com/danikula/videocache/file/FileCache.java

@@ -79,6 +79,7 @@ public synchronized void close() throws ProxyCacheException {
         try {
             dataFile.close();
             diskUsage.touch(file);
+            diskUsage.trim(file.getParentFile());
         } catch (IOException e) {
             throw new ProxyCacheException("Error closing file " + file, e);
         }

library/src/main/java/com/danikula/videocache/file/LruDiskUsage.java

@@ -20,11 +20,22 @@ abstract class LruDiskUsage implements DiskUsage {
     private static final Logger LOG = LoggerFactory.getLogger("LruDiskUsage");
     private final ExecutorService workerThread = Executors.newSingleThreadExecutor();
 
+    @Override
+    public void trim(File folder){
+        //folder passed in is the cache folder. Trim this if required
+        workerThread.submit(new TrimCallable(folder));
+    }
+
     @Override
     public void touch(File file) throws IOException {
         workerThread.submit(new TouchCallable(file));
     }
 
+    private void trimInBackground(File folder) throws IOException {
+        List<File> files = Files.getLruListFiles(folder);
+        trim(files);
+    }
+
     private void touchInBackground(File file) throws IOException {
         Files.setLastModifiedNow(file);
         List<File> files = Files.getLruListFiles(file.getParentFile());
@@ -60,6 +71,7 @@ private long countTotalSize(List<File> files) {
         return totalSize;
     }
 
+
     private class TouchCallable implements Callable<Void> {
 
         private final File file;
@@ -74,4 +86,19 @@ public Void call() throws Exception {
             return null;
         }
     }
+
+    private class TrimCallable implements Callable<Void> {
+
+        private final File folder;
+
+        public TrimCallable(File folder) {
+            this.folder = folder;
+        }
+
+        @Override
+        public Void call() throws Exception {
+            trimInBackground(folder);
+            return null;
+        }
+    }
 }

library/src/main/java/com/danikula/videocache/file/UnlimitedDiskUsage.java

@@ -14,4 +14,9 @@ public class UnlimitedDiskUsage implements DiskUsage {
     public void touch(File file) throws IOException {
         // do nothing
     }
+
+    @Override
+    public void trim(File folder){
+        // do nothing
+    }
 }