bdoap 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a4336121be8b520924050e57400f46e24661e9c9dc4156def8b08802e6eec2e2
-  data.tar.gz: 5011af8aa6f7f7a044786ca134ca8d4cce0bb3ae076409de70cc69a1adf8d6f9
+  metadata.gz: d3741f33638b6173720937040a4345070a3e34dbbbf5605946a331d80e221a11
+  data.tar.gz: a1c0f458b655495ba8a23b92c611346fac20850d7894704f48719ce16d4746e2
 SHA512:
-  metadata.gz: 0b055768a4bad1ebc9b244574d546dd859c4db6f7475d72afd7352d24b3aa9db5a311f6c74b6ce160ae86756ebbbc249df87c8d17b2294bba1a575bec8b6e96d
-  data.tar.gz: f5537518eebae1c5f62d63d9daaa0b2ee29d1570940a165e0c7dcee1b033ed728909f6f7f3940edc51d5dc00672363f8639adb8f8a64780ecc3ed9706716ffa5
+  metadata.gz: 97061a30ef4e2b951d6ee26eabb51e28ba1170fa4208d0a3d1507ca3c29956fd0ac871e712df2bd06d4af480026203ae49b06109b1c335608631f6212dbad550
+  data.tar.gz: 00a37e50db4bb906d4a90c749e0614a37fc1f8216075c5dd5f6a6d8c8283ccffd5295b27380c0d159008ca978c4d2bce0348c3c2f7607342bdf7a82f5516db69

data/lib/bdo_alchemy_profits.rb

@@ -58,6 +58,13 @@ module BDOAP
 
       return unless resolved
 
+      level_map_to_bdo = {
+        0 => 0, 1 => 1, 2 => 2, 3 => 3, 4 => 4, 5 => 5,
+        6 => 6, 7 => 7, 8 => 8, 9 => 9, 10 => 10, 11 => 11,
+        12 => 12, 13 => 13, 14 => 14, 15 => 15,
+        16 => 'PRI', 17 => 'DUO', 18 => 'TRI', 19 => 'TET', 20 => 'PEN',
+      }.freeze
+
       resolved.each do |item|
         subdata = HTTParty.post(
           URI(sub_url),
@@ -69,55 +76,7 @@ module BDOAP
         sleep rand
 
         if subdata&.dig('detailList')
-          level_map = {
-            0 => 0,
-            1 => 1,
-            2 => 2,
-            3 => 3,
-            4 => 4,
-            5 => 5,
-            6 => 6,
-            7 => 7,
-            8 => 8,
-            9 => 9,
-            10 => 10,
-            11 => 11,
-            12 => 12,
-            13 => 13,
-            14 => 14,
-            15 => 15,
-            16 => 16,
-            17 => 17,
-            18 => 18,
-            19 => 19,
-            20 => 20,
-          }
-
-          level_map_to_bdo = {
-            0 => 0,
-            1 => 1,
-            2 => 2,
-            3 => 3,
-            4 => 4,
-            5 => 5,
-            6 => 6,
-            7 => 7,
-            8 => 8,
-            9 => 9,
-            10 => 10,
-            11 => 11,
-            12 => 12,
-            13 => 13,
-            14 => 14,
-            15 => 15,
-            16 => 'PRI',
-            17 => 'DUO',
-            18 => 'TRI',
-            19 => 'TET',
-            20 => 'PEN',
-          }
-
-          result = subdata['detailList'] .find { |e| e['subKey'].to_s == level_map[enhance_starting_level.to_i].to_s }
+          result = subdata['detailList'].find { |e| e['subKey'].to_s == enhance_starting_level.to_s }
           if result
             constructed = "    #{result['count']} #{cli.yellow result['name'].downcase} @ #{level_map_to_bdo[result['subKey']]}"
             items_at_level.push constructed unless result['count'].to_i == 0
@@ -184,11 +143,10 @@ module BDOAP
 
         recipe_prices = market_searcher.get_all_recipe_prices item_codex_data, category
 
-        mapped_prices = recipe_prices.reverse.sort_by { |recipe| recipe[:gain].to_i }.map { |recipe| recipe[:information] }
+        mapped_prices = recipe_prices.sort_by { |recipe| recipe[:gain].to_i }.map { |recipe| recipe[:information] }
 
         out_of_stock = recipe_prices.dig(0, :out_of_stock) || []
-        out_of_stock_list = ""
-        out_of_stock.each { |item| out_of_stock_list += "\n\t  #{cli.yellow item}" }
+        out_of_stock_list = out_of_stock.map { |item| "\n\t  #{cli.yellow item}" }.join
 
         if mapped_prices.length > 0
           cli.vipiko_overwrite "done!"

data/lib/bdo_codex/bdo_codex_searcher.rb

@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: true
 
 require 'json'
 require 'httparty'
@@ -46,6 +46,14 @@ class BDOCodexSearcher
     @hyper_aggressive = hyper_aggressive
   end
 
+  def log_error(error, message = nil)
+    puts @cli.red(message) if message
+    File.open(ENVData::ERROR_LOG, 'a+') do |file|
+      file.write(error&.full_message || error.to_s)
+      file.write("\n\r")
+    end
+  end
+
   def get_recipe_url(url, item_name)
     begin
       data = HTTParty.get(
@@ -66,9 +74,8 @@ class BDOCodexSearcher
     all_recipe_substitutions = []
     all_potion_recipes.each do |recipe|
       original_recipe = recipe[RECIPE_INGREDIENTS_INDEX]
-      original_ingredient_indices = original_recipe.map do |item|
-        recipe_with_substitute_ids.find_index { |id| id == item[:id] }
-      end
+      sub_id_index = recipe_with_substitute_ids.each_with_index.to_h { |id, i| [id, i] }
+      original_ingredient_indices = original_recipe.map { |item| sub_id_index[item[:id]] }
 
       chunked_by_substitution_groups = []
 
@@ -197,13 +204,7 @@ class BDOCodexSearcher
         parsed
       end
     rescue StandardError => error
-      puts @cli.red("if you're not messing with the code, you should never see this. get_item_recipes broke.")
-
-      File.open(ENVData::ERROR_LOG, 'a+') do |file|
-        file.write(error.full_message)
-        file.write("\n\r")
-      end
-
+      log_error error, "if you're not messing with the code, you should never see this. get_item_recipes broke."
       []
     end
   end
@@ -267,9 +268,7 @@ class BDOCodexSearcher
     # newline because vipiko is about to start carriage returning
     puts "\n"
     item_list.each.with_index do |item_hash, index|
-      item = item_hash.transform_keys { |key|
-        key.gsub(/(.)([A-Z])/,'\1_\2').downcase.to_sym
-      }
+      item = item_hash.transform_keys { |key| Utils.snake_sym(key) }
 
       next unless item[:main_key]
 
@@ -302,13 +301,7 @@ class BDOCodexSearcher
           recipes.push recipe_hash
         end
       rescue StandardError => error
-        puts @cli.red("if you're not messing with the code, you should never see this. get_item_codex_data broke.")
-
-        File.open(ENVData::ERROR_LOG, 'a+') do |file|
-          file.write(error.full_message)
-          file.write("\n\r")
-        end
-
+        log_error error, "if you're not messing with the code, you should never see this. get_item_codex_data broke."
         next
       end
     end

data/lib/central_market/market_searcher.rb

@@ -30,17 +30,30 @@ class MarketSearcher
     @out_of_stock_items = []
   end
 
+  def market_post(url, body)
+    HTTParty.post(
+      URI(url),
+      headers: ENVData.get_central_market_headers(ENVData.get_incap_cookie(@region_subdomain)),
+      body: body,
+      content_type: 'application/x-www-form-urlencoded'
+    )
+  end
+
+  # DRY helper: log an error message to the CLI and append to the error log file
+  def log_error(error, message = nil)
+    puts @cli.red(message) if message
+    File.open(ENVData::ERROR_LOG, 'a+') do |file|
+      file.write(error&.full_message || error.to_s)
+      file.write("\n\r")
+    end
+  end
+
   def get_alchemy_market_data(category)
     construct_item_data(category, category == 'all')
   end
 
   def get_price_data(elem)
-    data = HTTParty.post(
-      URI(@market_sub_url),
-      headers: ENVData.get_central_market_headers(ENVData.get_incap_cookie(@region_subdomain)),
-      body: "#{ENVData::RVT}&mainKey=#{elem['mainKey']}&usingCleint=0",
-      content_type: 'application/x-www-form-urlencoded'
-    )
+    data = market_post(@market_sub_url, "#{ENVData::RVT}&mainKey=#{elem['mainKey']}&usingCleint=0")
 
     sleep 1
 
@@ -58,9 +71,7 @@ class MarketSearcher
   def construct_item_data(subcategory, all_subcategories)
     aggregate = aggregate_category_data(@market_list_url, @market_search_url, subcategory, all_subcategories)
 
-    filtered_aggregate = aggregate.filter do |elem|
-      elem != nil
-    end
+    filtered_aggregate = aggregate.compact
 
     # TODO: this is probably not a smart way to do this type of retry logic
     puts
@@ -78,13 +89,7 @@ class MarketSearcher
         begin
           get_price_data elem
         rescue StandardError => error
-          puts @cli.red("this could be a network failure. construct_item_data broke.")
-
-          File.open(ENVData::ERROR_LOG, 'a+') do |file|
-            file.write(error.full_message)
-            file.write("\n\r")
-          end
-
+          log_error error, "this could be a network failure. construct_item_data broke."
           []
         end
       end
@@ -92,9 +97,7 @@ class MarketSearcher
 
     puts "\n\n" unless mapped_aggregate.empty?
 
-    mapped_aggregate.sort do |a, b|
-      b['pricePerOne'] - a['pricePerOne']
-    end
+    mapped_aggregate.sort_by { |a| -a['pricePerOne'] }
   end
 
   def aggregate_category_data(url, search_url, subcategory, all_subcategories)
@@ -111,24 +114,13 @@ class MarketSearcher
     category_search_options(url, search_url).each do |category_opts|
       do_if_category_matches(make_match_options.call(category_opts[:name])) do
         begin
-          data = HTTParty.post(
-            URI(category_opts[:url]),
-            headers: ENVData.get_central_market_headers(ENVData.get_incap_cookie(@region_subdomain)),
-            body: category_opts[:query_string],
-            content_type: 'application/x-www-form-urlencoded'
-          )
+          data = market_post(category_opts[:url], category_opts[:query_string])
 
           sleep 1
 
           aggregate_response.push category_opts[:update].call(data) if data
         rescue StandardError => error
-          puts @cli.red("this could be a network failure. aggregate_category_data broke.")
-
-          File.open(ENVData::ERROR_LOG, 'a+') do |file|
-            file.write(error.full_message)
-            file.write("\n\r")
-          end
-
+          log_error error, "this could be a network failure. aggregate_category_data broke."
           []
         end
       end
@@ -147,22 +139,12 @@ class MarketSearcher
       ingredient_data = {}
 
       begin
-        ingredient_data = HTTParty.post(
-          URI(@market_sub_url),
-          headers: ENVData.get_central_market_headers(ENVData.get_incap_cookie(@region_subdomain)),
-          body: "#{ENVData::RVT}&mainKey=#{ingredient_id}&usingCleint=0",
-          content_type: 'application/x-www-form-urlencoded'
-        )
+        ingredient_data = market_post(@market_sub_url, "#{ENVData::RVT}&mainKey=#{ingredient_id}&usingCleint=0")
 
         sleep rand
       rescue StandardError => error
-        puts @cli.red("this could be a network failure. get_item_price_info broke.")
-
-        File.open(ENVData::ERROR_LOG, 'a+') do |file|
-          file.write(error.full_message)
-          file.write("\n\r")
+        log_error error, "this could be a network failure. get_item_price_info broke."
         ingredient_data = {}
-        end
       end
 
       # TODO: actually implement a normal way of handling malformed results
@@ -178,31 +160,19 @@ class MarketSearcher
           detailed_price_list = {}
 
           begin
-            detailed_price_list = HTTParty.post(
-              URI(@market_sell_buy_url),
-              headers: ENVData.get_central_market_headers(ENVData.get_incap_cookie(@region_subdomain)),
-              body: body_string,
-              content_type: 'application/x-www-form-urlencoded'
-            )
+            detailed_price_list = market_post(@market_sell_buy_url, body_string)
 
             detailed_price_list = {} if detailed_price_list.to_s.downcase.include? 'incapsula incident'
 
             sleep rand
           rescue StandardError => error
-            puts @cli.red("this could be a network failure. get_item_price_info broke.")
-
-            File.open(ENVData::ERROR_LOG, 'a+') do |file|
-              file.write(error&.full_message || error)
-              file.write("\n\r")
-              detailed_price_list = {}
-            end
+            log_error error, "this could be a network failure. get_item_price_info broke."
+            detailed_price_list = {}
           end
 
-          optimal_prices = detailed_price_list&.dig('marketConditionList')&.sort do |a, b|
-            b['sellCount'] - a['sellCount']
-          end
+          optimal_prices = detailed_price_list&.dig('marketConditionList')&.sort_by { |p| -p['sellCount'] }
 
-          total_stock = optimal_prices.to_a.map { |price| price["sellCount"] }.sum
+          total_stock = optimal_prices.to_a.sum { |price| price["sellCount"] }
 
           optimal_price = optimal_prices.to_a.first
 
@@ -235,12 +205,10 @@ class MarketSearcher
         potential_recipe = []
 
         recipe.each.with_index do |ingredient, ing_index|
-          ingredient_id = ingredient['id'] ? ingredient['id'] : ingredient[:id]
-          quant = ingredient['quant'] ? ingredient['quant'] : ingredient[:quant]
-          enhance_level = ingredient['enhance_level'] ? ingredient['enhance_level'] : ingredient[:enhance_level]
-          is_m_recipe = ingredient['is_m_recipe'] ? ingredient['is_m_recipe'] : ingredient[:is_m_recipe]
-          quant = 1 if quant.nil?
-          enhance_level = 0 if enhance_level.nil?
+          ingredient_id = ingredient['id']           || ingredient[:id]
+          quant         = ingredient['quant']        || ingredient[:quant]         || 1
+          enhance_level = ingredient['enhance_level']|| ingredient[:enhance_level] || 0
+          is_m_recipe   = ingredient['is_m_recipe']  || ingredient[:is_m_recipe]
 
           if @ingredient_cache[ingredient_id] && EXCHANGE_ITEMS[ingredient_id].nil? == true
             cached_ingredient = { **@ingredient_cache[ingredient_id], quant: quant, for_recipe_id: recipe_id, is_m_recipe: is_m_recipe }
@@ -259,9 +227,7 @@ class MarketSearcher
             item_price_info_hash = exchange_info
           end
 
-          item_price_info = item_price_info_hash.transform_keys { |key|
-            key.to_s.gsub(/(.)([A-Z])/,'\1_\2').downcase.to_sym
-          }
+          item_price_info = item_price_info_hash.transform_keys { |key| Utils.snake_sym(key) }
 
           # gathering out of stock items to show to the user
           stock_string = "#{quant}x [#{item_price_info[:main_key]}] #{item_price_info[:name].downcase}"
@@ -314,7 +280,7 @@ class MarketSearcher
       mapped_recipe_prices.push map_recipe_prices(potential_recipes, item_with_recipe, subcategory)
     end
 
-    mapped_recipe_prices.filter { |e| !e.nil? && !!e }
+    mapped_recipe_prices.compact
   end
 
   def map_recipe_prices(potential_recipes, item, category)
@@ -370,7 +336,7 @@ class MarketSearcher
     # are some seriously mysterious alchemy recipes out there...
     ingredients_already_appeared = []
     filtered_selected_recipe = selected_recipe.filter do |ingredient|
-      return false if ingredients_already_appeared.include? ingredient[:name]
+      next false if ingredients_already_appeared.include? ingredient[:name]
       ingredients_already_appeared.push(ingredient[:name])
       true
     end
@@ -383,12 +349,7 @@ class MarketSearcher
 
     body_string = "#{ENVData::RVT}&mainKey=#{item[:id]}&subKey=0&chooseKey=0&isUp=true&keyType=0&name=#{URI.encode_www_form_component(item[:name])}"
 
-    item_price_data = HTTParty.post(
-      URI(@market_sell_buy_url),
-      headers: ENVData.get_central_market_headers(ENVData.get_incap_cookie(@region_subdomain)),
-      body: body_string,
-      content_type: 'application/x-www-form-urlencoded'
-    )
+    item_price_data = market_post(@market_sell_buy_url, body_string)
 
     item_price_data = {} if item_price_data.to_s.downcase.include? 'incapsula incident'
 
@@ -449,7 +410,6 @@ class MarketSearcher
   end
 
   def do_if_category_matches(options, &procedure)
-    procedure.call if options[:all_subcategories]
-    procedure.call if options[:subcategory] == options[:subcat_to_match]
+    procedure.call if options[:all_subcategories] || (options[:subcategory] == options[:subcat_to_match])
   end
 end

data/lib/utils/array_utils.rb

@@ -18,4 +18,8 @@ module Utils
       make_permutations input, limit
     end
   end
+
+  def self.snake_sym(key)
+    key.to_s.gsub(/(.)([A-Z])/, '\1_\2').downcase.to_sym
+  end
 end

data/lib/utils/hash_cache.rb

@@ -23,12 +23,8 @@ module Utils
     end
 
     def write(data)
-      item_map = read_all
-      File.open(@cache_file, 'w') do |file|
-        new_data = { **item_map, **data }
-
-        file.write new_data.to_json
-      end
+      @all_content.merge!(data)
+      File.write(@cache_file, @all_content.to_json)
     end
   end
 end

data/lib/utils/npc_item_index.rb

@@ -75,7 +75,7 @@ module Utils
     },
       7304 => {
       name: 'Strawberry',
-      id: 9008,
+      id: 7304,
       price: 700,
       price_per_one: 700,
       count: Float::INFINITY,
@@ -472,7 +472,7 @@ module Utils
       is_npc_item: true,
       npc_type: 'general goods',
       main_category: 25,
-      sub_category_: 8,
+      sub_category: 8,
     },
       517 => {
       name: 'HP Potion (Small)',
@@ -483,29 +483,29 @@ module Utils
       is_npc_item: true,
       npc_type: 'general goods',
       main_category: 35,
-      sub_category_: 5,
+      sub_category: 5,
     },
       521 => {
       name: 'HP Potion (Medium)',
-      id: 517,
+      id: 521,
       price: 200,
       price_per_one: 200,
       count: Float::INFINITY,
       is_npc_item: true,
       npc_type: 'general goods',
       main_category: 35,
-      sub_category_: 5,
+      sub_category: 5,
     },
       519 => {
       name: 'HP Potion (Large)',
-      id: 517,
+      id: 519,
       price: 500,
       price_per_one: 500,
       count: Float::INFINITY,
       is_npc_item: true,
       npc_type: 'general goods',
       main_category: 35,
-      sub_category_: 5,
+      sub_category: 5,
     },
       524 => {
       name: 'HP Potion (Extra Large)',
@@ -516,7 +516,7 @@ module Utils
       is_npc_item: true,
       npc_type: 'general goods',
       main_category: 35,
-      sub_category_: 5,
+      sub_category: 5,
     },
       520 => {
       name: 'MP Potion (Small)',
@@ -527,7 +527,7 @@ module Utils
       is_npc_item: true,
       npc_type: 'general goods',
       main_category: 35,
-      sub_category_: 5,
+      sub_category: 5,
     },
       522 => {
       name: 'MP Potion (Large)',

data/lib/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module BDOAP
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: bdoap
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - jpegzilla
 bindir: bin
 cert_chain: []
-date: 2025-04-21 00:00:00.000000000 Z
+date: 2026-09-27 00:00:00.000000000 Z
 dependencies: []
 description: this script allows you to find alchemy recipes from bdocodex.com, compare
   them with live central market prices, and use that information to determine what
@@ -50,7 +50,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.7
+rubygems_version: 3.6.9
 specification_version: 4
 summary: this is a tool used to aggregate price and profit data for black desert alchemists.
 test_files: []