diff --git a/Pf2eDataScrapper/Importers/Implementations/Aonprd/DataBuilder/Helpers/StringHelper.cs b/Pf2eDataScrapper/Importers/Implementations/Aonprd/DataBuilder/Helpers/StringHelper.cs index 5a21e1f..384ea5f 100644 --- a/Pf2eDataScrapper/Importers/Implementations/Aonprd/DataBuilder/Helpers/StringHelper.cs +++ b/Pf2eDataScrapper/Importers/Implementations/Aonprd/DataBuilder/Helpers/StringHelper.cs @@ -21,7 +21,7 @@ internal partial class StringHelper { MarkdownLinkSplit result = new(); - Match match = MarkdownRegex().Match(input); + Match match = LinkRegex().Match(input); if (match.Captures.Count > 0) { result.Links.Add( @@ -34,7 +34,7 @@ internal partial class StringHelper ); } - result.Suffix = MarkdownRegex().Replace(input, ""); + result.Suffix = LinkRegex().Replace(input, ""); return result; } @@ -51,7 +51,7 @@ internal partial class StringHelper public static partial Regex SourceSuffixRegex(); [GeneratedRegex(@"(.*?)\[(.*?)\]\((.*?)\)")] - public static partial Regex MarkdownRegex(); + public static partial Regex LinkRegex(); } internal class MarkdownLinkSplit diff --git a/Pf2eDataScrapper/Importers/Implementations/Aonprd/DataBuilder/Processors/Types/ActionProcessor.cs b/Pf2eDataScrapper/Importers/Implementations/Aonprd/DataBuilder/Processors/Types/ActionProcessor.cs index 39d27cb..6a83c06 100644 --- a/Pf2eDataScrapper/Importers/Implementations/Aonprd/DataBuilder/Processors/Types/ActionProcessor.cs +++ b/Pf2eDataScrapper/Importers/Implementations/Aonprd/DataBuilder/Processors/Types/ActionProcessor.cs @@ -9,22 +9,13 @@ internal class ActionProcessor(AonprdProcessorInput input) : AbstractEntityProce public override Pf2eModel.Model.Structure.Action Object { get; } = new(); - private bool _skipping = false; - - public override void Add() - { - if (!_skipping) - { - Context.Actions.Add(Object); - } - } + public override void Add() => Context.Actions.Add(Object); public override void Process() { if (Input.GetRequired("markdown").StartsWith("**Activate**")) { - _skipping = true; - return; + throw new SkipItemException(Input.GetRequired("name"), "activating action"); } base.Process(); diff --git a/Pf2eDataScrapper/Importers/Implementations/Aonprd/DataBuilder/Processors/Types/RitualProcessor.cs b/Pf2eDataScrapper/Importers/Implementations/Aonprd/DataBuilder/Processors/Types/RitualProcessor.cs index 41ded25..f1d8bc1 100644 --- a/Pf2eDataScrapper/Importers/Implementations/Aonprd/DataBuilder/Processors/Types/RitualProcessor.cs +++ b/Pf2eDataScrapper/Importers/Implementations/Aonprd/DataBuilder/Processors/Types/RitualProcessor.cs @@ -257,7 +257,7 @@ internal partial class RitualProcessor(AonprdProcessorInput input) : AbstractEnt } // Замена символа ссылок - input = StringHelper.MarkdownRegex().Replace(input, "$1[$2]{$3}"); + input = StringHelper.LinkRegex().Replace(input, "$1[$2]{$3}"); input = input.Replace("(", "<").Replace(")", ">").Replace("{", "(").Replace("}", ")"); if (input.EndsWith(';') || input.EndsWith(','))