PostClass.CreatedAtの型をDateTimeUtcに変更

[opentween/open-tween.git] / OpenTween / ImageCache.cs

diff --git a/OpenTween/ImageCache.cs b/OpenTween/ImageCache.cs
index 9f88eea..1f93b3a 100644 (file)
--- a/OpenTween/ImageCache.cs
+++ b/OpenTween/ImageCache.cs
@@ -27,6 +27,8 @@ using System.Threading.Tasks;
 using System.Net;
 using System.Threading;
 using System.Xml.Serialization;
+using System.Net.Http;
+using OpenTween.Connection;
 
 namespace OpenTween
 {
@@ -54,18 +56,13 @@ namespace OpenTween
 
         public ImageCache()
         {
-            lock (this.lockObject)
-            {
-                this.innerDictionary = new LRUCacheDictionary<string, Task<MemoryImage>>(trimLimit: 300, autoTrimCount: 100);
-
-                this.innerDictionary.CacheRemoved += (s, e) => {
-                    // まだ参照されている場合もあるのでDisposeはファイナライザ任せ
+            this.innerDictionary = new LRUCacheDictionary<string, Task<MemoryImage>>(trimLimit: 300, autoTrimCount: 100);
+            this.innerDictionary.CacheRemoved += (s, e) => {
+                // まだ参照されている場合もあるのでDisposeはファイナライザ任せ
+                this.CacheRemoveCount++;
+            };
 
-                    this.CacheRemoveCount++;
-                };
-
-                this.cancelTokenSource = new CancellationTokenSource();
-            }
+            this.cancelTokenSource = new CancellationTokenSource();
         }
 
         /// <summary>
@@ -79,7 +76,6 @@ namespace OpenTween
         /// <summary>
         /// 破棄されたキャッシュの件数
         /// </summary>
-        [XmlIgnore] // これ付けないと sgen.exe がエラーを吐く
         public int CacheRemoveCount { get; private set; }
 
         /// <summary>
@@ -92,52 +88,53 @@ namespace OpenTween
         {
             var cancelToken = this.cancelTokenSource.Token;
 
-            return Task.Factory.StartNew(() =>
+            return Task.Run(() =>
             {
-                Task<MemoryImage> cachedImageTask = null;
                 lock (this.lockObject)
                 {
-                    if (this.innerDictionary.ContainsKey(address))
-                        cachedImageTask = this.innerDictionary[address];
+                    innerDictionary.TryGetValue(address, out var cachedImageTask);
 
-                    if (force && cachedImageTask != null)
+                    if (cachedImageTask != null)
                     {
-                        this.innerDictionary.Remove(address);
-
-                        if (cachedImageTask.Status == TaskStatus.RanToCompletion)
-                            cachedImageTask.Result.Dispose();
-
-                        cachedImageTask.Dispose();
-                        cachedImageTask = null;
+                        if (force)
+                        {
+                            this.innerDictionary.Remove(address);
+                            cachedImageTask = null;
+                        }
+                        else
+                            return cachedImageTask;
                     }
 
-                    if (cachedImageTask != null)
-                        return cachedImageTask;
-
                     cancelToken.ThrowIfCancellationRequested();
 
-                    using (var client = new OTWebClient() { Timeout = 10000 })
-                    {
-                        var imageTask = client.DownloadDataAsync(new Uri(address), cancelToken)
-                            .ContinueWith(t => MemoryImage.CopyFromBytes(t.Result), TaskScheduler.Default);
+                    var imageTask = this.FetchImageAsync(address, cancelToken);
+                    this.innerDictionary[address] = imageTask;
 
-                        this.innerDictionary[address] = imageTask;
+                    return imageTask;
+                }
+            }, cancelToken);
+        }
 
-                        return imageTask;
-                    }
+        private async Task<MemoryImage> FetchImageAsync(string uri, CancellationToken cancelToken)
+        {
+            using (var response = await Networking.Http.GetAsync(uri, cancelToken).ConfigureAwait(false))
+            {
+                response.EnsureSuccessStatusCode();
+
+                using (var imageStream = await response.Content.ReadAsStreamAsync().ConfigureAwait(false))
+                {
+                    return await MemoryImage.CopyFromStreamAsync(imageStream)
+                        .ConfigureAwait(false);
                 }
-            }, cancelToken).Unwrap();
+            }
         }
 
         public MemoryImage TryGetFromCache(string address)
         {
             lock (this.lockObject)
             {
-                if (!this.innerDictionary.ContainsKey(address))
-                    return null;
-
-                var imageTask = this.innerDictionary[address];
-                if (imageTask.Status != TaskStatus.RanToCompletion)
+                if (!this.innerDictionary.TryGetValue(address, out var imageTask) ||
+                    imageTask.Status != TaskStatus.RanToCompletion)
                     return null;
 
                 return imageTask.Result;
@@ -166,11 +163,10 @@ namespace OpenTween
 
                 lock (this.lockObject)
                 {
-                    foreach (var item in this.innerDictionary)
+                    foreach (var (_, task) in this.innerDictionary)
                     {
-                        var task = item.Value;
-                        if (task.Status == TaskStatus.RanToCompletion && task.Result != null)
-                            task.Result.Dispose();
+                        if (task.Status == TaskStatus.RanToCompletion)
+                            task.Result?.Dispose();
                     }
 
                     this.innerDictionary.Clear();
@@ -188,8 +184,6 @@ namespace OpenTween
         }
 
         ~ImageCache()
-        {
-            this.Dispose(false);
-        }
+            => this.Dispose(false);
     }
 }