Remove Store Functions

src/AddIn/AddIn.cs

@@ -9,14 +9,10 @@ namespace RehauSku
 {
     class AddIn : IExcelAddIn
     {
-        public static HttpClient httpClient;
-        public static MemoryCache memoryCache;
         public static Application Excel;
 
         public void AutoOpen()
         {
-            httpClient = new HttpClient();
-            memoryCache = new MemoryCache("RehauSku");
             Excel = (Application)ExcelDnaUtil.Application;
             RegisterFunctions();
             IntelliSenseServer.Install();
@@ -29,7 +25,6 @@ namespace RehauSku
             IntelliSenseServer.Uninstall();
             RegistryUtil.Uninitialize();
             EventsUtil.Uninitialize();
-            memoryCache.Dispose();
         }
 
         void RegisterFunctions()

src/AddIn/Functions.cs

@@ -1,58 +1,9 @@
 using ExcelDna.Integration;
-using RehauSku.Assistant;
 
 namespace RehauSku
 {
     public class Functions
     {
-        [ExcelFunction(description: "Получение названия первого продукта в поиске")]
-        public static object RAUNAME([ExcelArgument(Name = "\"Запрос\"", Description = "в свободной форме или ячейка с запросом")] string request)
-            => MakeRequest(request, ProductField.Name);
-
-        [ExcelFunction(Description = "Получение артикула первого продукта в поиске")]
-        public static object RAUSKU([ExcelArgument(Name = "\"Запрос\"", Description = "в свободной форме или ячейка с запросом")] string request)
-            => MakeRequest(request, ProductField.Id);
-
-        [ExcelFunction(Description = "Получение цены первого продукта в поиске")]
-        public static object RAUPRICE([ExcelArgument(Name = "\"Запрос\"", Description = "в свободной форме или ячейка с запросом")] string request)
-            => MakeRequest(request, ProductField.Price);
-
-        private static object MakeRequest(string request, ProductField field)
-        {
-            object result;
-
-            if (request.IsCached())
-                result = request.GetFromCache();
-
-            else
-            {
-                result = ExcelAsyncUtil.Run("Request", request, delegate
-                {
-                    return request.RequestAndCache().GetAwaiter().GetResult();
-                });
-            }
-
-            if (result == null)
-                return "Не найдено :(";
-
-            if (result.Equals(ExcelError.ExcelErrorNA))
-                return "Загрузка...";
-
-            IProduct product = result as IProduct;
-
-            switch (field)
-            {
-                case ProductField.Name:
-                    return product.Name;
-                case ProductField.Id:
-                    return product.Id;
-                case ProductField.Price:
-                    return double.Parse(product.Price, System.Globalization.CultureInfo.InvariantCulture);
-                default:
-                    return null;
-            }
-        }
-
         [ExcelFunction(Description = "Получение корректного артикула из строки")]
         public static object GETRAUSKU([ExcelArgument(Name = "\"Строка\"", Description = "строка, содержащая актикул")] string line)
         {

src/AddIn/MemoryCacheUtil.cs

@@ -1,37 +0,0 @@
-using System;
-using System.Runtime.Caching;
-using System.Threading.Tasks;
-using RehauSku.Assistant;
-
-namespace RehauSku
-{
-    static class MemoryCacheUtil
-    {
-        public static bool IsCached(this string request)
-        {
-            return AddIn.memoryCache.Contains(request);
-        }
-
-        public static IProduct GetFromCache(this string request)
-        {
-            return AddIn.memoryCache[request] as IProduct;
-        }
-
-        public static async Task<IProduct> RequestAndCache(this string request)
-        {
-            IProduct product = await SkuAssist.GetProductAsync(request);
-
-            if (product == null)
-                return null;
-
-            AddIn.memoryCache.Add(request, product, DateTime.Now.AddMinutes(10));
-            return product;
-        }
-
-        public static void ClearCache()
-        {
-            AddIn.memoryCache.Dispose();
-            AddIn.memoryCache = new MemoryCache("RehauSku");
-        }
-    }
-}

src/Assistant/HttpClientUtil.cs

@@ -1,35 +0,0 @@
-using System;
-using System.Net;
-using System.Net.Http;
-using System.Threading.Tasks;
-
-namespace RehauSku.Assistant
-{
-    static class HttpClientUtil
-    {
-        private static HttpClient _httpClient = AddIn.httpClient;
-
-        public async static Task<string> GetContentByRequest(string request)
-        {
-            Uri uri = request.ConvertToUri();
-
-            ServicePointManager.SecurityProtocol =
-                SecurityProtocolType.Tls12 |
-                SecurityProtocolType.Tls11 |
-                SecurityProtocolType.Tls;
-
-            return await _httpClient.GetStringAsync(uri);
-        }
-
-        private static Uri ConvertToUri(this string request)
-        {
-            UriBuilder baseUri = new UriBuilder("https", "shop-rehau.ru");
-
-            baseUri.Path = "/catalogsearch/result/index/";
-            string cleanedRequest = request.CleanRequest();
-            baseUri.Query = "q=" + cleanedRequest;
-
-            return baseUri.Uri;
-        }
-    }
-}

src/Assistant/IProduct.cs

@@ -1,9 +0,0 @@
-namespace RehauSku.Assistant
-{
-    interface IProduct
-    {
-        string Id { get; }
-        string Name { get; }
-        string Price { get; }
-    }
-}

src/Assistant/ParseUtil.cs

@@ -1,44 +0,0 @@
-using AngleSharp;
-using AngleSharp.Dom;
-using Newtonsoft.Json;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace RehauSku.Assistant
-{
-    static class ParseUtil
-    {
-        public async static Task<IDocument> ContentToDocAsync(string content)
-        {
-            IConfiguration config = Configuration.Default;
-            IBrowsingContext context = BrowsingContext.New(config);
-
-            return await context.OpenAsync(req => req.Content(content));
-        }
-
-        public static IProduct GetProduct(IDocument document)
-        {
-            string script = document
-                .Scripts
-                .Where(s => s.InnerHtml.Contains("dataLayer"))
-                .FirstOrDefault()
-                .InnerHtml;
-
-            string json = script
-                .Substring(script.IndexOf("push(") + 5)
-                .TrimEnd(new[] { ')', ';', '\n', ' ' });
-
-            if (!json.Contains("impressions"))
-                return null;
-
-            StoreResponce storeResponse = JsonConvert.DeserializeObject<StoreResponce>(json);
-            IProduct product = storeResponse
-                .Ecommerce
-                .Impressions
-                .Where(p => p.Id.IsRehauSku())
-                .FirstOrDefault();
-
-            return product;
-        }
-    }
-}

src/Assistant/RequestModifier.cs

@@ -1,67 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Text.RegularExpressions;
-
-namespace RehauSku.Assistant
-{
-    static class RequestModifier
-    {
-        public static string CleanRequest(this string input)
-        {
-            string replace = new StringBuilder(input)
-                .Replace("+", " plus ")
-                .Replace("РХ", "")
-                .Replace("º", " ")
-                .Replace(".", " ")
-                .Replace("Ø", " ")
-                .ToString();
-
-            return replace._tPieceNormalize();
-        }
-
-        private static string _tPieceNormalize(this string line)
-        {
-            Regex regex = new Regex(@"\d{2}.\d{2}.\d{2}");
-
-            if (!regex.IsMatch(line))
-                return line;
-
-            string match = regex.Match(line).Value;
-
-            int side = int.Parse($"{match[3]}{match[4]}");
-            int[] endFaces = new int[]
-            {
-                int.Parse($"{match[0]}{match[1]}"),
-                int.Parse($"{match[6]}{match[7]}")
-            };
-
-            if (new[] { endFaces[0], endFaces[1], side }.Any(x => x == 45 || x == 90 || x == 87))
-                return line;
-
-            List<string> additions = new List<string>();
-
-            if (endFaces.All(x => x < side))
-                additions.Add("увеличенный боковой");
-
-            else
-            {
-                if (new[] { endFaces[0], endFaces[1], side }.Distinct().Count() == 1)
-                    additions.Add("равнопроходной");
-                else
-                    additions.Add("уменьшенный");
-
-                if (endFaces.Any(x => x > side))
-                    additions.Add("боковой");
-
-                if (endFaces[0] != endFaces[1])
-                    additions.Add("торцевой");
-            }
-
-            string piece = $" {endFaces.Max()}-{side}-{endFaces.Min()} ";
-            string modifiedMatch = string.Join(" ", additions) + piece;
-
-            return line.Replace(match, modifiedMatch);
-        }
-    }
-}

src/Assistant/SkuAssist.cs

@@ -1,22 +0,0 @@
-using System.Threading.Tasks;
-
-namespace RehauSku.Assistant
-{
-    enum ProductField
-    {
-        Name,
-        Id,
-        Price
-    }
-
-    static class SkuAssist
-    {
-        public static async Task<IProduct> GetProductAsync(string request)
-        {
-            var content = await HttpClientUtil.GetContentByRequest(request);
-            var document = await ParseUtil.ContentToDocAsync(content);
-
-            return ParseUtil.GetProduct(document);
-        }
-    }
-}

src/Assistant/StoreResponse.cs

@@ -1,21 +0,0 @@
-using System.Collections.Generic;
-
-namespace RehauSku.Assistant
-{
-    class StoreResponce
-    {
-        public Ecommerce Ecommerce { get; set; }
-    }
-
-    class Ecommerce
-    {
-        public List<Product> Impressions { get; set; }
-    }
-
-    class Product : IProduct
-    {
-        public string Id { get; set; }
-        public string Name { get; set; }
-        public string Price { get; set; }
-    }
-}

src/RehauSku.Assist-AddIn.dna

@@ -1,13 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <DnaLibrary Name="RehauSku.Assist Add-In" RuntimeVersion="v4.0" xmlns="http://schemas.excel-dna.net/addin/2020/07/dnalibrary">
   <ExternalLibrary Path="RehauSku.Assist.dll" ExplicitRegistration="true" LoadFromBytes="true" Pack="true" IncludePdb="false" />
-  <Reference Path="AngleSharp.dll" Pack="true" />
   <Reference Path="ExcelDna.Registration.dll" Pack="true" />
-  <Reference Path="Newtonsoft.Json.dll" Pack="true" />
-  <Reference Path="System.Buffers.dll" Pack="true" />
-  <Reference Path="System.Memory.dll" Pack="true" />
-  <Reference Path="System.Numerics.Vectors.dll" Pack="true" />
-  <Reference Path="System.Runtime.CompilerServices.Unsafe.dll" Pack="true" />
-  <Reference Path="System.Text.Encoding.CodePages.dll" Pack="true" />
   <Reference Path="ExcelDna.IntelliSense.dll" Pack="true" />
 </DnaLibrary>

src/RehauSku.Assist.csproj

@@ -34,76 +34,37 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="AngleSharp, Version=0.16.1.0, Culture=neutral, PublicKeyToken=e83494dcdc6d31ea, processorArchitecture=MSIL">
-      <HintPath>packages\AngleSharp.0.16.1\lib\net472\AngleSharp.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="ExcelDna.Integration, Version=1.1.0.0, Culture=neutral, PublicKeyToken=f225e9659857edbe, processorArchitecture=MSIL">
-      <HintPath>packages\ExcelDna.Integration.1.5.1\lib\net452\ExcelDna.Integration.dll</HintPath>
+      <HintPath>..\packages\ExcelDna.Integration.1.5.1\lib\net452\ExcelDna.Integration.dll</HintPath>
-      <Private>True</Private>
     </Reference>
     <Reference Include="ExcelDna.IntelliSense, Version=1.5.1.0, Culture=neutral, PublicKeyToken=f225e9659857edbe, processorArchitecture=MSIL">
-      <HintPath>packages\ExcelDna.IntelliSense.1.5.1\lib\net452\ExcelDna.IntelliSense.dll</HintPath>
+      <HintPath>..\packages\ExcelDna.IntelliSense.1.5.1\lib\net452\ExcelDna.IntelliSense.dll</HintPath>
     </Reference>
     <Reference Include="ExcelDna.Registration, Version=1.1.0.0, Culture=neutral, PublicKeyToken=f225e9659857edbe, processorArchitecture=MSIL">
-      <HintPath>packages\ExcelDna.Registration.1.5.1\lib\net452\ExcelDna.Registration.dll</HintPath>
+      <HintPath>..\packages\ExcelDna.Registration.1.5.1\lib\net452\ExcelDna.Registration.dll</HintPath>
-      <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.Office.Interop.Excel, Version=14.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
-      <HintPath>packages\ExcelDna.Interop.14.0.1\lib\Microsoft.Office.Interop.Excel.dll</HintPath>
+      <HintPath>..\packages\ExcelDna.Interop.14.0.1\lib\Microsoft.Office.Interop.Excel.dll</HintPath>
       <EmbedInteropTypes>True</EmbedInteropTypes>
-      <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.Vbe.Interop, Version=14.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
-      <HintPath>packages\ExcelDna.Interop.14.0.1\lib\Microsoft.Vbe.Interop.dll</HintPath>
+      <HintPath>..\packages\ExcelDna.Interop.14.0.1\lib\Microsoft.Vbe.Interop.dll</HintPath>
       <EmbedInteropTypes>True</EmbedInteropTypes>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
-    </Reference>
     <Reference Include="Office, Version=14.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
-      <HintPath>packages\ExcelDna.Interop.14.0.1\lib\Office.dll</HintPath>
+      <HintPath>..\packages\ExcelDna.Interop.14.0.1\lib\Office.dll</HintPath>
       <EmbedInteropTypes>True</EmbedInteropTypes>
     </Reference>
     <Reference Include="System" />
-    <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
-    </Reference>
     <Reference Include="System.Configuration" />
-    <Reference Include="System.Configuration.ConfigurationManager, Version=6.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>packages\System.Configuration.ConfigurationManager.6.0.0\lib\net461\System.Configuration.ConfigurationManager.dll</HintPath>
-    </Reference>
     <Reference Include="System.Core" />
     <Reference Include="System.Data.OracleClient" />
     <Reference Include="System.Drawing" />
-    <Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
-    </Reference>
     <Reference Include="System.Net" />
     <Reference Include="System.Numerics" />
-    <Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
-    </Reference>
     <Reference Include="System.Runtime.Caching" />
-    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="System.Security" />
-    <Reference Include="System.Security.AccessControl, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>packages\System.Security.AccessControl.6.0.0\lib\net461\System.Security.AccessControl.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Security.Permissions, Version=6.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>packages\System.Security.Permissions.6.0.0\lib\net461\System.Security.Permissions.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Security.Principal.Windows, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>packages\System.Security.Principal.Windows.5.0.0\lib\net461\System.Security.Principal.Windows.dll</HintPath>
-    </Reference>
     <Reference Include="System.ServiceProcess" />
-    <Reference Include="System.Text.Encoding.CodePages, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>packages\System.Text.Encoding.CodePages.6.0.0\lib\net461\System.Text.Encoding.CodePages.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="System.Transactions" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml.Linq" />
@@ -120,9 +81,6 @@
     <Compile Include="Interface\AbstractBar.cs" />
     <Compile Include="Interface\Dialog.cs" />
     <Compile Include="AddIn\RegistryUtil.cs" />
-    <Compile Include="AddIn\MemoryCacheUtil.cs" />
-    <Compile Include="Assistant\ParseUtil.cs" />
-    <Compile Include="Assistant\RequestModifier.cs" />
     <Compile Include="AddIn\SkuExtensions.cs" />
     <Compile Include="Interface\ProgressBar.cs" />
     <Compile Include="Interface\ResultBar.cs" />
@@ -136,15 +94,11 @@
     <Compile Include="PriceListTools\SourcePriceList.cs" />
     <Compile Include="PriceListTools\TargetPriceList.cs" />
     <Compile Include="Interface\RibbonController.cs" />
-    <Compile Include="Assistant\HttpClientUtil.cs" />
-    <Compile Include="Assistant\StoreResponse.cs" />
     <Compile Include="PriceListTools\ExportTool.cs" />
     <Compile Include="AddIn\AddIn.cs" />
-    <Compile Include="Assistant\IProduct.cs" />
     <Compile Include="AddIn\Functions.cs" />
     <Compile Include="AddIn\WorksheetExtensions.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Assistant\SkuAssist.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />
@@ -155,10 +109,11 @@
   <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="packages\ExcelDna.AddIn.1.5.1\build\ExcelDna.AddIn.targets" Condition="Exists('packages\ExcelDna.AddIn.1.5.1\build\ExcelDna.AddIn.targets')" />
+  <Import Project="..\packages\ExcelDna.AddIn.1.5.1\build\ExcelDna.AddIn.targets" Condition="Exists('..\packages\ExcelDna.AddIn.1.5.1\build\ExcelDna.AddIn.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('packages\ExcelDna.AddIn.1.5.1\build\ExcelDna.AddIn.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\ExcelDna.AddIn.1.5.1\build\ExcelDna.AddIn.targets'))" />
+    <Error Condition="!Exists('..\packages\ExcelDna.AddIn.1.5.1\build\ExcelDna.AddIn.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\ExcelDna.AddIn.1.5.1\build\ExcelDna.AddIn.targets'))" />
   </Target>
 </Project>

src/packages.config

@@ -1,20 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="AngleSharp" version="0.16.1" targetFramework="net48" />
   <package id="ExcelDna.AddIn" version="1.5.1" targetFramework="net48" />
   <package id="ExcelDna.Integration" version="1.5.1" targetFramework="net48" />
   <package id="ExcelDna.IntelliSense" version="1.5.1" targetFramework="net48" />
   <package id="ExcelDna.Interop" version="14.0.1" targetFramework="net48" />
   <package id="ExcelDna.Registration" version="1.5.1" targetFramework="net48" />
-  <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net48" />
-  <package id="System.Buffers" version="4.5.1" targetFramework="net48" />
-  <package id="System.Configuration.ConfigurationManager" version="6.0.0" targetFramework="net48" />
-  <package id="System.Memory" version="4.5.4" targetFramework="net48" />
-  <package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net48" />
-  <package id="System.Runtime.Caching" version="6.0.0" targetFramework="net48" />
-  <package id="System.Runtime.CompilerServices.Unsafe" version="6.0.0" targetFramework="net48" />
-  <package id="System.Security.AccessControl" version="6.0.0" targetFramework="net48" />
-  <package id="System.Security.Permissions" version="6.0.0" targetFramework="net48" />
-  <package id="System.Security.Principal.Windows" version="5.0.0" targetFramework="net48" />
-  <package id="System.Text.Encoding.CodePages" version="6.0.0" targetFramework="net48" />
 </packages>