Добавлен кэшинг результатов запроса, интерфейс IProduct

1 files changed, 36 insertions, 10 deletions

diff --git a/Functions.cs b/Functions.cs
index aefdd87..9d3eb28 100644
--- a/Functions.cs
+++ b/Functions.cs
@@ -1,27 +1,53 @@
 using ExcelDna.Integration;
+using System.Runtime.Caching;
 using System.Net.Http;
 
 namespace Rehau.Sku.Assist
 {
     public class Functions : IExcelAddIn
     {
-        static readonly HttpClient httpClient = new HttpClient();
+        private static HttpClient _httpClient;
+        private static ObjectCache _resultCache = MemoryCache.Default;
 
-        public static object RAUNAME(string request)
+        public void AutoClose()
         {
-            return ExcelAsyncUtil.Run("RAUNAME", request, delegate
-            {
-                var document = SkuAssist.GetDocumentAsync(request, httpClient).Result;
-                return SkuAssist.GetResultFromDocument(document);
-            });
         }
-
-        public void AutoClose()
+        public void AutoOpen()
         {
+            _httpClient = new HttpClient();
         }
 
-        public void AutoOpen()
+        [ExcelFunction]
+        public static object RAUNAME(string request)
         {
+            string cachedResult = _resultCache[request] as string;
+
+            if (cachedResult != null)
+            {
+                return cachedResult;
+            }
+
+            else
+            {
+                object result = ExcelAsyncUtil.Run("RAUNAME", null,
+                    delegate
+                {
+                    var document = SkuAssist.GetDocumentAsync(request, _httpClient).Result;
+                    var product = SkuAssist.GetProductFromDocument(document);
+                    return product.ToString();
+                });
+
+                if (result.Equals(ExcelError.ExcelErrorNA))
+                {
+                    return "Загрузка...";
+                }
+
+                else
+                {
+                    _resultCache.Add(request, result, System.DateTime.Now.AddMinutes(20));
+                    return result.ToString();
+                }
+            }
         }
     }
 }
\ No newline at end of file