chebser/RhSolutions-AddIn
0
0
Fork 0
Code Packages Releases 16 Wiki Activity

Add clean request private method

Browse Source
This commit is contained in:
Sergey Chebotar 2021-11-29 17:10:43 +03:00
parent 15995027bf
commit d176a023f0
4 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Assistant/SkuAssist.cs
View File

@ -3,6 +3,7 @@ using AngleSharp.Dom;
using System.Linq; using System.Linq;
using System.Net; using System.Net;
using System.Net.Http; using System.Net.Http;
using System.Text.RegularExpressions;
using System.Threading.Tasks; using System.Threading.Tasks;
namespace Rehau.Sku.Assist namespace Rehau.Sku.Assist
@ -11,7 +12,7 @@ namespace Rehau.Sku.Assist
{ {
public async static Task<string> GetContent(string request, HttpClient httpClient) public async static Task<string> GetContent(string request, HttpClient httpClient)
{ {
string uri = "https://shop-rehau.ru/catalogsearch/result/?q=" + request; string uri = "https://shop-rehau.ru/catalogsearch/result/?q=" + request._CleanRequest();
ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12 | SecurityProtocolType.Tls11 | SecurityProtocolType.Tls; ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12 | SecurityProtocolType.Tls11 | SecurityProtocolType.Tls;
return await httpClient.GetStringAsync(uri); return await httpClient.GetStringAsync(uri);
@ -31,9 +32,13 @@ namespace Rehau.Sku.Assist
.All .All
.Where(e => e.ClassName == "product-item__desc-top") .Where(e => e.ClassName == "product-item__desc-top")
.Select(e => new Product(e.Children[0].TextContent, e.Children[1].TextContent.Trim(new[] { '\n', ' ' }))) .Select(e => new Product(e.Children[0].TextContent, e.Children[1].TextContent.Trim(new[] { '\n', ' ' })))
// .Where(product => !product.Sku.Any(c => char.IsLetter(c)))
.FirstOrDefault(); .FirstOrDefault();
} }
private static string _CleanRequest(this string input)
{
return input.Replace("+", " plus ");
}
} }
} }

2
Functions.cs
View File

@ -15,7 +15,7 @@ namespace Rehau.Sku.Assist
Task<string> contentTask = Task.Run(() => SkuAssist.GetContent(request, httpClient)); Task<string> contentTask = Task.Run(() => SkuAssist.GetContent(request, httpClient));
Task<IDocument> documentTask = await contentTask.ContinueWith(content => SkuAssist.GetDocument(content)); Task<IDocument> documentTask = await contentTask.ContinueWith(content => SkuAssist.GetDocument(content));
IProduct product = await documentTask.ContinueWith(doc => SkuAssist.GetProductFromDocument(doc.Result)); IProduct product = await documentTask.ContinueWith(doc => SkuAssist.GetProductFromDocument(doc.Result));
return product.ToString(); return product == null ? ExcelError.ExcelErrorNull.ToString() : product.ToString();
} }
} }
} }

BIN
Rehau.Sku.Assist-AddIn-packed.xll Normal file
View File

Binary file not shown.

2
Rehau.Sku.Assist.csproj
View File

@ -36,6 +36,7 @@
<ItemGroup> <ItemGroup>
<Reference Include="AngleSharp, Version=0.16.1.0, Culture=neutral, PublicKeyToken=e83494dcdc6d31ea, processorArchitecture=MSIL"> <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> <HintPath>packages\AngleSharp.0.16.1\lib\net472\AngleSharp.dll</HintPath>
<Private>True</Private>
</Reference> </Reference>
<Reference Include="ExcelDna.Integration, Version=1.1.0.0, Culture=neutral, PublicKeyToken=f225e9659857edbe, processorArchitecture=MSIL"> <Reference Include="ExcelDna.Integration, Version=1.1.0.0, Culture=neutral, PublicKeyToken=f225e9659857edbe, processorArchitecture=MSIL">
<HintPath>packages\ExcelDna.Integration.1.5.0\lib\net452\ExcelDna.Integration.dll</HintPath> <HintPath>packages\ExcelDna.Integration.1.5.0\lib\net452\ExcelDna.Integration.dll</HintPath>
@ -43,6 +44,7 @@
</Reference> </Reference>
<Reference Include="ExcelDna.Registration, Version=1.1.0.0, Culture=neutral, PublicKeyToken=f225e9659857edbe, processorArchitecture=MSIL"> <Reference Include="ExcelDna.Registration, Version=1.1.0.0, Culture=neutral, PublicKeyToken=f225e9659857edbe, processorArchitecture=MSIL">
<HintPath>packages\ExcelDna.Registration.1.5.0\lib\net452\ExcelDna.Registration.dll</HintPath> <HintPath>packages\ExcelDna.Registration.1.5.0\lib\net452\ExcelDna.Registration.dll</HintPath>
<Private>True</Private>
</Reference> </Reference>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL"> <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">