diff --git a/src/AddIn/AddIn.cs b/src/AddIn/AddIn.cs index b532bfb..1606624 100644 --- a/src/AddIn/AddIn.cs +++ b/src/AddIn/AddIn.cs @@ -7,25 +7,12 @@ using System.Runtime.Caching; namespace RehauSku { - enum ResponseOrder - { - Default, - Relevance, - Name, - Price, - Series - } - 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(); @@ -38,7 +25,6 @@ namespace RehauSku IntelliSenseServer.Uninstall(); RegistryUtil.Uninitialize(); EventsUtil.Uninitialize(); - memoryCache.Dispose(); } void RegisterFunctions() diff --git a/src/AddIn/Functions.cs b/src/AddIn/Functions.cs index 618d17d..c202a3b 100644 --- a/src/AddIn/Functions.cs +++ b/src/AddIn/Functions.cs @@ -1,56 +1,18 @@ 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) + [ExcelFunction(Description = "Получение корректного артикула из строки")] + public static object GETRAUSKU([ExcelArgument(Name = "\"Строка\"", Description = "строка, содержащая актикул")] string line) { - object result; - - if (request.IsCached()) - result = request.GetFromCache(); - - else + if (RauSku.TryParse(line, out RauSku rausku)) { - result = ExcelAsyncUtil.Run("Request", request, delegate - { - return request.RequestAndCache().GetAwaiter().GetResult(); - }); + return rausku.ToString(); } - 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; - } + else return ExcelError.ExcelErrorNA; } } } \ No newline at end of file diff --git a/src/AddIn/MemoryCacheUtil.cs b/src/AddIn/MemoryCacheUtil.cs deleted file mode 100644 index 1d42e14..0000000 --- a/src/AddIn/MemoryCacheUtil.cs +++ /dev/null @@ -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 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"); - } - } -} \ No newline at end of file diff --git a/src/AddIn/RegistryUtil.cs b/src/AddIn/RegistryUtil.cs index a13e941..54e071e 100644 --- a/src/AddIn/RegistryUtil.cs +++ b/src/AddIn/RegistryUtil.cs @@ -9,14 +9,12 @@ namespace RehauSku static class RegistryUtil { private static string priceListPath; - private static int? storeResponseOrder; private static RegistryKey RootKey { get; set; } public static void Initialize() { RootKey = Registry.CurrentUser.CreateSubKey(@"SOFTWARE\REHAU\SkuAssist"); priceListPath = RootKey.GetValue("PriceListPath") as string; - storeResponseOrder = RootKey.GetValue("StoreResponseOrder") as int?; } public static void Uninitialize() @@ -71,23 +69,5 @@ namespace RehauSku { return Path.GetFileName(priceListPath); } - - public static ResponseOrder StoreResponseOrder - { - get - { - if (storeResponseOrder == null) - { - RootKey.SetValue("StoreResponseOrder", (int)ResponseOrder.Default); - storeResponseOrder = (int)ResponseOrder.Default; - return (ResponseOrder)storeResponseOrder.Value; - } - - else - { - return (ResponseOrder)storeResponseOrder.Value; - } - } - } } } diff --git a/src/AddIn/RehauSku.cs b/src/AddIn/RehauSku.cs new file mode 100644 index 0000000..40e5d30 --- /dev/null +++ b/src/AddIn/RehauSku.cs @@ -0,0 +1,67 @@ +using System.Text.RegularExpressions; + +namespace RehauSku +{ + internal class RauSku + { + public string Sku { get; private set; } + public string Variant { get; private set; } + + public RauSku(string sku, string variant) + { + Sku = sku; + Variant = variant; + } + + public static bool TryParse(string line, out RauSku rehauSku) + { + Match match; + match = Regex.Match(line, @"\b[1]\d{6}[1]\d{3}\b"); + if (match.Success) + { + string sku = match.Value.Substring(1, 6); + string variant = match.Value.Substring(8, 3); + rehauSku = new RauSku(sku, variant); + return true; + } + + match = Regex.Match(line, @"\b\d{6}\D\d{3}\b"); + if (match.Success) + { + string sku = match.Value.Substring(0, 6); + string variant = match.Value.Substring(7, 3); + rehauSku = new RauSku(sku, variant); + return true; + } + + match = Regex.Match(line, @"\b\d{9}\b"); + if (match.Success) + { + string sku = match.Value.Substring(0, 6); + string variant = match.Value.Substring(6, 3); + rehauSku = new RauSku(sku, variant); + return true; + } + + match = Regex.Match(line, @"\b\d{6}\b"); + if (match.Success) + { + string sku = match.Value.Substring(0, 6); + string variant = "001"; + rehauSku = new RauSku(sku, variant); + return true; + } + + else + { + rehauSku = null; + return false; + } + } + + public override string ToString() + { + return $"1{Sku}1{Variant}"; + } + } +} \ No newline at end of file diff --git a/src/Assistant/HttpClientUtil.cs b/src/Assistant/HttpClientUtil.cs deleted file mode 100644 index 316ea07..0000000 --- a/src/Assistant/HttpClientUtil.cs +++ /dev/null @@ -1,53 +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 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(); - - switch (RegistryUtil.StoreResponseOrder) - { - case ResponseOrder.Relevance: - baseUri.Query = "dir=asc&order=relevance&q=" + cleanedRequest; - break; - case ResponseOrder.Name: - baseUri.Query = "dir=asc&order=name&q=" + cleanedRequest; - break; - case ResponseOrder.Price: - baseUri.Query = "dir=asc&order=price&q=" + cleanedRequest; - break; - case ResponseOrder.Series: - baseUri.Query = "dir=asc&order=sch_product_series&q=" + cleanedRequest; - break; - default: - baseUri.Query = "q=" + cleanedRequest; - break; - } - - return baseUri.Uri; - } - } -} \ No newline at end of file diff --git a/src/Assistant/IProduct.cs b/src/Assistant/IProduct.cs deleted file mode 100644 index 9494eeb..0000000 --- a/src/Assistant/IProduct.cs +++ /dev/null @@ -1,9 +0,0 @@ -namespace RehauSku.Assistant -{ - interface IProduct - { - string Id { get; } - string Name { get; } - string Price { get; } - } -} diff --git a/src/Assistant/ParseUtil.cs b/src/Assistant/ParseUtil.cs deleted file mode 100644 index a93c658..0000000 --- a/src/Assistant/ParseUtil.cs +++ /dev/null @@ -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 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(json); - IProduct product = storeResponse - .Ecommerce - .Impressions - .Where(p => p.Id.IsRehauSku()) - .FirstOrDefault(); - - return product; - } - } -} \ No newline at end of file diff --git a/src/Assistant/RequestModifier.cs b/src/Assistant/RequestModifier.cs deleted file mode 100644 index c2c3436..0000000 --- a/src/Assistant/RequestModifier.cs +++ /dev/null @@ -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 additions = new List(); - - 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); - } - } -} \ No newline at end of file diff --git a/src/Assistant/SkuAssist.cs b/src/Assistant/SkuAssist.cs deleted file mode 100644 index 85a084c..0000000 --- a/src/Assistant/SkuAssist.cs +++ /dev/null @@ -1,22 +0,0 @@ -using System.Threading.Tasks; - -namespace RehauSku.Assistant -{ - enum ProductField - { - Name, - Id, - Price - } - - static class SkuAssist - { - public static async Task GetProductAsync(string request) - { - var content = await HttpClientUtil.GetContentByRequest(request); - var document = await ParseUtil.ContentToDocAsync(content); - - return ParseUtil.GetProduct(document); - } - } -} \ No newline at end of file diff --git a/src/Assistant/StoreResponse.cs b/src/Assistant/StoreResponse.cs deleted file mode 100644 index 1a9b1c5..0000000 --- a/src/Assistant/StoreResponse.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System.Collections.Generic; - -namespace RehauSku.Assistant -{ - class StoreResponce - { - public Ecommerce Ecommerce { get; set; } - } - - class Ecommerce - { - public List Impressions { get; set; } - } - - class Product : IProduct - { - public string Id { get; set; } - public string Name { get; set; } - public string Price { get; set; } - } -} \ No newline at end of file diff --git a/src/PriceListTools/ExportTool.cs b/src/PriceListTools/ExportTool.cs index 1a24d48..4e51563 100644 --- a/src/PriceListTools/ExportTool.cs +++ b/src/PriceListTools/ExportTool.cs @@ -56,9 +56,9 @@ namespace RehauSku.PriceListTools { object current = cells[row, column]; - if (current.ToString().IsRehauSku()) + if (RauSku.TryParse(current.ToString(), out RauSku rauSku)) { - sku = current.ToString(); + sku = rauSku.ToString(); } else if (current.GetType() == typeof(string) diff --git a/src/Properties/AssemblyInfo.cs b/src/Properties/AssemblyInfo.cs index d254dfc..6a5c3a2 100644 --- a/src/Properties/AssemblyInfo.cs +++ b/src/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.4.3")] -[assembly: AssemblyFileVersion("1.0.4.3")] +[assembly: AssemblyVersion("1.0.5.0")] +[assembly: AssemblyFileVersion("1.0.5.0")] diff --git a/src/Properties/ExcelDna.Build.props b/src/Properties/ExcelDna.Build.props index 1fed993..f5fdab1 100644 --- a/src/Properties/ExcelDna.Build.props +++ b/src/Properties/ExcelDna.Build.props @@ -72,6 +72,15 @@ Suffix used for packed .xll files e.g. MyAddIn-packed.xll --> -packed + + + + + + - diff --git a/src/RehauSku.Assist-AddIn.dna b/src/RehauSku.Assist-AddIn.dna index 1bef6e1..0b173b3 100644 --- a/src/RehauSku.Assist-AddIn.dna +++ b/src/RehauSku.Assist-AddIn.dna @@ -1,13 +1,6 @@ - - - - - - - \ No newline at end of file diff --git a/src/RehauSku.Assist.csproj b/src/RehauSku.Assist.csproj index 8a2990b..b74f82f 100644 --- a/src/RehauSku.Assist.csproj +++ b/src/RehauSku.Assist.csproj @@ -1,5 +1,6 @@  + Debug @@ -34,76 +35,37 @@ 4 - - packages\AngleSharp.0.16.1\lib\net472\AngleSharp.dll - True - - packages\ExcelDna.Integration.1.5.1\lib\net452\ExcelDna.Integration.dll - True + ..\packages\ExcelDna.Integration.1.6.0\lib\net452\ExcelDna.Integration.dll - - packages\ExcelDna.IntelliSense.1.5.1\lib\net452\ExcelDna.IntelliSense.dll + + ..\packages\ExcelDna.IntelliSense.1.6.0\lib\net452\ExcelDna.IntelliSense.dll - packages\ExcelDna.Registration.1.5.1\lib\net452\ExcelDna.Registration.dll - True + ..\packages\ExcelDna.Registration.1.6.0\lib\net452\ExcelDna.Registration.dll - - packages\ExcelDna.Interop.14.0.1\lib\Microsoft.Office.Interop.Excel.dll - True - True - - - packages\ExcelDna.Interop.14.0.1\lib\Microsoft.Vbe.Interop.dll + + ..\packages\ExcelDna.Interop.15.0.0\lib\net452\Microsoft.Office.Interop.Excel.dll True - - packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll + + ..\packages\ExcelDna.Interop.15.0.0\lib\net452\Microsoft.Vbe.Interop.dll + True - - packages\ExcelDna.Interop.14.0.1\lib\Office.dll + + ..\packages\ExcelDna.Interop.15.0.0\lib\net452\Office.dll True - - packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll - - - packages\System.Configuration.ConfigurationManager.6.0.0\lib\net461\System.Configuration.ConfigurationManager.dll - - - packages\System.Memory.4.5.4\lib\net461\System.Memory.dll - - - packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll - - - packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll - True - - - packages\System.Security.AccessControl.6.0.0\lib\net461\System.Security.AccessControl.dll - - - packages\System.Security.Permissions.6.0.0\lib\net461\System.Security.Permissions.dll - - - packages\System.Security.Principal.Windows.5.0.0\lib\net461\System.Security.Principal.Windows.dll - - - packages\System.Text.Encoding.CodePages.6.0.0\lib\net461\System.Text.Encoding.CodePages.dll - True - @@ -116,12 +78,10 @@ + - - - @@ -135,15 +95,11 @@ - - - - @@ -158,6 +114,10 @@ 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}. - + + + + + \ No newline at end of file diff --git a/src/packages.config b/src/packages.config index b92606b..3820e62 100644 --- a/src/packages.config +++ b/src/packages.config @@ -1,20 +1,9 @@  - - - - - - - - - - - - - - - - - + + + + + + \ No newline at end of file