From 6119dac972860ae84318668eed2afe91268220d9 Mon Sep 17 00:00:00 2001 From: Ati1707 <152104750+Ati1707@users.noreply.github.com> Date: Thu, 26 Dec 2024 02:34:32 +0100 Subject: [PATCH 1/3] remove canBeVaalGem statement --- src/Sidekick.Apis.Poe/Parser/Metadata/MetadataParser.cs | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/Sidekick.Apis.Poe/Parser/Metadata/MetadataParser.cs b/src/Sidekick.Apis.Poe/Parser/Metadata/MetadataParser.cs index bb0f6902..004bbede 100644 --- a/src/Sidekick.Apis.Poe/Parser/Metadata/MetadataParser.cs +++ b/src/Sidekick.Apis.Poe/Parser/Metadata/MetadataParser.cs @@ -52,12 +52,6 @@ public Task Initialize() var itemRarity = headerParser.ParseRarity(parsingItem); - var canBeVaalGem = itemRarity == Rarity.Gem && parsingItem.Blocks.Count > 7; - if (canBeVaalGem && data.NameAndTypeDictionary.TryGetValue(parsingItem.Blocks[5].Lines[0].Text, out var vaalGem)) - { - return vaalGem.First(); - } - // Get name and type text string? name = null; string? type = null; From e89de37f2470483c6753ae7865f694553eecc549 Mon Sep 17 00:00:00 2001 From: Ati1707 <152104750+Ati1707@users.noreply.github.com> Date: Thu, 26 Dec 2024 11:58:32 +0100 Subject: [PATCH 2/3] revert changes and check if block lines exist --- .../Parser/Metadata/MetadataParser.cs | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/Sidekick.Apis.Poe/Parser/Metadata/MetadataParser.cs b/src/Sidekick.Apis.Poe/Parser/Metadata/MetadataParser.cs index 004bbede..6db2fa6c 100644 --- a/src/Sidekick.Apis.Poe/Parser/Metadata/MetadataParser.cs +++ b/src/Sidekick.Apis.Poe/Parser/Metadata/MetadataParser.cs @@ -51,6 +51,16 @@ public Task Initialize() parsingBlock.Parsed = true; var itemRarity = headerParser.ParseRarity(parsingItem); + + var canBeVaalGem = itemRarity == Rarity.Gem && parsingItem.Blocks.Count > 7; + if (parsingItem.Blocks[5].Lines.Count > 0 && canBeVaalGem) + { + data.NameAndTypeDictionary.TryGetValue(parsingItem.Blocks[5].Lines[0].Text, value: out var vaalGem); + if (vaalGem != null) + { + return vaalGem.First(); + } + } // Get name and type text string? name = null; From f63167ca2dbd35042e3fdff82002370552d7287b Mon Sep 17 00:00:00 2001 From: Ati1707 <152104750+Ati1707@users.noreply.github.com> Date: Thu, 26 Dec 2024 12:25:06 +0100 Subject: [PATCH 3/3] fix if statement order --- src/Sidekick.Apis.Poe/Parser/Metadata/MetadataParser.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Sidekick.Apis.Poe/Parser/Metadata/MetadataParser.cs b/src/Sidekick.Apis.Poe/Parser/Metadata/MetadataParser.cs index 6db2fa6c..9b7e8cf3 100644 --- a/src/Sidekick.Apis.Poe/Parser/Metadata/MetadataParser.cs +++ b/src/Sidekick.Apis.Poe/Parser/Metadata/MetadataParser.cs @@ -53,9 +53,9 @@ public Task Initialize() var itemRarity = headerParser.ParseRarity(parsingItem); var canBeVaalGem = itemRarity == Rarity.Gem && parsingItem.Blocks.Count > 7; - if (parsingItem.Blocks[5].Lines.Count > 0 && canBeVaalGem) + if (canBeVaalGem && parsingItem.Blocks[5].Lines.Count > 0) { - data.NameAndTypeDictionary.TryGetValue(parsingItem.Blocks[5].Lines[0].Text, value: out var vaalGem); + data.NameAndTypeDictionary.TryGetValue(parsingItem.Blocks[5].Lines[0].Text, out var vaalGem); if (vaalGem != null) { return vaalGem.First();