From 3d186c22e8665b80839495fdcf4b176c2f3e03b9 Mon Sep 17 00:00:00 2001 From: Sergey Chebotar Date: Tue, 20 Dec 2022 12:03:20 +0300 Subject: Rename Sku class --- src/AddIn/RehauSku.cs | 67 ---------------------------------------- src/AddIn/Sku.cs | 67 ++++++++++++++++++++++++++++++++++++++++ src/PriceListTools/ExportTool.cs | 2 +- src/RhSolutions.csproj | 3 +- 4 files changed, 70 insertions(+), 69 deletions(-) delete mode 100644 src/AddIn/RehauSku.cs create mode 100644 src/AddIn/Sku.cs (limited to 'src') diff --git a/src/AddIn/RehauSku.cs b/src/AddIn/RehauSku.cs deleted file mode 100644 index 68d95b7..0000000 --- a/src/AddIn/RehauSku.cs +++ /dev/null @@ -1,67 +0,0 @@ -using System.Text.RegularExpressions; - -namespace RhSolutions -{ - 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/AddIn/Sku.cs b/src/AddIn/Sku.cs new file mode 100644 index 0000000..aaf5937 --- /dev/null +++ b/src/AddIn/Sku.cs @@ -0,0 +1,67 @@ +using System.Text.RegularExpressions; + +namespace RhSolutions +{ + internal class Sku + { + public string Article { get; private set; } + public string Variant { get; private set; } + + public Sku(string article, string variant) + { + Article = article; + Variant = variant; + } + + public static bool TryParse(string line, out Sku 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 Sku(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 Sku(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 Sku(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 Sku(sku, variant); + return true; + } + + else + { + rehauSku = null; + return false; + } + } + + public override string ToString() + { + return $"1{Article}1{Variant}"; + } + } +} \ No newline at end of file diff --git a/src/PriceListTools/ExportTool.cs b/src/PriceListTools/ExportTool.cs index add072d..c21e9b1 100644 --- a/src/PriceListTools/ExportTool.cs +++ b/src/PriceListTools/ExportTool.cs @@ -56,7 +56,7 @@ namespace RhSolutions.PriceListTools { object current = cells[row, column]; - if (RauSku.TryParse(current.ToString(), out RauSku rauSku)) + if (Sku.TryParse(current.ToString(), out Sku rauSku)) { sku = rauSku.ToString(); } diff --git a/src/RhSolutions.csproj b/src/RhSolutions.csproj index 3348605..630d440 100644 --- a/src/RhSolutions.csproj +++ b/src/RhSolutions.csproj @@ -78,7 +78,8 @@ - + + -- cgit v1.2.3