Merge pull request #774 from argonui/arkham-build-support

Added arkham.build support
2024-07-28 22:18:11 +02:00 · 2024-07-28 22:18:11 +02:00 · 62d9671864
commit 62d9671864
parent ecfab0de30 1571e62abf
3 changed files with 92 additions and 87 deletions
--- a/src/arkhamdb/ArkhamDb.ttslua
+++ b/src/arkhamdb/ArkhamDb.ttslua
@ -69,6 +69,11 @@ do
      deckId
    }

+    -- use secondary api (arkham.build) if deckid is too long
+    if string.len(deckId) == 15 then
+      deckUri = { configuration.api_uri2, deckId }
+    end
+
    local deck = Request.start(deckUri, function(status)
      if string.find(status.text, "<!DOCTYPE html>") then
        internal.maybePrint("Private deck ID " .. deckId .. " is not shared.", playerColor)
@ -94,7 +99,7 @@ do
  ---@param cardId string ArkhamDB ID of the card that could not be found
  ---@param playerColor string Color of the player's deck that had the problem
  ArkhamDb.logCardNotFound = function(cardId, playerColor)
-    local request = Request.start({
+    Request.start({
        configuration.api_uri,
        configuration.cards,
        cardId
@ -534,8 +539,7 @@ do
      if self.is_successful then
        callback(self.content, table.unpack(arguments))
      end
-    end, function() return self.is_done
-    end)
+    end, function() return self.is_done end)
  end

  return ArkhamDb
--- a/src/arkhamdb/Configuration.ttslua
+++ b/src/arkhamdb/Configuration.ttslua
@ -1,9 +1,9 @@
 ---@type table Contains fields used by the deck importer
 configuration = {
    api_uri = "https://arkhamdb.com/api/public",
+    api_uri2 = "https://api.arkham.build/v1/public/share",
    public_deck = "decklist",
    private_deck = "deck",
    cards = "card",
-    taboo = "taboos",
-    card_bag_guid = "15bb07"
+    taboo = "taboos"
 }
--- a/src/arkhamdb/DeckImporter.ttslua
+++ b/src/arkhamdb/DeckImporter.ttslua
@ -84,85 +84,85 @@ end

 function makeOptionToggles()
  -- common parameters
-  local checkbox_parameters = {}
-  checkbox_parameters.function_owner = self
-  checkbox_parameters.width = INPUT_FIELD_WIDTH
-  checkbox_parameters.height = INPUT_FIELD_HEIGHT
-  checkbox_parameters.scale = { 0.1, 0.1, 0.1 }
-  checkbox_parameters.font_size = 240
-  checkbox_parameters.hover_color = { 0.4, 0.6, 0.8 }
-  checkbox_parameters.color = FIELD_COLOR
+  local checkboxParameters = {}
+  checkboxParameters.function_owner = self
+  checkboxParameters.width = INPUT_FIELD_WIDTH
+  checkboxParameters.height = INPUT_FIELD_HEIGHT
+  checkboxParameters.scale = { 0.1, 0.1, 0.1 }
+  checkboxParameters.font_size = 240
+  checkboxParameters.hover_color = { 0.4, 0.6, 0.8 }
+  checkboxParameters.color = FIELD_COLOR

  -- public / private deck
-  checkbox_parameters.click_function = "publicPrivateChanged"
-  checkbox_parameters.position = { 0.25, 0.1, -0.102 }
-  checkbox_parameters.tooltip = "Published or private deck?\n\nPLEASE USE A PRIVATE DECK IF JUST FOR TTS TO AVOID FLOODING ARKHAMDB PUBLISHED DECK LISTS!"
-  checkbox_parameters.label = PRIVATE_TOGGLE_LABELS[privateDeck]
-  self.createButton(checkbox_parameters)
+  checkboxParameters.click_function = "publicPrivateChanged"
+  checkboxParameters.position = { 0.25, 0.1, -0.102 }
+  checkboxParameters.tooltip = "Published or private deck?\n\nPLEASE USE A PRIVATE DECK IF JUST FOR TTS TO AVOID FLOODING ARKHAMDB PUBLISHED DECK LISTS!"
+  checkboxParameters.label = PRIVATE_TOGGLE_LABELS[privateDeck]
+  self.createButton(checkboxParameters)

  -- load upgraded?
-  checkbox_parameters.click_function = "loadUpgradedChanged"
-  checkbox_parameters.position = { 0.25, 0.1, -0.01 }
-  checkbox_parameters.tooltip = "Load newest upgrade or exact deck?"
-  checkbox_parameters.label = UPGRADED_TOGGLE_LABELS[loadNewestDeck]
-  self.createButton(checkbox_parameters)
+  checkboxParameters.click_function = "loadUpgradedChanged"
+  checkboxParameters.position = { 0.25, 0.1, -0.01 }
+  checkboxParameters.tooltip = "Load newest upgrade or exact deck?"
+  checkboxParameters.label = UPGRADED_TOGGLE_LABELS[loadNewestDeck]
+  self.createButton(checkboxParameters)

  -- load investigators?
-  checkbox_parameters.click_function = "loadInvestigatorsChanged"
-  checkbox_parameters.position = { 0.25, 0.1, 0.081 }
-  checkbox_parameters.tooltip = "Spawn investigator cards?"
-  checkbox_parameters.label = LOAD_INVESTIGATOR_TOGGLE_LABELS[loadInvestigators]
-  self.createButton(checkbox_parameters)
+  checkboxParameters.click_function = "loadInvestigatorsChanged"
+  checkboxParameters.position = { 0.25, 0.1, 0.081 }
+  checkboxParameters.tooltip = "Spawn investigator cards?"
+  checkboxParameters.label = LOAD_INVESTIGATOR_TOGGLE_LABELS[loadInvestigators]
+  self.createButton(checkboxParameters)
 end

 -- Create the four deck ID entry fields
 function makeDeckIdFields()
-  local input_parameters = {}
+  local inputParameters = {}
  -- Parameters common to all entry fields
-  input_parameters.function_owner = self
-  input_parameters.scale = { 0.1, 0.1, 0.1 }
-  input_parameters.width = INPUT_FIELD_WIDTH
-  input_parameters.height = INPUT_FIELD_HEIGHT
-  input_parameters.font_size = 320
-  input_parameters.tooltip = "Deck ID from ArkhamDB URL of the deck\nPublic URL: 'https://arkhamdb.com/decklist/view/101/knowledge-overwhelming-solo-deck-1.0' = '101'\nPrivate URL: 'https://arkhamdb.com/deck/view/102' = '102'"
-  input_parameters.alignment = 3 -- Center
-  input_parameters.color = FIELD_COLOR
-  input_parameters.font_color = { 0, 0, 0 }
-  input_parameters.validation = 2 -- Integer
+  inputParameters.function_owner = self
+  inputParameters.scale = { 0.1, 0.1, 0.1 }
+  inputParameters.width = INPUT_FIELD_WIDTH
+  inputParameters.height = INPUT_FIELD_HEIGHT
+  inputParameters.font_size = 320
+  inputParameters.tooltip = "Deck ID from ArkhamDB URL of the deck\nPublic URL: 'https://arkhamdb.com/decklist/view/101/knowledge-overwhelming-solo-deck-1.0' = '101'\nPrivate URL: 'https://arkhamdb.com/deck/view/102' = '102'\n\nAlso supports the deck ID from shared decks from arkham.build!"
+  inputParameters.alignment = 3 -- Center
+  inputParameters.color = FIELD_COLOR
+  inputParameters.font_color = { 0, 0, 0 }
+  inputParameters.validation = 4 -- alphanumeric (to support arkham.build IDs)

  -- Green
-  input_parameters.input_function = "greenDeckChanged"
-  input_parameters.position = { -0.166, 0.1, 0.385 }
-  input_parameters.value = greenDeckId
-  self.createInput(input_parameters)
+  inputParameters.input_function = "greenDeckChanged"
+  inputParameters.position = { -0.166, 0.1, 0.385 }
+  inputParameters.value = greenDeckId
+  self.createInput(inputParameters)
  -- Red
-  input_parameters.input_function = "redDeckChanged"
-  input_parameters.position = { 0.171, 0.1, 0.385 }
-  input_parameters.value = redDeckId
-  self.createInput(input_parameters)
+  inputParameters.input_function = "redDeckChanged"
+  inputParameters.position = { 0.171, 0.1, 0.385 }
+  inputParameters.value = redDeckId
+  self.createInput(inputParameters)
  -- White
-  input_parameters.input_function = "whiteDeckChanged"
-  input_parameters.position = { -0.166, 0.1, 0.474 }
-  input_parameters.value = whiteDeckId
-  self.createInput(input_parameters)
+  inputParameters.input_function = "whiteDeckChanged"
+  inputParameters.position = { -0.166, 0.1, 0.474 }
+  inputParameters.value = whiteDeckId
+  self.createInput(inputParameters)
  -- Orange
-  input_parameters.input_function = "orangeDeckChanged"
-  input_parameters.position = { 0.171, 0.1, 0.474 }
-  input_parameters.value = orangeDeckId
-  self.createInput(input_parameters)
+  inputParameters.input_function = "orangeDeckChanged"
+  inputParameters.position = { 0.171, 0.1, 0.474 }
+  inputParameters.value = orangeDeckId
+  self.createInput(inputParameters)
 end

 -- Create the Build All button. This is a transparent button which covers the Build All portion of the background graphic
 function makeBuildButton()
-  local button_parameters = {}
-  button_parameters.click_function = "loadDecks"
-  button_parameters.function_owner = self
-  button_parameters.position = { 0, 0.1, 0.71 }
-  button_parameters.width = 320
-  button_parameters.height = 30
-  button_parameters.color = { 0, 0, 0, 0 }
-  button_parameters.tooltip = "Click to build all four decks!"
-  self.createButton(button_parameters)
+  local buttonParameters = {}
+  buttonParameters.click_function = "loadDecks"
+  buttonParameters.function_owner = self
+  buttonParameters.position = { 0, 0.1, 0.71 }
+  buttonParameters.width = 320
+  buttonParameters.height = 30
+  buttonParameters.color = { 0, 0, 0, 0 }
+  buttonParameters.tooltip = "Click to build all four decks!"
+  self.createButton(buttonParameters)
 end

 -- Event handlers for deck ID change
@ -174,17 +174,17 @@ function greenDeckChanged(_, _, inputValue) greenDeckId = inputValue end
 -- Event handlers for toggle buttons
 function publicPrivateChanged()
  privateDeck = not privateDeck
-  self.editButton { index = 0, label = PRIVATE_TOGGLE_LABELS[privateDeck] }
+  self.editButton({ index = 0, label = PRIVATE_TOGGLE_LABELS[privateDeck] })
 end

 function loadUpgradedChanged()
  loadNewestDeck = not loadNewestDeck
-  self.editButton { index = 1, label = UPGRADED_TOGGLE_LABELS[loadNewestDeck] }
+  self.editButton({ index = 1, label = UPGRADED_TOGGLE_LABELS[loadNewestDeck] })
 end

 function loadInvestigatorsChanged()
  loadInvestigators = not loadInvestigators
-  self.editButton { index = 2, label = LOAD_INVESTIGATOR_TOGGLE_LABELS[loadInvestigators] }
+  self.editButton({ index = 2, label = LOAD_INVESTIGATOR_TOGGLE_LABELS[loadInvestigators] })
 end

 function loadDecks()
@ -556,6 +556,7 @@ function handleHunchDeck(investigatorId, cardList, bondedList, playerColor)
      table.insert(insightList, i)
    end
  end
+
  -- Process cards to move them to the hunch deck. This is done in reverse order because the sorting needs
  -- to be reversed (deck sorts for face down). Performance here may be an issue, as table.remove() is an O(n)
  -- operation which makes the full shift O(n^2). But keep it simple unless it becomes a problem