Merge pull request #23 from /issues/21

Issues/21 Change FileCache default savepath
mattak · May 6, 2017 · 290a607 · 290a607
2 parents b09d88d + ef47a43
commit 290a607
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 21 deletions.
diff --git a/Assets/Plugins/Unicache/Examples/Simple/SimpleComponents.cs b/Assets/Plugins/Unicache/Examples/Simple/SimpleComponents.cs
@@ -13,10 +13,11 @@ public class SimpleComponents : MonoBehaviour
         public Button ClearImageButton;
         public RawImage Image;
         public Text LoadingText;
-        private IUnicache cache = new FileCache();
+        private IUnicache cache;
 
         void Start()
         {
+            this.cache = new FileCache();
             this.cache.Handler = new SimpleDownloadHandler();
             this.cache.UrlLocator = new SimpleUrlLocator();
             this.cache.CacheLocator = new SimpleCacheLocator();

diff --git a/Assets/Plugins/Unicache/Examples/Versioning/VersionComponents.cs b/Assets/Plugins/Unicache/Examples/Versioning/VersionComponents.cs
@@ -14,12 +14,12 @@ public class VersionComponents : MonoBehaviour, IUnicacheGetter
         public Button ClearButton;
         public RawImage Image;
 
-        private IUnicache cache = new FileCache();
+        private IUnicache _cache;
         private int count = 0;
 
         public IUnicache Cache
         {
-            get { return this.cache; }
+            get { return this._cache = this._cache ?? new FileCache(); }
         }
 
         private Dictionary<string, string> versionMap = new Dictionary<string, string>()
@@ -29,9 +29,9 @@ public IUnicache Cache
 
         void Start()
         {
-            this.cache.CacheLocator = new VersionCacheLocator(this.versionMap);
-            this.cache.Handler = new SimpleDownloadHandler();
-            this.cache.UrlLocator = new VersionUrlLocator();
+            this.Cache.CacheLocator = new VersionCacheLocator(this.versionMap);
+            this.Cache.Handler = new SimpleDownloadHandler();
+            this.Cache.UrlLocator = new VersionUrlLocator();
 
             this.DownloadButton.onClick.AddListener(this.Download);
             this.VersionUpButton.onClick.AddListener(this.VersionUp);
@@ -42,7 +42,7 @@ void Start()
 
         void Download()
         {
-            this.cache.Fetch("cachepig")
+            this.Cache.Fetch("cachepig")
                 .ByteToTexture2D(name: "cachepig")
                 .Subscribe(texture =>
                 {

diff --git a/Assets/Plugins/Unicache/Scripts/FileCache.cs b/Assets/Plugins/Unicache/Scripts/FileCache.cs
@@ -10,11 +10,17 @@ public class FileCache : IUnicache
         public ICacheHandler Handler { get; set; }
         public IUrlLocator UrlLocator { get; set; }
         public ICacheLocator CacheLocator { get; set; }
+        private string RootDirectory;
 
-        public FileCache()
+        public FileCache() : this(UnicacheConfig.Directory)
         {
         }
 
+        public FileCache(string rootDirectory)
+        {
+            this.RootDirectory = rootDirectory;
+        }
+
         public IObservable<byte[]> Fetch(string key)
         {
             var url = this.UrlLocator.CreateUrl(key);
@@ -46,7 +52,7 @@ public void Clear()
         {
             try
             {
-                IO.CleanDirectory(UnicacheConfig.Directory);
+                IO.CleanDirectory(this.RootDirectory);
             }
             catch (DirectoryNotFoundException)
             {
@@ -57,8 +63,7 @@ public void Delete(string key)
         {
             try
             {
-                var allPathes = Directory.GetFiles(UnicacheConfig.Directory)
-                    .Select(fullpath => fullpath.Replace(UnicacheConfig.Directory, ""));
+                var allPathes = ListPathes();
                 var keyPathes = new List<string>(this.CacheLocator.GetSameKeyCachePathes(key, allPathes));
 
                 foreach (var path in keyPathes)
@@ -73,45 +78,45 @@ public void Delete(string key)
 
         public void DeleteByPath(string path)
         {
-            File.Delete(UnicacheConfig.Directory + path);
+            File.Delete(this.RootDirectory + path);
         }
 
         public byte[] GetCache(string key)
         {
             return this.GetCacheByPath(this.CacheLocator.CreateCachePath(key));
         }
 
-        private byte[] GetCacheByPath(string path)
+        protected byte[] GetCacheByPath(string path)
         {
-            return IO.Read(UnicacheConfig.Directory + path);
+            return IO.Read(this.RootDirectory + path);
         }
 
         public void SetCache(string key, byte[] data)
         {
             this.SetCacheByPath(this.CacheLocator.CreateCachePath(key), data);
         }
 
-        private void SetCacheByPath(string path, byte[] data)
+        protected void SetCacheByPath(string path, byte[] data)
         {
-            IO.MakeParentDirectory(UnicacheConfig.Directory + path);
-            IO.Write(UnicacheConfig.Directory + path, data);
+            IO.MakeParentDirectory(this.RootDirectory + path);
+            IO.Write(this.RootDirectory + path, data);
         }
 
         public bool HasCache(string key)
         {
             return this.HasCacheByPath(this.CacheLocator.CreateCachePath(key));
         }
 
-        private bool HasCacheByPath(string path)
+        protected bool HasCacheByPath(string path)
         {
-            return File.Exists(UnicacheConfig.Directory + path);
+            return File.Exists(this.RootDirectory + path);
         }
 
         public IEnumerable<string> ListPathes()
         {
             return new List<string>(
-                IO.RecursiveListFiles(UnicacheConfig.Directory)
-                    .Select(fullpath => fullpath.Replace(UnicacheConfig.Directory, ""))
+                IO.RecursiveListFiles(this.RootDirectory)
+                    .Select(fullpath => fullpath.Replace(this.RootDirectory, ""))
             );
         }
     }