"Disc -> Disk" migration. Deleted DiscCacheAware, MemoryCacheAware.

Author: nostra13

library/src/com/nostra13/universalimageloader/cache/disc/DiscCacheAware.java

@@ -15,11 +15,71 @@
  *******************************************************************************/
 package com.nostra13.universalimageloader.cache.disc;
 
+import android.graphics.Bitmap;
+import com.nostra13.universalimageloader.utils.IoUtils;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+
 /**
  * Interface for disk cache
  *
  * @author Sergey Tarasevich (nostra13[at]gmail[dot]com)
  * @since 1.9.2
  */
-public interface DiskCache extends DiscCacheAware {
+public interface DiskCache {
+	/**
+	 * Returns root directory of disk cache
+	 *
+	 * @return Root directory of disk cache
+	 */
+	File getDirectory();
+
+	/**
+	 * Returns file of cached image
+	 *
+	 * @param imageUri Original image URI
+	 * @return File of cached image or <b>null</b> if image wasn't cached
+	 */
+	File get(String imageUri);
+
+	/**
+	 * Saves image stream in disk cache.
+	 * Incoming image stream shouldn't be closed in this method.
+	 *
+	 * @param imageUri    Original image URI
+	 * @param imageStream Input stream of image (shouldn't be closed in this method)
+	 * @param listener    Listener for saving progress, can be ignored if you don't use
+	 *                    {@linkplain com.nostra13.universalimageloader.core.listener.ImageLoadingProgressListener
+	 *                    progress listener} in ImageLoader calls
+	 * @return <b>true</b> - if image was saved successfully; <b>false</b> - if image wasn't saved in disk cache.
+	 * @throws java.io.IOException
+	 */
+	boolean save(String imageUri, InputStream imageStream, IoUtils.CopyListener listener) throws IOException;
+
+	/**
+	 * Saves image bitmap in disk cache.
+	 *
+	 * @param imageUri Original image URI
+	 * @param bitmap   Image bitmap
+	 * @return <b>true</b> - if bitmap was saved successfully; <b>false</b> - if bitmap wasn't saved in disk cache.
+	 * @throws IOException
+	 */
+	boolean save(String imageUri, Bitmap bitmap) throws IOException;
+
+	/**
+	 * Removes image file associated with incoming URI
+	 *
+	 * @param imageUri Image URI
+	 * @return <b>true</b> - if image file is deleted successfully; <b>false</b> - if image file doesn't exist for
+	 * incoming URI or image file can't be deleted.
+	 */
+	boolean remove(String imageUri);
+
+	/** Closes disk cache, releases resources. */
+	void close();
+
+	/** Clears disk cache. */
+	void clear();
 }

library/src/com/nostra13/universalimageloader/cache/disc/DiskCache.java

@@ -35,7 +35,7 @@
  * @see FileNameGenerator
  * @since 1.0.0
  */
-public abstract class BaseDiscCache implements DiskCache {
+public abstract class BaseDiskCache implements DiskCache {
 	/** {@value */
 	public static final int DEFAULT_BUFFER_SIZE = 32 * 1024; // 32 Kb
 	/** {@value */
@@ -57,15 +57,15 @@ public abstract class BaseDiscCache implements DiskCache {
 	protected int compressQuality = DEFAULT_COMPRESS_QUALITY;
 
 	/** @param cacheDir Directory for file caching */
-	public BaseDiscCache(File cacheDir) {
+	public BaseDiskCache(File cacheDir) {
 		this(cacheDir, null);
 	}
 
 	/**
 	 * @param cacheDir        Directory for file caching
 	 * @param reserveCacheDir null-ok; Reserve directory for file caching. It's used when the primary directory isn't available.
 	 */
-	public BaseDiscCache(File cacheDir, File reserveCacheDir) {
+	public BaseDiskCache(File cacheDir, File reserveCacheDir) {
 		this(cacheDir, reserveCacheDir, DefaultConfigurationFactory.createFileNameGenerator());
 	}
 
@@ -75,7 +75,7 @@ public BaseDiscCache(File cacheDir, File reserveCacheDir) {
 	 * @param fileNameGenerator {@linkplain com.nostra13.universalimageloader.cache.disc.naming.FileNameGenerator
 	 *                          Name generator} for cached files
 	 */
-	public BaseDiscCache(File cacheDir, File reserveCacheDir, FileNameGenerator fileNameGenerator) {
+	public BaseDiskCache(File cacheDir, File reserveCacheDir, FileNameGenerator fileNameGenerator) {
 		if (cacheDir == null) {
 			throw new IllegalArgumentException("cacheDir" + ERROR_ARG_NULL);
 		}

library/src/com/nostra13/universalimageloader/cache/disc/impl/BaseDiscCache.java library/src/com/nostra13/universalimageloader/cache/disc/impl/BaseDiskCache.java

@@ -33,7 +33,7 @@
  * @author Sergey Tarasevich (nostra13[at]gmail[dot]com)
  * @since 1.3.1
  */
-public class LimitedAgeDiscCache extends BaseDiscCache {
+public class LimitedAgeDiskCache extends BaseDiskCache {
 
 	private final long maxFileAge;
 
@@ -44,7 +44,7 @@ public class LimitedAgeDiscCache extends BaseDiscCache {
 	 * @param maxAge   Max file age (in seconds). If file age will exceed this value then it'll be removed on next
 	 *                 treatment (and therefore be reloaded).
 	 */
-	public LimitedAgeDiscCache(File cacheDir, long maxAge) {
+	public LimitedAgeDiskCache(File cacheDir, long maxAge) {
 		this(cacheDir, null, DefaultConfigurationFactory.createFileNameGenerator(), maxAge);
 	}
 
@@ -53,7 +53,7 @@ public LimitedAgeDiscCache(File cacheDir, long maxAge) {
 	 * @param maxAge   Max file age (in seconds). If file age will exceed this value then it'll be removed on next
 	 *                 treatment (and therefore be reloaded).
 	 */
-	public LimitedAgeDiscCache(File cacheDir, File reserveCacheDir, long maxAge) {
+	public LimitedAgeDiskCache(File cacheDir, File reserveCacheDir, long maxAge) {
 		this(cacheDir, reserveCacheDir, DefaultConfigurationFactory.createFileNameGenerator(), maxAge);
 	}
 
@@ -64,7 +64,7 @@ public LimitedAgeDiscCache(File cacheDir, File reserveCacheDir, long maxAge) {
 	 * @param maxAge            Max file age (in seconds). If file age will exceed this value then it'll be removed on next
 	 *                          treatment (and therefore be reloaded).
 	 */
-	public LimitedAgeDiscCache(File cacheDir, File reserveCacheDir, FileNameGenerator fileNameGenerator, long maxAge) {
+	public LimitedAgeDiskCache(File cacheDir, File reserveCacheDir, FileNameGenerator fileNameGenerator, long maxAge) {
 		super(cacheDir, reserveCacheDir, fileNameGenerator);
 		this.maxFileAge = maxAge * 1000; // to milliseconds
 	}

library/src/com/nostra13/universalimageloader/cache/disc/impl/LimitedAgeDiscCache.java library/src/com/nostra13/universalimageloader/cache/disc/impl/LimitedAgeDiskCache.java

@@ -26,17 +26,17 @@
  * @author Sergey Tarasevich (nostra13[at]gmail[dot]com)
  * @since 1.0.0
  */
-public class UnlimitedDiscCache extends BaseDiscCache {
+public class UnlimitedDiskCache extends BaseDiskCache {
 	/** @param cacheDir Directory for file caching */
-	public UnlimitedDiscCache(File cacheDir) {
+	public UnlimitedDiskCache(File cacheDir) {
 		super(cacheDir);
 	}
 
 	/**
 	 * @param cacheDir        Directory for file caching
 	 * @param reserveCacheDir null-ok; Reserve directory for file caching. It's used when the primary directory isn't available.
 	 */
-	public UnlimitedDiscCache(File cacheDir, File reserveCacheDir) {
+	public UnlimitedDiskCache(File cacheDir, File reserveCacheDir) {
 		super(cacheDir, reserveCacheDir);
 	}
 
@@ -46,7 +46,7 @@ public UnlimitedDiscCache(File cacheDir, File reserveCacheDir) {
 	 * @param fileNameGenerator {@linkplain com.nostra13.universalimageloader.cache.disc.naming.FileNameGenerator
 	 *                          Name generator} for cached files
 	 */
-	public UnlimitedDiscCache(File cacheDir, File reserveCacheDir, FileNameGenerator fileNameGenerator) {
+	public UnlimitedDiskCache(File cacheDir, File reserveCacheDir, FileNameGenerator fileNameGenerator) {
 		super(cacheDir, reserveCacheDir, fileNameGenerator);
 	}
 }

library/src/com/nostra13/universalimageloader/cache/disc/impl/UnlimitedDiscCache.java library/src/com/nostra13/universalimageloader/cache/disc/impl/UnlimitedDiskCache.java

@@ -36,7 +36,7 @@
  * @see FileNameGenerator
  * @since 1.9.2
  */
-public class LruDiscCache implements DiskCache {
+public class LruDiskCache implements DiskCache {
 	/** {@value */
 	public static final int DEFAULT_BUFFER_SIZE = 32 * 1024; // 32 Kb
 	/** {@value */
@@ -65,7 +65,7 @@ public class LruDiscCache implements DiskCache {
 	 * @param cacheMaxSize      Max cache size in bytes. <b>0</b> means cache size is unlimited.
 	 * @throws IOException if cache can't be initialized (e.g. "No space left on device")
 	 */
-	public LruDiscCache(File cacheDir, FileNameGenerator fileNameGenerator, long cacheMaxSize) throws IOException {
+	public LruDiskCache(File cacheDir, FileNameGenerator fileNameGenerator, long cacheMaxSize) throws IOException {
 		this(cacheDir, null, fileNameGenerator, cacheMaxSize, 0);
 	}
 
@@ -79,7 +79,7 @@ public LruDiscCache(File cacheDir, FileNameGenerator fileNameGenerator, long cac
 	 * @param cacheMaxFileCount Max file count in cache. <b>0</b> means file count is unlimited.
 	 * @throws IOException if cache can't be initialized (e.g. "No space left on device")
 	 */
-	public LruDiscCache(File cacheDir, File reserveCacheDir, FileNameGenerator fileNameGenerator, long cacheMaxSize,
+	public LruDiskCache(File cacheDir, File reserveCacheDir, FileNameGenerator fileNameGenerator, long cacheMaxSize,
 			int cacheMaxFileCount) throws IOException {
 		if (cacheDir == null) {
 			throw new IllegalArgumentException("cacheDir" + ERROR_ARG_NULL);

library/src/com/nostra13/universalimageloader/cache/disc/impl/ext/LruDiscCache.java library/src/com/nostra13/universalimageloader/cache/disc/impl/ext/LruDiskCache.java

@@ -17,11 +17,32 @@
 
 import android.graphics.Bitmap;
 
+import java.util.Collection;
+
 /**
  * Interface for memory cache
  *
  * @author Sergey Tarasevich (nostra13[at]gmail[dot]com)
  * @since 1.9.2
  */
-public interface MemoryCache extends MemoryCacheAware<String, Bitmap> {
+public interface MemoryCache {
+	/**
+	 * Puts value into cache by key
+	 *
+	 * @return <b>true</b> - if value was put into cache successfully, <b>false</b> - if value was <b>not</b> put into
+	 * cache
+	 */
+	boolean put(String key, Bitmap value);
+
+	/** Returns value by key. If there is no value for key then null will be returned. */
+	Bitmap get(String key);
+
+	/** Removes item by key */
+	Bitmap remove(String key);
+
+	/** Returns all keys of cache */
+	Collection<String> keys();
+
+	/** Remove all items from cache */
+	void clear();
 }