From d22ca2c7cbeea01300e191b2efa4471a9b6a017c Mon Sep 17 00:00:00 2001 From: Gregoo Date: Fri, 24 Jan 2025 12:04:15 +0100 Subject: [PATCH] Fix RebrickableSet not using url in database for sets --- .env.sample | 4 ---- bricktracker/config.py | 1 - bricktracker/rebrickable_set.py | 7 +------ 3 files changed, 1 insertion(+), 11 deletions(-) diff --git a/.env.sample b/.env.sample index f68281e..27de81a 100644 --- a/.env.sample +++ b/.env.sample @@ -178,10 +178,6 @@ # Default: https://rebrickable.com/parts/{number}/_/{color} # BK_REBRICKABLE_LINK_PART_PATTERN= -# Optional: Pattern of the link to Rebrickable for a set. Will be passed to Python .format() -# Default: https://rebrickable.com/sets/{number} -# BK_REBRICKABLE_LINK_SET_PATTERN= - # Optional: Display Rebrickable links wherever applicable # Default: false # Legacy name: LINKS diff --git a/bricktracker/config.py b/bricktracker/config.py index b531ba8..8cfdbba 100644 --- a/bricktracker/config.py +++ b/bricktracker/config.py @@ -43,7 +43,6 @@ CONFIG: Final[list[dict[str, Any]]] = [ {'n': 'REBRICKABLE_IMAGE_NIL_MINIFIGURE', 'd': 'https://rebrickable.com/static/img/nil_mf.jpg'}, # noqa: E501 {'n': 'REBRICKABLE_LINK_MINIFIGURE_PATTERN', 'd': 'https://rebrickable.com/minifigs/{number}'}, # noqa: E501 {'n': 'REBRICKABLE_LINK_PART_PATTERN', 'd': 'https://rebrickable.com/parts/{number}/_/{color}'}, # noqa: E501 - {'n': 'REBRICKABLE_LINK_SET_PATTERN', 'd': 'https://rebrickable.com/sets/{number}'}, # noqa: E501 {'n': 'REBRICKABLE_LINKS', 'e': 'LINKS', 'c': bool}, {'n': 'REBRICKABLE_PAGE_SIZE', 'd': 100, 'c': int}, {'n': 'RETIRED_SETS_FILE_URL', 'd': 'https://docs.google.com/spreadsheets/d/1rlYfEXtNKxUOZt2Mfv0H17DvK7bj6Pe0CuYwq6ay8WA/gviz/tq?tqx=out:csv&sheet=Sorted%20by%20Retirement%20Date'}, # noqa: E501 diff --git a/bricktracker/rebrickable_set.py b/bricktracker/rebrickable_set.py index 1d3ffb1..37e26b3 100644 --- a/bricktracker/rebrickable_set.py +++ b/bricktracker/rebrickable_set.py @@ -165,12 +165,7 @@ class RebrickableSet(BrickRecord): # Compute the url for the rebrickable page def url_for_rebrickable(self, /) -> str: if current_app.config['REBRICKABLE_LINKS']: - try: - return current_app.config['REBRICKABLE_LINK_SET_PATTERN'].format( # noqa: E501 - number=self.fields.number, - ) - except Exception: - pass + return self.fields.url return ''