.dockerignore

@@ -19,8 +19,6 @@ LICENSE
 
 # Database
 *.db
-*.db-shm
-*.db-wal
 
 # Python
 **/__pycache__

.env.sample

@@ -4,13 +4,13 @@
 # see the schema and the column names. Some fields are compound and not visible
 # directly from the schema (joins). You can check the query in the */list.sql files
 # in the source to see all column names.
-# The usual syntax for those variables is "<table>"."<column>" [ASC|DESC].
+# The usual syntax for those variables is <table>.<column> [ASC|DESC].
 # For composite fields (CASE, SUM, COUNT) the syntax is <field>, there is no <table> name.
 # For instance:
-# - "table"."name" (by "table"."name", default order)
+# - table.name (by table.name, default order)
-# - "table"."name" ASC (by "table"."name", ascending)
+# - table.name ASC (by table.name, ascending)
-# - "table"."name" DESC (by "table"."name", descending)
+# - table.name DESC (by table.name, descending)
-# - "field" (by "field", default order)
+# - field (by field, default order)
 # - ...
 # You can combine the ordering options.
 # You can use the special column name 'rowid' to order by insertion order.
@@ -117,10 +117,10 @@
 
 # Optional: Change the default order of minifigures. By default ordered by insertion order.
 # Useful column names for this option are:
-# - "minifigures"."fig_num": minifigure ID (fig-xxxxx)
+# - minifigures.fig_num: minifigure ID (fig-xxxxx)
-# - "minifigures"."name": minifigure name
+# - minifigures.name: minifigure name
-# Default: "minifigures"."name" ASC
+# Default: minifigures.name ASC
-# BK_MINIFIGURES_DEFAULT_ORDER="minifigures"."name" ASC
+# BK_MINIFIGURES_DEFAULT_ORDER=minifigures.name ASC
 
 # Optional: Folder where to store the minifigures images, relative to the '/app/static/' folder
 # Default: minifigs
@@ -134,13 +134,12 @@
 
 # Optional: Change the default order of parts. By default ordered by insertion order.
 # Useful column names for this option are:
-# - "inventory"."part_num": part number
+# - inventory.part_num: part number
-# - "inventory"."name": part name
+# - inventory.name: part name
-# - "inventory"."color_name": part color name
+# - inventory.color_name: par color name
-# - "inventory"."is_spare": par is a spare part
+# - total_missing: number of missing parts
-# - "total_missing": number of missing parts
+# Default: inventory.name ASC, inventory.color_name ASC, is_spare ASC
-# Default: "inventory"."name" ASC, "inventory"."color_name" ASC, "inventory"."is_spare" ASC
+# BK_PARTS_DEFAULT_ORDER=total_missing DESC, inventory.name ASC
-# BK_PARTS_DEFAULT_ORDER="total_missing" DESC, "inventory"."name" ASC
 
 # Optional: Folder where to store the parts images, relative to the '/app/static/' folder
 # Default: parts
@@ -178,6 +177,10 @@
 # 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
@@ -198,16 +201,16 @@
 
 # Optional: Change the default order of sets. By default ordered by insertion order.
 # Useful column names for this option are:
-# - "rebrickable_sets"."set": set number as a string
+# - sets.set_num: set number as a string
-# - "rebrickable_sets"."number": the number part of set as an integer
+# - sets.name: set name
-# - "rebrickable_sets"."version": the version part of set as an integer
+# - sets.year: set release year
-# - "rebrickable_sets"."name": set name
+# - sets.num_parts: set number of parts
-# - "rebrickable_sets"."year": set release year
+# - set_number: the number part of set_num as an integer
-# - "rebrickable_sets"."number_of_parts": set number of parts
+# - set_version: the version part of set_num as an integer
-# - "total_missing": number of missing parts
+# - total_missing: number of missing parts
-# - "total_minifigures": number of minifigures
+# - total_minifigures: number of minifigures
-# Default: "rebrickable_sets"."number" DESC, "rebrickable_sets"."version" ASC
+# Default: set_number DESC, set_version ASC
-# BK_SETS_DEFAULT_ORDER="rebrickable_sets"."year" ASC
+# BK_SETS_DEFAULT_ORDER=sets.year ASC
 
 # Optional: Folder where to store the sets images, relative to the '/app/static/' folder
 # Default: sets
@@ -246,9 +249,9 @@
 
 # Optional: Change the default order of sets. By default ordered by insertion order.
 # Useful column names for this option are:
-# - "bricktracker_wishes"."set": set number as a string
+# - wishlist.set_num: set number as a string
-# - "bricktracker_wishes"."name": set name
+# - wishlist.name: set name
-# - "bricktracker_wishes"."year": set release year
+# - wishlist.year: set release year
-# - "bricktracker_wishes"."number_of_parts": set number of parts
+# - wishlist.num_parts: set number of parts
-# Default: "bricktracker_wishes"."rowid" DESC
+# Default: wishlist.rowid DESC
-# BK_WISHES_DEFAULT_ORDER="bricktracker_wishes"."set" DESC
+# BK_WISHES_DEFAULT_ORDER=set_number DESC, set_version ASC

.gitignore

@@ -1,8 +1,6 @@
 # Application
 .env
 *.db
-*.db-shm
-*.db-wal
 
 # Python specifics
 __pycache__/
@@ -11,7 +9,6 @@ __pycache__/
 # Static folders
 static/instructions/
 static/minifigs/
-static/minifigures/
 static/parts/
 static/sets/
 

CHANGELOG.md

@@ -1,196 +0,0 @@
-# Changelog
-
-## 1.1.0: Deduped sets, custom checkboxes and database upgrade
-
-### Database
-
-- Sets
-    - Deduplicating rebrickable sets (unique) and bricktracker sets (can be n bricktracker sets for one rebrickable set)
-
-### Docs
-
-- Removed extra `<br>` to accomodate Gitea Markdown
-- Add an organized DOCS.md documentation page
-- Database upgrade/migration
-- Checkboxes
-
-### Code
-
-- Admin
-    - Split the views before admin because an unmanageable monster view
-
-- Checkboxes
-    - Customizable checkboxes for set (amount and names, displayed on the grid or not)
-    - Replaced the 3 original routes to update the status with a generic route to accomodate any custom status
-
-- Instructions
-    - Base instructions on RebrickableSet (the generic one) rather than BrickSet (the specific one)
-    - Refine set number detection in file name by making sure each first items is an integer
-
-- Python
-    - Make stricter function definition with no "arg_or_keyword" parameters
-
-- Records
-    - Consolidate the select() -> not None or Exception -> ingest() process duplicated in every child class
-
-- SQL
-    - Forward-only migration mechanism
-    - Check for database too far in version
-    - Inject the database version in the file when downloading it
-    - Quote all indentifiers as best practice
-    - Allow insert query to be overriden
-    - Allow insert query to force not being deferred even if not committed
-    - Allow select query to push context in BrickRecord and BrickRecordList
-    - Make SQL record counters failsafe as they are used in the admin and it should always work
-    - Remove BrickSQL.initialize() as it is replaced by upgrade()
-
-- Sets
-    - Now that it is deduplicated, adding the same set more than once will not pull it fully from the Rebrickable API (minifigures and parts)
-    - Make RebrickableSet extend BrickRecord since it is now an item in database
-    - Make BrickSet extend RebrickableSet now that RebrickableSet is a proper database item
-
-### UI
-
-- Checkboxes
-    - Possibility to hide the checkbox in the grid ("Sets") but sill have all them in the set details
-    - Management
-
-- Database
-    - Migration tool
-
-- Javascript
-    - Generic BrickChanger class to handle quick modification through a JSON request with a visual feedback indicator
-    - Simplify the way javascript scripts are loaded and instantiated
-
-- Set grid
-    - Filter by checkboxes and NOT checkboxes
-
-- Tables
-    - Fix table search looking inside links pills
-
-- Wishlist
-    - Add Rebrickable link badge for sets (@matthew)
-
-## 1.0.0: New Year revamp
-
-### Code
-
-- Authentication
-    - Basic authentication mechanism with ONE password to protect admin and writes
-- CSV
-    - Remove dependencies to numpy and panda for simpler built-in csv
-- Code
-    - Refactored the Python code
-    - Modularity (more functions, splitting files)
-    - Type hinting whenever possible
-    - Flake8 linter
-    - Retained most of the original behaviour (with its quirks)
-- Colors
-    - Remove dependency on color.csv
-- Configuration
-    - Moved all the hard-coded parameters into configuration variables
-    - Most of the variables are configuration through environment variables
-    - Force instruction, sets, etc path to be relative to static
-- Docker
-    - Added an entrypoint to grab PORT / HOST from the environment if set
-    - Remove the need to seed the container with files (*.csv, nil files)
-- Flask
-    - Fix improper socketio.run(app.run()) call which lead to hard crash on ^C
-    - Make use of url_for to create URLs
-    - Use blueprints to implement routes
-    - Move views into their own files
-    - Split GET and POST methods into two different routes for clarity
-- Images
-    - Add an option to use remote images from the Rebrickable CDN rather than downloading everything locally
-    - Handle nil.png and nil_mf.jpg as true images in /static/sets/ so that they are downloaded whenever necessary when importing a se with missing images
-- Instructions
-    - Scan the files once for the whole app, and re-use the data
-    - Refresh the instructions from the admin
-    - More lenient set number detection
-    - Update when uploading a new one
-    - Basic file management
-- Logs
-    - Added log lines for change actions (add, check, missing, delete) so that the server is not silent when DEBUG=false
-- Minifigures
-    - Added a variable to control default ordering
-- Part(s)
-    - Added a variable to control default ordering of listing
-- Retired sets
-    - Open the themes once for the whole app, and re-use the data
-    - Do not hard fail if themes.csv is missing, simply display the IDs
-    - Light management: resync, download
-- Set(s)
-    - Reworked the set checkboxes with a dedicated route per status
-    - Switch from homemade ID generator to proven UUID4 for sets ID
-        - Does not interfere with previously created sets
-    - Do not rely on sets.csv to check if the set exists
-    - When adding, commit the set to database only once everything has been processed
-    - Added a bulk add page
-    - Keep spare parts when importing
-    - Added a variable to control default ordering of listing
-- Socket
-    - Make use of socket.io rooms to avoid broadcasting messages to all clients
-- SQLite
-    - Do not hard fail if the database is not present or not initialized
-    - Open the database once for the context, and re-use the connection
-    - Move queries to .sql files and load them as Jinja templates
-    - Use named arguments rather than sets for SQLite queries
-    - Allow execute() to be deferred to the commit() call to avoid locking the database for long period while importing (locked while downloading images)
-- Themes
-    - Open the themes once for the whole app, and re-use the data
-    - Do not hard fail if themes.csv is missing, simply display the IDs
-    - Light management: resync, download
-
-### UI
-
-- Admin
-    - Initialize the database from the web interface
-    - Reset the database
-    - Delete the database
-    - Download the database
-    - Import the database
-    - Display the configuration variables
-    - Many things
-- Accordions
-    - Added a flag to make the accordion items independent
-- Branding:
-    - Add a brick as a logo (CC0 image from: https://iconduck.com/icons/71631/brick)
-- Global
-    - Redesign of the whole app
-    - Sticky menu bar on top of the page
-    - Execution time and SQL stats for fun
-- Libraries
-    - Switch from Bulma to Bootstrap, arbitrarily :D
-    - Use of baguettebox for images (https://github.com/feimosi/baguetteBox.js)
-    - Use of tinysort to sort and filter the grid (https://github.com/Sjeiti/TinySort)
-    - Use of sortable for set card tables (https://github.com/tofsjonas/sortable)
-    - Use of simple-datatables for big tables (https://github.com/fiduswriter/simple-datatables)
-- Minifigures
-    - Added a detail view for a minifigure
-    - Display which sets are using a minifigure
-    - Display which sets are missing a minifigure
-- Parts
-    - Added a detail view for a part
-    - Display which sets are using a part
-    - Display which sets are missing a part
-- Templates
-    - Use a common base template
-    - Use HTML fragments/macros for repeted or parametrics items
-    - a 404 page for wrong URLs
-    - an error page for expected error messages
-    - an exception page for unexpected error messages
-- Set add
-    - Two-tiered (with override) import where you see what you will import before importing it
-    - Add a visual indicator that the socket is connected
-- Set card
-    - Badges to display info like theme, year, parts, etc
-    - Set image on top of the card, filling the space
-    - Trick to have a blurry background image fill the void in the card
-    - Save missing parts on input change rather than by clicking
-        - Visual feedback of success
-    - Parts and minifigure in accordions
-    - Instructions file list
-- Set grid
-    - 4-2-1 card distribution depending on screen size
-    - Display the index with no set added, rather than redirecting
-    - Keep last sort in a cookie, and trigger it on page load (can be cleared)

README.md

@@ -27,6 +27,6 @@ See [first steps](docs/first-steps.md).
 ## Documentation
 
 Most of the pages should be self explanatory to use.
-However, you can find more specific documentation in the [documentation](docs/DOCS.md).
+However, you can find more specific documentation in the [docs](docs/) folder.
 
-You can find screenshots of the application in the [overview](docs/overview.md) documentation file.
+You can find screenshots of the application in the [bricktracker](docs/bricktracker.md) documentation file.

app.py

@@ -11,44 +11,28 @@ from bricktracker.socket import BrickSocket  # noqa: E402
 
 logger = logging.getLogger(__name__)
 
+# Create the Flask app
+app = Flask(__name__)
 
-# Create the app
+# Setup the app
-# Using 'app' globally interferse with the teardown handlers of Flask
+setup_app(app)
-def create_app(main: bool = False, /) -> Flask | BrickSocket:
-    # Create the Flask app
-    app = Flask(__name__)
 
-    # Setup the app
+# Create the socket
-    setup_app(app)
+s = BrickSocket(
-
+    app,
-    # Create the socket
+    threaded=not app.config['NO_THREADED_SOCKET'].value,
-    s = BrickSocket(
+)
-        app,
-        threaded=not app.config['NO_THREADED_SOCKET'],
-    )
-
-    if main:
-        return s
-    else:
-        return app
 
 
 if __name__ == '__main__':
-    s = create_app(True)
-
-    # This never happens, but makes the linter happy
-    if isinstance(s, Flask):
-        logger.critical('Cannot run locally with a Flask object, needs a BrickSocket. Use create_app(True) to return a BrickSocket')  # noqa: E501
-        exit(1)
-
     # Run the application
     logger.info('Starting BrickTracker on {host}:{port}'.format(
-        host=s.app.config['HOST'],
+        host=app.config['HOST'].value,
-        port=s.app.config['PORT'],
+        port=app.config['PORT'].value,
     ))
     s.socket.run(
-        s.app,
+        app,
-        host=s.app.config['HOST'],
+        host=app.config['HOST'].value,
-        debug=s.app.config['DEBUG'],
+        debug=app.config['DEBUG'].value,
-        port=s.app.config['PORT'],
+        port=app.config['PORT'].value,
     )

bricktracker/app.py

@@ -12,13 +12,7 @@ from bricktracker.navbar import Navbar
 from bricktracker.sql import close
 from bricktracker.version import __version__
 from bricktracker.views.add import add_page
-from bricktracker.views.admin.admin import admin_page
+from bricktracker.views.admin import admin_page
-from bricktracker.views.admin.checkbox import admin_checkbox_page
-from bricktracker.views.admin.database import admin_database_page
-from bricktracker.views.admin.image import admin_image_page
-from bricktracker.views.admin.instructions import admin_instructions_page
-from bricktracker.views.admin.retired import admin_retired_page
-from bricktracker.views.admin.theme import admin_theme_page
 from bricktracker.views.error import error_404
 from bricktracker.views.index import index_page
 from bricktracker.views.instructions import instructions_page
@@ -34,7 +28,7 @@ def setup_app(app: Flask) -> None:
     BrickConfigurationList(app)
 
     # Set the logging level
-    if app.config['DEBUG']:
+    if app.config['DEBUG'].value:
         logging.basicConfig(
             stream=sys.stdout,
             level=logging.DEBUG,
@@ -66,8 +60,9 @@ def setup_app(app: Flask) -> None:
     # Register errors
     app.register_error_handler(404, error_404)
 
-    # Register app routes
+    # Register routes
     app.register_blueprint(add_page)
+    app.register_blueprint(admin_page)
     app.register_blueprint(index_page)
     app.register_blueprint(instructions_page)
     app.register_blueprint(login_page)
@@ -76,15 +71,6 @@ def setup_app(app: Flask) -> None:
     app.register_blueprint(set_page)
     app.register_blueprint(wish_page)
 
-    # Register admin routes
-    app.register_blueprint(admin_page)
-    app.register_blueprint(admin_checkbox_page)
-    app.register_blueprint(admin_database_page)
-    app.register_blueprint(admin_image_page)
-    app.register_blueprint(admin_instructions_page)
-    app.register_blueprint(admin_retired_page)
-    app.register_blueprint(admin_theme_page)
-
     # An helper to make global variables available to the
     # request
     @app.before_request
@@ -104,12 +90,12 @@ def setup_app(app: Flask) -> None:
         g.request_time = request_time
 
         # Register the timezone
-        g.timezone = ZoneInfo(current_app.config['TIMEZONE'])
+        g.timezone = ZoneInfo(current_app.config['TIMEZONE'].value)
 
         # Version
         g.version = __version__
 
     # Make sure all connections are closed at the end
-    @app.teardown_request
+    @app.teardown_appcontext
-    def teardown_request(_: BaseException | None) -> None:
+    def close_connections(exception, /) -> None:
         close()

bricktracker/config.py

@@ -31,10 +31,10 @@ CONFIG: Final[list[dict[str, Any]]] = [
     {'n': 'HIDE_ALL_SETS', 'c': bool},
     {'n': 'HIDE_MISSING_PARTS', 'c': bool},
     {'n': 'HIDE_WISHES', 'c': bool},
-    {'n': 'MINIFIGURES_DEFAULT_ORDER', 'd': '"minifigures"."name" ASC'},
+    {'n': 'MINIFIGURES_DEFAULT_ORDER', 'd': 'minifigures.name ASC'},
     {'n': 'MINIFIGURES_FOLDER', 'd': 'minifigs', 's': True},
     {'n': 'NO_THREADED_SOCKET', 'c': bool},
-    {'n': 'PARTS_DEFAULT_ORDER', 'd': '"inventory"."name" ASC, "inventory"."color_name" ASC, "inventory"."is_spare" ASC'},  # noqa: E501
+    {'n': 'PARTS_DEFAULT_ORDER', 'd': 'inventory.name ASC, inventory.color_name ASC, is_spare ASC'},  # noqa: E501
     {'n': 'PARTS_FOLDER', 'd': 'parts', 's': True},
     {'n': 'PORT', 'd': 3333, 'c': int},
     {'n': 'RANDOM', 'e': 'RANDOM', 'c': bool},
@@ -43,11 +43,12 @@ 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
     {'n': 'RETIRED_SETS_PATH', 'd': './retired_sets.csv'},
-    {'n': 'SETS_DEFAULT_ORDER', 'd': '"rebrickable_sets"."number" DESC, "rebrickable_sets"."version" ASC'},  # noqa: E501
+    {'n': 'SETS_DEFAULT_ORDER', 'd': 'set_number DESC, set_version ASC'},
     {'n': 'SETS_FOLDER', 'd': 'sets', 's': True},
     {'n': 'SKIP_SPARE_PARTS', 'c': bool},
     {'n': 'SOCKET_NAMESPACE', 'd': 'bricksocket'},
@@ -56,5 +57,5 @@ CONFIG: Final[list[dict[str, Any]]] = [
     {'n': 'THEMES_PATH', 'd': './themes.csv'},
     {'n': 'TIMEZONE', 'd': 'Etc/UTC'},
     {'n': 'USE_REMOTE_IMAGES', 'c': bool},
-    {'n': 'WISHES_DEFAULT_ORDER', 'd': '"bricktracker_wishes"."rowid" DESC'},
+    {'n': 'WISHES_DEFAULT_ORDER', 'd': 'wishlist.rowid DESC'},
 ]

bricktracker/configuration.py

@@ -16,7 +16,6 @@ class BrickConfiguration(object):
     def __init__(
         self,
         /,
-        *,
         n: str,
         e: str | None = None,
         d: Any = None,
@@ -70,7 +69,6 @@ class BrickConfiguration(object):
                 # Remove static prefix
                 value = value.removeprefix('static/')
 
-        # Type casting
         if self.cast is not None:
             self.value = self.cast(value)
         else:

bricktracker/configuration_list.py

@@ -1,60 +1,46 @@
-import logging
 from typing import Generator
 
-from flask import Flask
+from flask import current_app, Flask
 
 from .config import CONFIG
 from .configuration import BrickConfiguration
 from .exceptions import ConfigurationMissingException
 
-logger = logging.getLogger(__name__)
-
 
 # Application configuration
 class BrickConfigurationList(object):
     app: Flask
-    configurations: dict[str, BrickConfiguration]
 
     # Load configuration
     def __init__(self, app: Flask, /):
         self.app = app
 
-        # Load the configurations only there is none already loaded
+        # Process all configuration items
-        configurations = getattr(self, 'configurations', None)
+        for config in CONFIG:
-
+            item = BrickConfiguration(**config)
-        if configurations is None:
+            self.app.config[item.name] = item
-            logger.info('Loading configuration variables')
-
-            BrickConfigurationList.configurations = {}
-
-            # Process all configuration items
-            for config in CONFIG:
-                item = BrickConfiguration(**config)
-
-                # Store in the list
-                BrickConfigurationList.configurations[item.name] = item
-
-                # Only store the value in the app to avoid breaking any
-                # existing variables
-                self.app.config[item.name] = item.value
 
     # Check whether a str configuration is set
     @staticmethod
     def error_unless_is_set(name: str):
-        configuration = BrickConfigurationList.configurations[name]
+        config: BrickConfiguration = current_app.config[name]
 
-        if configuration.value is None or configuration.value == '':
+        if config.value is None or config.value == '':
             raise ConfigurationMissingException(
                 '{name} must be defined (using the {environ} environment variable)'.format(  # noqa: E501
-                    name=name,
+                    name=config.name,
-                    environ=configuration.env_name
+                    environ=config.env_name
                 ),
             )
 
     # Get all the configuration items from the app config
     @staticmethod
     def list() -> Generator[BrickConfiguration, None, None]:
-        keys = sorted(BrickConfigurationList.configurations.keys())
+        keys = list(current_app.config.keys())
+        keys.sort()
 
         for name in keys:
-            yield BrickConfigurationList.configurations[name]
+            config = current_app.config[name]
+
+            if isinstance(config, BrickConfiguration):
+                yield config

bricktracker/fields.py

@@ -4,9 +4,6 @@ from typing import Any
 # SQLite record fields
 class BrickRecordFields(object):
     def __getattr__(self, name: str, /) -> Any:
-        if name not in self.__dict__:
-            raise AttributeError(name)
-
         return self.__dict__[name]
 
     def __setattr__(self, name: str, value: Any, /) -> None:

bricktracker/instructions.py

@@ -10,18 +10,18 @@ from werkzeug.utils import secure_filename
 
 from .exceptions import ErrorException
 if TYPE_CHECKING:
-    from .rebrickable_set import RebrickableSet
+    from .set import BrickSet
 
 logger = logging.getLogger(__name__)
 
 
 class BrickInstructions(object):
     allowed: bool
-    rebrickable: 'RebrickableSet | None'
+    brickset: 'BrickSet | None'
     extension: str
     filename: str
     mtime: datetime
-    set: 'str | None'
+    number: 'str | None'
     name: str
     size: int
 
@@ -39,11 +39,11 @@ class BrickInstructions(object):
         # Store the name and extension, check if extension is allowed
         self.name, self.extension = os.path.splitext(self.filename)
         self.extension = self.extension.lower()
-        self.allowed = self.extension in current_app.config['INSTRUCTIONS_ALLOWED_EXTENSIONS']  # noqa: E501
+        self.allowed = self.extension in current_app.config['INSTRUCTIONS_ALLOWED_EXTENSIONS'].value  # noqa: E501
 
         # Placeholder
-        self.rebrickable = None
+        self.brickset = None
-        self.set = None
+        self.number = None
 
         # Extract the set number
         if self.allowed:
@@ -54,14 +54,7 @@ class BrickInstructions(object):
             splits = normalized.split('-', 2)
 
             if len(splits) >= 2:
-                try:
+                self.number = '-'.join(splits[:2])
-                    # Trying to make sense of each part as integers
-                    int(splits[0])
-                    int(splits[1])
-
-                    self.set = '-'.join(splits[:2])
-                except Exception:
-                    pass
 
     # Delete an instruction file
     def delete(self, /) -> None:
@@ -74,17 +67,17 @@ class BrickInstructions(object):
     # Display the time in a human format
     def human_time(self) -> str:
         return self.mtime.astimezone(g.timezone).strftime(
-            current_app.config['FILE_DATETIME_FORMAT']
+            current_app.config['FILE_DATETIME_FORMAT'].value
         )
 
     # Compute the path of an instruction file
-    def path(self, /, *, filename=None) -> str:
+    def path(self, /, filename=None) -> str:
         if filename is None:
             filename = self.filename
 
         return os.path.join(
             current_app.static_folder,  # type: ignore
-            current_app.config['INSTRUCTIONS_FOLDER'],
+            current_app.config['INSTRUCTIONS_FOLDER'].value,
             filename
         )
 
@@ -106,7 +99,7 @@ class BrickInstructions(object):
 
     # Upload a new instructions file
     def upload(self, file: FileStorage, /) -> None:
-        target = self.path(filename=secure_filename(self.filename))
+        target = self.path(secure_filename(self.filename))
 
         if os.path.isfile(target):
             raise ErrorException('Cannot upload {target} as it already exists'.format(  # noqa: E501
@@ -125,7 +118,7 @@ class BrickInstructions(object):
         if not self.allowed:
             return ''
 
-        folder: str = current_app.config['INSTRUCTIONS_FOLDER']
+        folder: str = current_app.config['INSTRUCTIONS_FOLDER'].value
 
         # Compute the path
         path = os.path.join(folder, self.filename)

bricktracker/instructions_list.py

@@ -1,14 +1,11 @@
 import logging
 import os
-from typing import Generator, TYPE_CHECKING
+from typing import Generator
 
 from flask import current_app
 
 from .exceptions import NotFoundException
 from .instructions import BrickInstructions
-from .rebrickable_set_list import RebrickableSetList
-if TYPE_CHECKING:
-    from .rebrickable_set import RebrickableSet
 
 logger = logging.getLogger(__name__)
 
@@ -21,7 +18,7 @@ class BrickInstructionsList(object):
     sets_total: int
     unknown_total: int
 
-    def __init__(self, /, *, force=False):
+    def __init__(self, /, force=False):
         # Load instructions only if there is none already loaded
         all = getattr(self, 'all', None)
 
@@ -39,7 +36,7 @@ class BrickInstructionsList(object):
                 # Make a folder relative to static
                 folder: str = os.path.join(
                     current_app.static_folder,  # type: ignore
-                    current_app.config['INSTRUCTIONS_FOLDER'],
+                    current_app.config['INSTRUCTIONS_FOLDER'].value,
                 )
 
                 for file in os.scandir(folder):
@@ -49,40 +46,47 @@ class BrickInstructionsList(object):
                     BrickInstructionsList.all[instruction.filename] = instruction  # noqa: E501
 
                     if instruction.allowed:
-                        if instruction.set:
+                        if instruction.number:
                             # Instantiate the list if not existing yet
-                            if instruction.set not in BrickInstructionsList.sets:  # noqa: E501
+                            if instruction.number not in BrickInstructionsList.sets:  # noqa: E501
-                                BrickInstructionsList.sets[instruction.set] = []  # noqa: E501
+                                BrickInstructionsList.sets[instruction.number] = []  # noqa: E501
 
-                            BrickInstructionsList.sets[instruction.set].append(instruction)  # noqa: E501
+                            BrickInstructionsList.sets[instruction.number].append(instruction)  # noqa: E501
                             BrickInstructionsList.sets_total += 1
                         else:
                             BrickInstructionsList.unknown_total += 1
                     else:
                         BrickInstructionsList.rejected_total += 1
 
-                # List of Rebrickable sets
+                # Associate bricksets
-                rebrickable_sets: dict[str, RebrickableSet] = {}
+                # Not ideal, to avoid a circular import
-                for rebrickable_set in RebrickableSetList().all():
+                from .set import BrickSet
-                    rebrickable_sets[rebrickable_set.fields.set] = rebrickable_set  # noqa: E501
+                from .set_list import BrickSetList
 
-                # Inject the brickset if it exists
+                # Grab the generic list of sets
+                bricksets: dict[str, BrickSet] = {}
+                for brickset in BrickSetList().generic().records:
+                    bricksets[brickset.fields.set_num] = brickset
+
+                # Return the files
                 for instruction in self.all.values():
+                    # Inject the brickset if it exists
                     if (
                         instruction.allowed and
-                        instruction.set is not None and
+                        instruction.number is not None and
-                        instruction.rebrickable is None and
+                        instruction.brickset is None and
-                        instruction.set in rebrickable_sets
+                        instruction.number in bricksets
                     ):
-                        instruction.rebrickable = rebrickable_sets[instruction.set]  # noqa: E501
+                        instruction.brickset = bricksets[instruction.number]
+
             # Ignore errors
             except Exception:
                 pass
 
     # Grab instructions for a set
-    def get(self, set: str) -> list[BrickInstructions]:
+    def get(self, number: str) -> list[BrickInstructions]:
-        if set in self.sets:
+        if number in self.sets:
-            return self.sets[set]
+            return self.sets[number]
         else:
             return []
 

bricktracker/login.py

@@ -12,7 +12,7 @@ class LoginManager(object):
 
     def __init__(self, app: Flask, /):
         # Setup basic authentication
-        app.secret_key = app.config['AUTHENTICATION_KEY']
+        app.secret_key = app.config['AUTHENTICATION_KEY'].value
 
         manager = login_manager.LoginManager()
         manager.login_view = 'login.login'  # type: ignore
@@ -23,11 +23,11 @@ class LoginManager(object):
         def user_loader(*arg) -> LoginManager.User:
             return self.User(
                 'admin',
-                app.config['AUTHENTICATION_PASSWORD']
+                app.config['AUTHENTICATION_PASSWORD'].value
             )
 
         # If the password is unset, globally disable
-        app.config['LOGIN_DISABLED'] = app.config['AUTHENTICATION_PASSWORD'] == ''  # noqa: E501
+        app.config['LOGIN_DISABLED'] = app.config['AUTHENTICATION_PASSWORD'].value == ''  # noqa: E501
 
     # Tells whether the user is authenticated, meaning:
     # - Authentication disabled

bricktracker/minifigure.py

@@ -23,7 +23,6 @@ class BrickMinifigure(BrickRecord):
     def __init__(
         self,
         /,
-        *,
         brickset: 'BrickSet | None' = None,
         record: Row | dict[str, Any] | None = None,
     ):
@@ -62,13 +61,18 @@ class BrickMinifigure(BrickRecord):
         # Save the parameters to the fields
         self.fields.fig_num = fig_num
 
-        if not self.select(override_query=self.generic_query):
+        record = self.select(override_query=self.generic_query)
+
+        if record is None:
             raise NotFoundException(
                 'Minifigure with number {number} was not found in the database'.format(  # noqa: E501
                     number=self.fields.fig_num,
                 ),
             )
 
+        # Ingest the record
+        self.ingest(record)
+
         return self
 
     # Select a specific minifigure (with a set and an number)
@@ -77,14 +81,19 @@ class BrickMinifigure(BrickRecord):
         self.brickset = brickset
         self.fields.fig_num = fig_num
 
-        if not self.select():
+        record = self.select()
+
+        if record is None:
             raise NotFoundException(
                 'Minifigure with number {number} from set {set} was not found in the database'.format(  # noqa: E501
                     number=self.fields.fig_num,
-                    set=self.brickset.fields.set,
+                    set=self.brickset.fields.set_num,
                 ),
             )
 
+        # Ingest the record
+        self.ingest(record)
+
         return self
 
     # Return a dict with common SQL parameters for a minifigure
@@ -94,10 +103,10 @@ class BrickMinifigure(BrickRecord):
         # Supplement from the brickset
         if self.brickset is not None:
             if 'u_id' not in parameters:
-                parameters['u_id'] = self.brickset.fields.id
+                parameters['u_id'] = self.brickset.fields.u_id
 
             if 'set_num' not in parameters:
-                parameters['set_num'] = self.brickset.fields.set
+                parameters['set_num'] = self.brickset.fields.set_num
 
         return parameters
 
@@ -110,7 +119,7 @@ class BrickMinifigure(BrickRecord):
 
     # Compute the url for minifigure part image
     def url_for_image(self, /) -> str:
-        if not current_app.config['USE_REMOTE_IMAGES']:
+        if not current_app.config['USE_REMOTE_IMAGES'].value:
             if self.fields.set_img_url is None:
                 file = RebrickableImage.nil_minifigure_name()
             else:
@@ -119,15 +128,15 @@ class BrickMinifigure(BrickRecord):
             return RebrickableImage.static_url(file, 'MINIFIGURES_FOLDER')
         else:
             if self.fields.set_img_url is None:
-                return current_app.config['REBRICKABLE_IMAGE_NIL_MINIFIGURE']
+                return current_app.config['REBRICKABLE_IMAGE_NIL_MINIFIGURE'].value  # noqa: E501
             else:
                 return self.fields.set_img_url
 
     # Compute the url for the rebrickable page
     def url_for_rebrickable(self, /) -> str:
-        if current_app.config['REBRICKABLE_LINKS']:
+        if current_app.config['REBRICKABLE_LINKS'].value:
             try:
-                return current_app.config['REBRICKABLE_LINK_MINIFIGURE_PATTERN'].format(  # noqa: E501
+                return current_app.config['REBRICKABLE_LINK_MINIFIGURE_PATTERN'].value.format(  # noqa: E501
                     number=self.fields.fig_num.lower(),
                 )
             except Exception:
@@ -140,7 +149,6 @@ class BrickMinifigure(BrickRecord):
     def from_rebrickable(
         data: dict[str, Any],
         /,
-        *,
         brickset: 'BrickSet | None' = None,
         **_,
     ) -> dict[str, Any]:
@@ -152,7 +160,7 @@ class BrickMinifigure(BrickRecord):
         }
 
         if brickset is not None:
-            record['set_num'] = brickset.fields.set
+            record['set_num'] = brickset.fields.set_num
-            record['u_id'] = brickset.fields.id
+            record['u_id'] = brickset.fields.u_id
 
         return record

bricktracker/minifigure_list.py

@@ -27,7 +27,7 @@ class BrickMinifigureList(BrickRecordList[BrickMinifigure]):
         self.brickset = None
 
         # Store the order for this list
-        self.order = current_app.config['MINIFIGURES_DEFAULT_ORDER']
+        self.order = current_app.config['MINIFIGURES_DEFAULT_ORDER'].value
 
     # Load all minifigures
     def all(self, /) -> Self:
@@ -42,9 +42,9 @@ class BrickMinifigureList(BrickRecordList[BrickMinifigure]):
         return self
 
     # Last added minifigure
-    def last(self, /, *, limit: int = 6) -> Self:
+    def last(self, /, limit: int = 6) -> Self:
         # Randomize
-        if current_app.config['RANDOM']:
+        if current_app.config['RANDOM'].value:
             order = 'RANDOM()'
         else:
             order = 'minifigures.rowid DESC'
@@ -78,8 +78,8 @@ class BrickMinifigureList(BrickRecordList[BrickMinifigure]):
         parameters: dict[str, Any] = super().sql_parameters()
 
         if self.brickset is not None:
-            parameters['u_id'] = self.brickset.fields.id
+            parameters['u_id'] = self.brickset.fields.u_id
-            parameters['set_num'] = self.brickset.fields.set
+            parameters['set_num'] = self.brickset.fields.set_num
 
         return parameters
 
@@ -89,7 +89,6 @@ class BrickMinifigureList(BrickRecordList[BrickMinifigure]):
         part_num: str,
         color_id: int,
         /,
-        *,
         element_id: int | None = None,
     ) -> Self:
         # Save the parameters to the fields
@@ -114,7 +113,6 @@ class BrickMinifigureList(BrickRecordList[BrickMinifigure]):
         part_num: str,
         color_id: int,
         /,
-        *,
         element_id: int | None = None,
     ) -> Self:
         # Save the parameters to the fields

bricktracker/part.py

@@ -27,7 +27,6 @@ class BrickPart(BrickRecord):
     def __init__(
         self,
         /,
-        *,
         brickset: 'BrickSet | None' = None,
         minifigure: 'BrickMinifigure | None' = None,
         record: Row | dict[str, Any] | None = None,
@@ -84,7 +83,6 @@ class BrickPart(BrickRecord):
         part_num: str,
         color_id: int,
         /,
-        *,
         element_id: int | None = None
     ) -> Self:
         # Save the parameters to the fields
@@ -92,7 +90,9 @@ class BrickPart(BrickRecord):
         self.fields.color_id = color_id
         self.fields.element_id = element_id
 
-        if not self.select(override_query=self.generic_query):
+        record = self.select(override_query=self.generic_query)
+
+        if record is None:
             raise NotFoundException(
                 'Part with number {number}, color ID {color} and element ID {element} was not found in the database'.format(  # noqa: E501
                     number=self.fields.part_num,
@@ -101,6 +101,9 @@ class BrickPart(BrickRecord):
                 ),
             )
 
+        # Ingest the record
+        self.ingest(record)
+
         return self
 
     # Select a specific part (with a set and an id, and option. a minifigure)
@@ -109,7 +112,6 @@ class BrickPart(BrickRecord):
         brickset: 'BrickSet',
         id: str,
         /,
-        *,
         minifigure: 'BrickMinifigure | None' = None,
     ) -> Self:
         # Save the parameters to the fields
@@ -117,14 +119,19 @@ class BrickPart(BrickRecord):
         self.minifigure = minifigure
         self.fields.id = id
 
-        if not self.select():
+        record = self.select()
+
+        if record is None:
             raise NotFoundException(
                 'Part with ID {id} from set {set} was not found in the database'.format(  # noqa: E501
                     id=self.fields.id,
-                    set=self.brickset.fields.set,
+                    set=self.brickset.fields.set_num,
                 ),
             )
 
+        # Ingest the record
+        self.ingest(record)
+
         return self
 
     # Return a dict with common SQL parameters for a part
@@ -133,14 +140,14 @@ class BrickPart(BrickRecord):
 
         # Supplement from the brickset
         if 'u_id' not in parameters and self.brickset is not None:
-            parameters['u_id'] = self.brickset.fields.id
+            parameters['u_id'] = self.brickset.fields.u_id
 
         if 'set_num' not in parameters:
             if self.minifigure is not None:
                 parameters['set_num'] = self.minifigure.fields.fig_num
 
             elif self.brickset is not None:
-                parameters['set_num'] = self.brickset.fields.set
+                parameters['set_num'] = self.brickset.fields.set_num
 
         return parameters
 
@@ -183,9 +190,9 @@ class BrickPart(BrickRecord):
 
     # Compute the url for the bricklink page
     def url_for_bricklink(self, /) -> str:
-        if current_app.config['BRICKLINK_LINKS']:
+        if current_app.config['BRICKLINK_LINKS'].value:
             try:
-                return current_app.config['BRICKLINK_LINK_PART_PATTERN'].format(  # noqa: E501
+                return current_app.config['BRICKLINK_LINK_PART_PATTERN'].value.format(  # noqa: E501
                     number=self.fields.part_num,
                 )
             except Exception:
@@ -195,7 +202,7 @@ class BrickPart(BrickRecord):
 
     # Compute the url for the part image
     def url_for_image(self, /) -> str:
-        if not current_app.config['USE_REMOTE_IMAGES']:
+        if not current_app.config['USE_REMOTE_IMAGES'].value:
             if self.fields.part_img_url is None:
                 file = RebrickableImage.nil_name()
             else:
@@ -204,7 +211,7 @@ class BrickPart(BrickRecord):
             return RebrickableImage.static_url(file, 'PARTS_FOLDER')
         else:
             if self.fields.part_img_url is None:
-                return current_app.config['REBRICKABLE_IMAGE_NIL']
+                return current_app.config['REBRICKABLE_IMAGE_NIL'].value
             else:
                 return self.fields.part_img_url
 
@@ -227,9 +234,9 @@ class BrickPart(BrickRecord):
 
     # Compute the url for the rebrickable page
     def url_for_rebrickable(self, /) -> str:
-        if current_app.config['REBRICKABLE_LINKS']:
+        if current_app.config['REBRICKABLE_LINKS'].value:
             try:
-                return current_app.config['REBRICKABLE_LINK_PART_PATTERN'].format(  # noqa: E501
+                return current_app.config['REBRICKABLE_LINK_PART_PATTERN'].value.format(  # noqa: E501
                     number=self.fields.part_num,
                     color=self.fields.color_id,
                 )
@@ -243,7 +250,6 @@ class BrickPart(BrickRecord):
     def from_rebrickable(
         data: dict[str, Any],
         /,
-        *,
         brickset: 'BrickSet | None' = None,
         minifigure: 'BrickMinifigure | None' = None,
         **_,
@@ -263,7 +269,7 @@ class BrickPart(BrickRecord):
         }
 
         if brickset is not None:
-            record['u_id'] = brickset.fields.id
+            record['u_id'] = brickset.fields.u_id
 
         if minifigure is not None:
             record['set_num'] = data['fig_num']

bricktracker/part_list.py

@@ -30,7 +30,7 @@ class BrickPartList(BrickRecordList[BrickPart]):
         self.minifigure = None
 
         # Store the order for this list
-        self.order = current_app.config['PARTS_DEFAULT_ORDER']
+        self.order = current_app.config['PARTS_DEFAULT_ORDER'].value
 
     # Load all parts
     def all(self, /) -> Self:
@@ -49,7 +49,6 @@ class BrickPartList(BrickRecordList[BrickPart]):
         self,
         brickset: 'BrickSet',
         /,
-        *,
         minifigure: 'BrickMinifigure | None' = None,
     ) -> Self:
         # Save the brickset and minifigure
@@ -64,7 +63,10 @@ class BrickPartList(BrickRecordList[BrickPart]):
                 record=record,
             )
 
-            if current_app.config['SKIP_SPARE_PARTS'] and part.fields.is_spare:
+            if (
+                current_app.config['SKIP_SPARE_PARTS'].value and
+                part.fields.is_spare
+            ):
                 continue
 
             self.records.append(part)
@@ -90,7 +92,10 @@ class BrickPartList(BrickRecordList[BrickPart]):
                 record=record,
             )
 
-            if current_app.config['SKIP_SPARE_PARTS'] and part.fields.is_spare:
+            if (
+                current_app.config['SKIP_SPARE_PARTS'].value and
+                part.fields.is_spare
+            ):
                 continue
 
             self.records.append(part)
@@ -115,13 +120,13 @@ class BrickPartList(BrickRecordList[BrickPart]):
 
         # Set id
         if self.brickset is not None:
-            parameters['u_id'] = self.brickset.fields.id
+            parameters['u_id'] = self.brickset.fields.u_id
 
         # Use the minifigure number if present,
         # otherwise use the set number
         if self.minifigure is not None:
             parameters['set_num'] = self.minifigure.fields.fig_num
         elif self.brickset is not None:
-            parameters['set_num'] = self.brickset.fields.set
+            parameters['set_num'] = self.brickset.fields.set_num
 
         return parameters

bricktracker/rebrickable.py

@@ -9,12 +9,11 @@ from .exceptions import NotFoundException, ErrorException
 if TYPE_CHECKING:
     from .minifigure import BrickMinifigure
     from .part import BrickPart
-    from .rebrickable_set import RebrickableSet
     from .set import BrickSet
     from .socket import BrickSocket
     from .wish import BrickWish
 
-T = TypeVar('T', 'RebrickableSet', 'BrickPart', 'BrickMinifigure', 'BrickWish')
+T = TypeVar('T', 'BrickSet', 'BrickPart', 'BrickMinifigure', 'BrickWish')
 
 
 # An helper around the rebrick library, autoconverting
@@ -24,11 +23,10 @@ class Rebrickable(Generic[T]):
     number: str
     model: Type[T]
 
-    brickset: 'BrickSet | None'
-    instance: T | None
-    kind: str
-    minifigure: 'BrickMinifigure | None'
     socket: 'BrickSocket | None'
+    brickset: 'BrickSet | None'
+    minifigure: 'BrickMinifigure | None'
+    kind: str
 
     def __init__(
         self,
@@ -36,11 +34,9 @@ class Rebrickable(Generic[T]):
         number: str,
         model: Type[T],
         /,
-        *,
-        brickset: 'BrickSet | None' = None,
-        instance: T | None = None,
-        minifigure: 'BrickMinifigure | None' = None,
         socket: 'BrickSocket | None' = None,
+        brickset: 'BrickSet | None' = None,
+        minifigure: 'BrickMinifigure | None' = None
     ):
         if not hasattr(lego, method):
             raise ErrorException('{method} is not a valid method for the rebrick.lego module'.format(  # noqa: E501
@@ -52,10 +48,9 @@ class Rebrickable(Generic[T]):
         self.number = number
         self.model = model
 
-        self.brickset = brickset
-        self.instance = instance
-        self.minifigure = minifigure
         self.socket = socket
+        self.brickset = brickset
+        self.minifigure = minifigure
 
         if self.minifigure is not None:
             self.kind = 'Minifigure'
@@ -66,15 +61,13 @@ class Rebrickable(Generic[T]):
     def get(self, /) -> T:
         model_parameters = self.model_parameters()
 
-        if self.instance is None:
+        return self.model(
-            self.instance = self.model(**model_parameters)
+            **model_parameters,
-
+            record=self.model.from_rebrickable(
-        self.instance.ingest(self.model.from_rebrickable(
+                self.load(),
-            self.load(),
+                brickset=self.brickset,
-            brickset=self.brickset,
+            ),
-        ))
+        )
-
-        return self.instance
 
     # Get paginated elements from the Rebrickable API
     def list(self, /) -> list[T]:
@@ -84,7 +77,7 @@ class Rebrickable(Generic[T]):
 
         # Bootstrap a first set of parameters
         parameters: dict[str, Any] | None = {
-            'page_size': current_app.config['REBRICKABLE_PAGE_SIZE'],
+            'page_size': current_app.config['REBRICKABLE_PAGE_SIZE'].value,
         }
 
         # Read all pages
@@ -120,9 +113,9 @@ class Rebrickable(Generic[T]):
         return results
 
     # Load from the API
-    def load(self, /, *, parameters: dict[str, Any] = {}) -> dict[str, Any]:
+    def load(self, /, parameters: dict[str, Any] = {}) -> dict[str, Any]:
         # Inject the API key
-        parameters['api_key'] = current_app.config['REBRICKABLE_API_KEY']
+        parameters['api_key'] = current_app.config['REBRICKABLE_API_KEY'].value,  # noqa: E501
 
         try:
             return json.loads(

bricktracker/rebrickable_image.py

@@ -10,12 +10,12 @@ from .exceptions import DownloadException
 if TYPE_CHECKING:
     from .minifigure import BrickMinifigure
     from .part import BrickPart
-    from .rebrickable_set import RebrickableSet
+    from .set import BrickSet
 
 
 # A set, part or minifigure image from Rebrickable
 class RebrickableImage(object):
-    set: 'RebrickableSet'
+    brickset: 'BrickSet'
     minifigure: 'BrickMinifigure | None'
     part: 'BrickPart | None'
 
@@ -23,14 +23,13 @@ class RebrickableImage(object):
 
     def __init__(
         self,
-        set: 'RebrickableSet',
+        brickset: 'BrickSet',
         /,
-        *,
         minifigure: 'BrickMinifigure | None' = None,
         part: 'BrickPart | None' = None,
     ):
         # Save all objects
-        self.set = set
+        self.brickset = brickset
         self.minifigure = minifigure
         self.part = part
 
@@ -71,12 +70,12 @@ class RebrickableImage(object):
     # Return the folder depending on the objects provided
     def folder(self, /) -> str:
         if self.part is not None:
-            return current_app.config['PARTS_FOLDER']
+            return current_app.config['PARTS_FOLDER'].value
 
         if self.minifigure is not None:
-            return current_app.config['MINIFIGURES_FOLDER']
+            return current_app.config['MINIFIGURES_FOLDER'].value
 
-        return current_app.config['SETS_FOLDER']
+        return current_app.config['SETS_FOLDER'].value
 
     # Return the id depending on the objects provided
     def id(self, /) -> str:
@@ -92,7 +91,7 @@ class RebrickableImage(object):
             else:
                 return self.minifigure.fields.fig_num
 
-        return self.set.fields.set
+        return self.brickset.fields.set_num
 
     # Return the path depending on the objects provided
     def path(self, /) -> str:
@@ -106,24 +105,24 @@ class RebrickableImage(object):
     def url(self, /) -> str:
         if self.part is not None:
             if self.part.fields.part_img_url is None:
-                return current_app.config['REBRICKABLE_IMAGE_NIL']
+                return current_app.config['REBRICKABLE_IMAGE_NIL'].value
             else:
                 return self.part.fields.part_img_url
 
         if self.minifigure is not None:
             if self.minifigure.fields.set_img_url is None:
-                return current_app.config['REBRICKABLE_IMAGE_NIL_MINIFIGURE']
+                return current_app.config['REBRICKABLE_IMAGE_NIL_MINIFIGURE'].value  # noqa: E501
             else:
                 return self.minifigure.fields.set_img_url
 
-        return self.set.fields.image
+        return self.brickset.fields.set_img_url
 
     # Return the name of the nil image file
     @staticmethod
     def nil_name() -> str:
         filename, _ = os.path.splitext(
             os.path.basename(
-                urlparse(current_app.config['REBRICKABLE_IMAGE_NIL']).path
+                urlparse(current_app.config['REBRICKABLE_IMAGE_NIL'].value).path  # noqa: E501
             )
         )
 
@@ -134,7 +133,7 @@ class RebrickableImage(object):
     def nil_minifigure_name() -> str:
         filename, _ = os.path.splitext(
             os.path.basename(
-                urlparse(current_app.config['REBRICKABLE_IMAGE_NIL_MINIFIGURE']).path  # noqa: E501
+                urlparse(current_app.config['REBRICKABLE_IMAGE_NIL_MINIFIGURE'].value).path  # noqa: E501
             )
         )
 
@@ -143,7 +142,7 @@ class RebrickableImage(object):
     # Return the static URL for an image given a name and folder
     @staticmethod
     def static_url(name: str, folder_name: str) -> str:
-        folder: str = current_app.config[folder_name]
+        folder: str = current_app.config[folder_name].value
 
         # /!\ Everything is saved as .jpg, even if it came from a .png
         # not changing this behaviour.

bricktracker/rebrickable_minifigures.py

@@ -30,18 +30,18 @@ class RebrickableMinifigures(object):
     def download(self, /) -> None:
         self.socket.auto_progress(
             message='Set {number}: loading minifigures from Rebrickable'.format(  # noqa: E501
-                number=self.brickset.fields.set,
+                number=self.brickset.fields.set_num,
             ),
             increment_total=True,
         )
 
-        logger.debug('rebrick.lego.get_set_minifigs("{set}")'.format(
+        logger.debug('rebrick.lego.get_set_minifigs("{set_num}")'.format(
-            set=self.brickset.fields.set,
+            set_num=self.brickset.fields.set_num,
         ))
 
         minifigures = Rebrickable[BrickMinifigure](
             'get_set_minifigs',
-            self.brickset.fields.set,
+            self.brickset.fields.set_num,
             BrickMinifigure,
             socket=self.socket,
             brickset=self.brickset,
@@ -53,7 +53,7 @@ class RebrickableMinifigures(object):
             # Insert into the database
             self.socket.auto_progress(
                 message='Set {number}: inserting minifigure {current}/{total} into database'.format(  # noqa: E501
-                    number=self.brickset.fields.set,
+                    number=self.brickset.fields.set_num,
                     current=index+1,
                     total=total,
                 )
@@ -65,13 +65,13 @@ class RebrickableMinifigures(object):
             # Grab the image
             self.socket.progress(
                 message='Set {number}: downloading minifigure {current}/{total} image'.format(  # noqa: E501
-                    number=self.brickset.fields.set,
+                    number=self.brickset.fields.set_num,
                     current=index+1,
                     total=total,
                 )
             )
 
-            if not current_app.config['USE_REMOTE_IMAGES']:
+            if not current_app.config['USE_REMOTE_IMAGES'].value:
                 RebrickableImage(
                     self.brickset,
                     minifigure=minifigure

bricktracker/rebrickable_parts.py

@@ -29,7 +29,6 @@ class RebrickableParts(object):
         socket: 'BrickSocket',
         brickset: 'BrickSet',
         /,
-        *,
         minifigure: 'BrickMinifigure | None' = None,
     ):
         # Save the socket
@@ -44,7 +43,7 @@ class RebrickableParts(object):
             self.kind = 'Minifigure'
             self.method = 'get_minifig_elements'
         else:
-            self.number = self.brickset.fields.set
+            self.number = self.brickset.fields.set_num
             self.kind = 'Set'
             self.method = 'get_set_elements'
 
@@ -77,7 +76,7 @@ class RebrickableParts(object):
         for index, part in enumerate(inventory):
             # Skip spare parts
             if (
-                current_app.config['SKIP_SPARE_PARTS'] and
+                current_app.config['SKIP_SPARE_PARTS'].value and
                 part.fields.is_spare
             ):
                 continue
@@ -105,7 +104,7 @@ class RebrickableParts(object):
                 )
             )
 
-            if not current_app.config['USE_REMOTE_IMAGES']:
+            if not current_app.config['USE_REMOTE_IMAGES'].value:
                 RebrickableImage(
                     self.brickset,
                     minifigure=self.minifigure,

bricktracker/rebrickable_set.py

@@ -1,135 +1,148 @@
 import logging
-from sqlite3 import Row
 import traceback
 from typing import Any, TYPE_CHECKING
+from uuid import uuid4
 
 from flask import current_app
 
 from .exceptions import ErrorException, NotFoundException
-from .instructions import BrickInstructions
 from .rebrickable import Rebrickable
 from .rebrickable_image import RebrickableImage
-from .record import BrickRecord
+from .rebrickable_minifigures import RebrickableMinifigures
-from .theme_list import BrickThemeList
+from .rebrickable_parts import RebrickableParts
+from .set import BrickSet
+from .sql import BrickSQL
+from .wish import BrickWish
 if TYPE_CHECKING:
     from .socket import BrickSocket
-    from .theme import BrickTheme
 
 logger = logging.getLogger(__name__)
 
 
 # A set from Rebrickable
-class RebrickableSet(BrickRecord):
+class RebrickableSet(object):
     socket: 'BrickSocket'
-    theme: 'BrickTheme'
-    instructions: list[BrickInstructions]
-
-    # Flags
-    resolve_instructions: bool = True
-
-    # Queries
-    select_query: str = 'rebrickable/set/select'
-    insert_query: str = 'rebrickable/set/insert'
-
-    def __init__(
-        self,
-        /,
-        *,
-        socket: 'BrickSocket | None' = None,
-        record: Row | dict[str, Any] | None = None
-    ):
-        super().__init__()
-
-        # Placeholders
-        self.instructions = []
 
+    def __init__(self, socket: 'BrickSocket', /):
         # Save the socket
-        if socket is not None:
+        self.socket = socket
-            self.socket = socket
-
-        # Ingest the record if it has one
-        if record is not None:
-            self.ingest(record)
 
     # Import the set from Rebrickable
-    def download_rebrickable(self, /) -> None:
+    def download(self, data: dict[str, Any], /) -> None:
-        # Insert the Rebrickable set to the database
+        # Reset the progress
-        rows, _ = self.insert(
+        self.socket.progress_count = 0
-            commit=False,
+        self.socket.progress_total = 0
-            no_defer=True,
-            override_query=RebrickableSet.insert_query
-        )
 
-        if rows > 0:
+        # Load the set
-            if not current_app.config['USE_REMOTE_IMAGES']:
+        brickset = self.load(data, from_download=True)
-                RebrickableImage(self).download()
 
-    # Ingest a set
+        # None brickset means loading failed
-    def ingest(self, record: Row | dict[str, Any], /):
+        if brickset is None:
-        super().ingest(record)
+            return
 
-        # Resolve theme
+        try:
-        if not hasattr(self.fields, 'theme_id'):
+            # Insert into the database
-            self.fields.theme_id = 0
+            self.socket.auto_progress(
+                message='Set {number}: inserting into database'.format(
+                    number=brickset.fields.set_num
+                ),
+                increment_total=True,
+            )
 
-        self.theme = BrickThemeList().get(self.fields.theme_id)
+            # Assign a unique ID to the set
+            brickset.fields.u_id = str(uuid4())
 
-        # Resolve instructions
+            # Insert into database
-        if self.resolve_instructions:
+            brickset.insert(commit=False)
-            # Not idead, avoiding cyclic import
-            from .instructions_list import BrickInstructionsList
 
-            if self.fields.set is not None:
+            if not current_app.config['USE_REMOTE_IMAGES'].value:
-                self.instructions = BrickInstructionsList().get(
+                RebrickableImage(brickset).download()
-                    self.fields.set
+
+            # Load the inventory
+            RebrickableParts(self.socket, brickset).download()
+
+            # Load the minifigures
+            RebrickableMinifigures(self.socket, brickset).download()
+
+            # Commit the transaction to the database
+            self.socket.auto_progress(
+                message='Set {number}: writing to the database'.format(
+                    number=brickset.fields.set_num
+                ),
+                increment_total=True,
+            )
+
+            BrickSQL().commit()
+
+            # Info
+            logger.info('Set {number}: imported (id: {id})'.format(
+                number=brickset.fields.set_num,
+                id=brickset.fields.u_id,
+            ))
+
+            # Complete
+            self.socket.complete(
+                message='Set {number}: imported (<a href="{url}">Go to the set</a>)'.format(  # noqa: E501
+                    number=brickset.fields.set_num,
+                    url=brickset.url()
+                ),
+                download=True
+            )
+
+        except Exception as e:
+            self.socket.fail(
+                message='Error while importing set {number}: {error}'.format(
+                    number=brickset.fields.set_num,
+                    error=e,
                 )
+            )
+
+            logger.debug(traceback.format_exc())
 
     # Load the set from Rebrickable
     def load(
         self,
         data: dict[str, Any],
         /,
-        *,
         from_download=False,
-    ) -> bool:
+    ) -> BrickSet | None:
         # Reset the progress
         self.socket.progress_count = 0
         self.socket.progress_total = 2
 
         try:
             self.socket.auto_progress(message='Parsing set number')
-            set = RebrickableSet.parse_number(str(data['set']))
+            set_num = RebrickableSet.parse_number(str(data['set_num']))
 
             self.socket.auto_progress(
-                message='Set {set}: loading from Rebrickable'.format(
+                message='Set {num}: loading from Rebrickable'.format(
-                    set=set,
+                    num=set_num,
                 ),
             )
 
-            logger.debug('rebrick.lego.get_set("{set}")'.format(
+            logger.debug('rebrick.lego.get_set("{set_num}")'.format(
-                set=set,
+                set_num=set_num,
             ))
 
-            Rebrickable[RebrickableSet](
+            brickset = Rebrickable[BrickSet](
                 'get_set',
-                set,
+                set_num,
-                RebrickableSet,
+                BrickSet,
-                instance=self,
             ).get()
 
-            self.socket.emit('SET_LOADED', self.short(
+            short = brickset.short()
-                from_download=from_download
+            short['download'] = from_download
-            ))
+
+            self.socket.emit('SET_LOADED', short)
 
             if not from_download:
                 self.socket.complete(
-                    message='Set {set}: loaded from Rebrickable'.format(
+                    message='Set {num}: loaded from Rebrickable'.format(
-                        set=self.fields.set
+                        num=brickset.fields.set_num
                     )
                 )
 
-            return True
+            return brickset
-
         except Exception as e:
             self.socket.fail(
                 message='Could not load the set from Rebrickable: {error}. Data: {data}'.format(  # noqa: E501
@@ -141,57 +154,12 @@ class RebrickableSet(BrickRecord):
             if not isinstance(e, (NotFoundException, ErrorException)):
                 logger.debug(traceback.format_exc())
 
-        return False
+        return None
-
-    # Return a short form of the Rebrickable set
-    def short(self, /, *, from_download: bool = False) -> dict[str, Any]:
-        return {
-            'download': from_download,
-            'image': self.fields.image,
-            'name': self.fields.name,
-            'set': self.fields.set,
-        }
-
-    # Compute the url for the set image
-    def url_for_image(self, /) -> str:
-        if not current_app.config['USE_REMOTE_IMAGES']:
-            return RebrickableImage.static_url(
-                self.fields.set,
-                'SETS_FOLDER'
-            )
-        else:
-            return self.fields.image
-
-    # Compute the url for the rebrickable page
-    def url_for_rebrickable(self, /) -> str:
-        if current_app.config['REBRICKABLE_LINKS']:
-            return self.fields.url
-
-        return ''
-
-    # Normalize from Rebrickable
-    @staticmethod
-    def from_rebrickable(data: dict[str, Any], /, **_) -> dict[str, Any]:
-        # Extracting version and number
-        number, _, version = str(data['set_num']).partition('-')
-
-        return {
-            'set': str(data['set_num']),
-            'number': int(number),
-            'version': int(version),
-            'name': str(data['name']),
-            'year': int(data['year']),
-            'theme_id': int(data['theme_id']),
-            'number_of_parts': int(data['num_parts']),
-            'image': str(data['set_img_url']),
-            'url': str(data['set_url']),
-            'last_modified': str(data['last_modified_dt']),
-        }
 
     # Make sense of the number from the data
     @staticmethod
-    def parse_number(set: str, /) -> str:
+    def parse_number(set_num: str, /) -> str:
-        number, _, version = set.partition('-')
+        number, _, version = set_num.partition('-')
 
         # Making sure both are integers
         if version == '':
@@ -223,3 +191,24 @@ class RebrickableSet(BrickRecord):
             ))
 
         return '{number}-{version}'.format(number=number, version=version)
+
+    # Wish from Rebrickable
+    # Redefine this one outside of the socket logic
+    @staticmethod
+    def wish(set_num: str) -> None:
+        set_num = RebrickableSet.parse_number(set_num)
+        logger.debug('rebrick.lego.get_set("{set_num}")'.format(
+            set_num=set_num,
+        ))
+
+        brickwish = Rebrickable[BrickWish](
+            'get_set',
+            set_num,
+            BrickWish,
+        ).get()
+
+        # Insert into database
+        brickwish.insert()
+
+        if not current_app.config['USE_REMOTE_IMAGES'].value:
+            RebrickableImage(brickwish).download()

bricktracker/rebrickable_set_list.py

@@ -1,21 +0,0 @@
-from typing import Self
-
-from .rebrickable_set import RebrickableSet
-from .record_list import BrickRecordList
-
-
-# All the rebrickable sets from the database
-class RebrickableSetList(BrickRecordList[RebrickableSet]):
-
-    # Queries
-    select_query: str = 'rebrickable/set/list'
-
-    # All the sets
-    def all(self, /) -> Self:
-        # Load the sets from the database
-        for record in self.select():
-            rebrickable_set = RebrickableSet(record=record)
-
-            self.records.append(rebrickable_set)
-
-        return self

bricktracker/record.py

@@ -1,5 +1,5 @@
 from sqlite3 import Row
-from typing import Any, ItemsView, Tuple
+from typing import Any, ItemsView
 
 from .fields import BrickRecordFields
 from .sql import BrickSQL
@@ -24,63 +24,33 @@ class BrickRecord(object):
 
     # Insert into the database
     # If we do not commit immediately, we defer the execute() call
-    def insert(
+    def insert(self, /, commit=True) -> None:
-        self,
-        /,
-        *,
-        commit=True,
-        no_defer=False,
-        override_query: str | None = None
-    ) -> Tuple[int, str]:
-        if override_query:
-            query = override_query
-        else:
-            query = self.insert_query
-
         database = BrickSQL()
         rows, q = database.execute(
-            query,
+            self.insert_query,
             parameters=self.sql_parameters(),
-            defer=not commit and not no_defer,
+            defer=not commit,
         )
 
         if commit:
             database.commit()
 
-        return rows, q
-
     # Shorthand to field items
     def items(self, /) -> ItemsView[str, Any]:
         return self.fields.__dict__.items()
 
     # Get from the database using the query
-    def select(
+    def select(self, /, override_query: str | None = None) -> Row | None:
-        self,
-        /,
-        *,
-        override_query: str | None = None,
-        **context: Any
-    ) -> bool:
         if override_query:
             query = override_query
         else:
             query = self.select_query
 
-        record = BrickSQL().fetchone(
+        return BrickSQL().fetchone(
             query,
-            parameters=self.sql_parameters(),
+            parameters=self.sql_parameters()
-            **context
         )
 
-        # Ingest the record
-        if record is not None:
-            self.ingest(record)
-
-            return True
-
-        else:
-            return False
-
     # Generic SQL parameters from fields
     def sql_parameters(self, /) -> dict[str, Any]:
         parameters: dict[str, Any] = {}

bricktracker/record_list.py

@@ -6,20 +6,10 @@ from .sql import BrickSQL
 if TYPE_CHECKING:
     from .minifigure import BrickMinifigure
     from .part import BrickPart
-    from .rebrickable_set import RebrickableSet
     from .set import BrickSet
-    from .set_checkbox import BrickSetCheckbox
     from .wish import BrickWish
 
-T = TypeVar(
+T = TypeVar('T', 'BrickSet', 'BrickPart', 'BrickMinifigure', 'BrickWish')
-    'T',
-    'BrickSet',
-    'BrickSetCheckbox',
-    'BrickPart',
-    'BrickMinifigure',
-    'BrickWish',
-    'RebrickableSet'
-)
 
 
 # SQLite records
@@ -42,11 +32,9 @@ class BrickRecordList(Generic[T]):
     def select(
         self,
         /,
-        *,
         override_query: str | None = None,
         order: str | None = None,
         limit: int | None = None,
-        **context: Any,
     ) -> list[Row]:
         # Select the query
         if override_query:
@@ -59,7 +47,6 @@ class BrickRecordList(Generic[T]):
             parameters=self.sql_parameters(),
             order=order,
             limit=limit,
-            **context
         )
 
     # Generic SQL parameters from fields
@@ -75,6 +62,6 @@ class BrickRecordList(Generic[T]):
         for record in self.records:
             yield record
 
-    # Make the list measurable
+    # Make the sets measurable
     def __len__(self, /) -> int:
         return len(self.records)

bricktracker/reload.py

@@ -1,23 +0,0 @@
-from .instructions_list import BrickInstructionsList
-from .retired_list import BrickRetiredList
-from .set_checkbox_list import BrickSetCheckboxList
-from .theme_list import BrickThemeList
-
-
-# Reload everything related to a database after an operation
-def reload() -> None:
-    # Failsafe
-    try:
-        # Reload the instructions
-        BrickInstructionsList(force=True)
-
-        # Reload the checkboxes
-        BrickSetCheckboxList(force=True)
-
-        # Reload retired sets
-        BrickRetiredList(force=True)
-
-        # Reload themes
-        BrickThemeList(force=True)
-    except Exception:
-        pass

bricktracker/retired_list.py

@@ -22,7 +22,7 @@ class BrickRetiredList(object):
     size: int | None
     exception: Exception | None
 
-    def __init__(self, /, *, force: bool = False):
+    def __init__(self, /, force: bool = False):
         # Load sets only if there is none already loaded
         retired = getattr(self, 'retired', None)
 
@@ -33,7 +33,7 @@ class BrickRetiredList(object):
 
             # Try to read the themes from a CSV file
             try:
-                with open(current_app.config['RETIRED_SETS_PATH'], newline='') as themes_file:  # noqa: E501
+                with open(current_app.config['RETIRED_SETS_PATH'].value, newline='') as themes_file:  # noqa: E501
                     themes_reader = csv.reader(themes_file)
 
                     # Ignore the header
@@ -44,7 +44,7 @@ class BrickRetiredList(object):
                         BrickRetiredList.retired[retired.number] = retired
 
                 # File stats
-                stat = os.stat(current_app.config['RETIRED_SETS_PATH'])
+                stat = os.stat(current_app.config['RETIRED_SETS_PATH'].value)
                 BrickRetiredList.size = stat.st_size
                 BrickRetiredList.mtime = datetime.fromtimestamp(stat.st_mtime, tz=timezone.utc)  # noqa: E501
 
@@ -79,7 +79,7 @@ class BrickRetiredList(object):
     def human_time(self) -> str:
         if self.mtime is not None:
             return self.mtime.astimezone(g.timezone).strftime(
-                current_app.config['FILE_DATETIME_FORMAT']
+                current_app.config['FILE_DATETIME_FORMAT'].value
             )
         else:
             return ''
@@ -88,7 +88,7 @@ class BrickRetiredList(object):
     @staticmethod
     def update() -> None:
         response = requests.get(
-            current_app.config['RETIRED_SETS_FILE_URL'],
+            current_app.config['RETIRED_SETS_FILE_URL'].value,
             stream=True,
         )
 
@@ -99,7 +99,7 @@ class BrickRetiredList(object):
 
         content = gzip.GzipFile(fileobj=response.raw)
 
-        with open(current_app.config['RETIRED_SETS_PATH'], 'wb') as f:
+        with open(current_app.config['RETIRED_SETS_PATH'].value, 'wb') as f:
             copyfileobj(content, f)
 
     logger.info('Retired sets list updated')

bricktracker/set.py

@@ -1,105 +1,70 @@
-import logging
+from sqlite3 import Row
-import traceback
 from typing import Any, Self
-from uuid import uuid4
 
-from flask import url_for
+from flask import current_app, url_for
 
 from .exceptions import DatabaseException, NotFoundException
+from .instructions import BrickInstructions
+from .instructions_list import BrickInstructionsList
 from .minifigure_list import BrickMinifigureList
 from .part_list import BrickPartList
-from .rebrickable_minifigures import RebrickableMinifigures
+from .rebrickable_image import RebrickableImage
-from .rebrickable_parts import RebrickableParts
+from .record import BrickRecord
-from .rebrickable_set import RebrickableSet
-from .set_checkbox import BrickSetCheckbox
-from .set_checkbox_list import BrickSetCheckboxList
 from .sql import BrickSQL
-
+from .theme_list import BrickThemeList
-logger = logging.getLogger(__name__)
 
 
 # Lego brick set
-class BrickSet(RebrickableSet):
+class BrickSet(BrickRecord):
+    instructions: list[BrickInstructions]
+    theme_name: str
+
     # Queries
-    select_query: str = 'set/select/full'
+    select_query: str = 'set/select'
-    light_query: str = 'set/select/light'
     insert_query: str = 'set/insert'
 
+    def __init__(
+        self,
+        /,
+        record: Row | dict[str, Any] | None = None,
+    ):
+        super().__init__()
+
+        # Placeholders
+        self.theme_name = ''
+        self.instructions = []
+
+        # Ingest the record if it has one
+        if record is not None:
+            self.ingest(record)
+
+            # Resolve the theme
+            self.resolve_theme()
+
+            # Check for the instructions
+            self.resolve_instructions()
+
     # Delete a set
     def delete(self, /) -> None:
-        BrickSQL().executescript(
+        database = BrickSQL()
-            'set/delete/set',
+        parameters = self.sql_parameters()
-            id=self.fields.id
-        )
 
-    # Import a set into the database
+        # Delete the set
-    def download(self, data: dict[str, Any], /) -> None:
+        database.execute('set/delete/set', parameters=parameters)
-        # Load the set
-        if not self.load(data, from_download=True):
-            return
 
-        try:
+        # Delete the minifigures
-            # Insert into the database
+        database.execute(
-            self.socket.auto_progress(
+            'minifigure/delete/all_from_set', parameters=parameters)
-                message='Set {number}: inserting into database'.format(
-                    number=self.fields.set
-                ),
-                increment_total=True,
-            )
 
-            # Generate an UUID for self
+        # Delete the parts
-            self.fields.id = str(uuid4())
+        database.execute(
+            'part/delete/all_from_set', parameters=parameters)
 
-            # Insert into database
+        # Delete missing parts
-            self.insert(commit=False)
+        database.execute('missing/delete/all_from_set', parameters=parameters)
 
-            # Execute the parent download method
+        # Commit to the database
-            self.download_rebrickable()
+        database.commit()
-
-            # Load the inventory
-            RebrickableParts(self.socket, self).download()
-
-            # Load the minifigures
-            RebrickableMinifigures(self.socket, self).download()
-
-            # Commit the transaction to the database
-            self.socket.auto_progress(
-                message='Set {number}: writing to the database'.format(
-                    number=self.fields.set
-                ),
-                increment_total=True,
-            )
-
-            BrickSQL().commit()
-
-            # Info
-            logger.info('Set {number}: imported (id: {id})'.format(
-                number=self.fields.set,
-                id=self.fields.id,
-            ))
-
-            # Complete
-            self.socket.complete(
-                message='Set {number}: imported (<a href="{url}">Go to the set</a>)'.format(  # noqa: E501
-                    number=self.fields.set,
-                    url=self.url()
-                ),
-                download=True
-            )
-
-        except Exception as e:
-            self.socket.fail(
-                message='Error while importing set {number}: {error}'.format(
-                    number=self.fields.set,
-                    error=e,
-                )
-            )
-
-            logger.debug(traceback.format_exc())
-
-    # Insert a Rebrickable set
-    def insert_rebrickable(self, /) -> None:
-        self.insert()
 
     # Minifigures
     def minifigures(self, /) -> BrickMinifigureList:
@@ -109,81 +74,145 @@ class BrickSet(RebrickableSet):
     def parts(self, /) -> BrickPartList:
         return BrickPartList().load(self)
 
-    # Select a light set (with an id)
+    # Add instructions to the set
-    def select_light(self, id: str, /) -> Self:
+    def resolve_instructions(self, /) -> None:
+        if self.fields.set_num is not None:
+            self.instructions = BrickInstructionsList().get(
+                self.fields.set_num
+            )
+
+    # Add a theme to the set
+    def resolve_theme(self, /) -> None:
+        try:
+            id = self.fields.theme_id
+        except Exception:
+            id = 0
+
+        theme = BrickThemeList().get(id)
+        self.theme_name = theme.name
+
+    # Return a short form of the set
+    def short(self, /) -> dict[str, Any]:
+        return {
+            'name': self.fields.name,
+            'set_img_url': self.fields.set_img_url,
+            'set_num': self.fields.set_num,
+        }
+
+    # Select a specific part (with a set and an id)
+    def select_specific(self, u_id: str, /) -> Self:
         # Save the parameters to the fields
-        self.fields.id = id
+        self.fields.u_id = u_id
 
         # Load from database
-        if not self.select(override_query=self.light_query):
+        record = self.select()
+
+        if record is None:
             raise NotFoundException(
                 'Set with ID {id} was not found in the database'.format(
-                    id=self.fields.id,
+                    id=self.fields.u_id,
                 ),
             )
 
-        return self
+        # Ingest the record
+        self.ingest(record)
 
-    # Select a specific set (with an id)
+        # Resolve the theme
-    def select_specific(self, id: str, /) -> Self:
+        self.resolve_theme()
-        # Save the parameters to the fields
-        self.fields.id = id
 
-        # Load from database
+        # Check for the instructions
-        if not self.select(
+        self.resolve_instructions()
-            statuses=BrickSetCheckboxList().as_columns(solo=True)
-        ):
-            raise NotFoundException(
-                'Set with ID {id} was not found in the database'.format(
-                    id=self.fields.id,
-                ),
-            )
 
         return self
 
-    # Update a status
+    # Update a checked state
-    def update_status(
+    def update_checked(self, name: str, status: bool, /) -> None:
-        self,
-        checkbox: BrickSetCheckbox,
-        status: bool,
-        /
-    ) -> None:
         parameters = self.sql_parameters()
         parameters['status'] = status
 
-        # Update the status
+        # Update the checked status
         rows, _ = BrickSQL().execute_and_commit(
-            'set/update/status',
+            'set/update_checked',
             parameters=parameters,
-            name=checkbox.as_column(),
+            name=name,
         )
 
         if rows != 1:
-            raise DatabaseException('Could not update the status "{status}" for set {number} ({id})'.format(  # noqa: E501
+            raise DatabaseException('Could not update the status {status} for set {number}'.format(  # noqa: E501
-                status=checkbox.fields.name,
+                status=name,
-                number=self.fields.set,
+                number=self.fields.set_num,
-                id=self.fields.id,
             ))
 
     # Self url
     def url(self, /) -> str:
-        return url_for('set.details', id=self.fields.id)
+        return url_for('set.details', id=self.fields.u_id)
 
     # Deletion url
     def url_for_delete(self, /) -> str:
-        return url_for('set.delete', id=self.fields.id)
+        return url_for('set.delete', id=self.fields.u_id)
 
     # Actual deletion url
     def url_for_do_delete(self, /) -> str:
-        return url_for('set.do_delete', id=self.fields.id)
+        return url_for('set.do_delete', id=self.fields.u_id)
+
+    # Compute the url for the set image
+    def url_for_image(self, /) -> str:
+        if not current_app.config['USE_REMOTE_IMAGES'].value:
+            return RebrickableImage.static_url(
+                self.fields.set_num,
+                'SETS_FOLDER'
+            )
+        else:
+            return self.fields.set_img_url
 
     # Compute the url for the set instructions
     def url_for_instructions(self, /) -> str:
         if len(self.instructions):
             return url_for(
                 'set.details',
-                id=self.fields.id,
+                id=self.fields.u_id,
                 open_instructions=True
             )
         else:
             return ''
+
+    # Check minifigure collected url
+    def url_for_minifigures_collected(self, /) -> str:
+        return url_for('set.minifigures_collected', id=self.fields.u_id)
+
+    # Compute the url for the rebrickable page
+    def url_for_rebrickable(self, /) -> str:
+        if current_app.config['REBRICKABLE_LINKS'].value:
+            try:
+                return current_app.config['REBRICKABLE_LINK_SET_PATTERN'].value.format(  # noqa: E501
+                    number=self.fields.set_num.lower(),
+                )
+            except Exception:
+                pass
+
+        return ''
+
+    # Check set checked url
+    def url_for_set_checked(self, /) -> str:
+        return url_for('set.set_checked', id=self.fields.u_id)
+
+    # Check set collected url
+    def url_for_set_collected(self, /) -> str:
+        return url_for('set.set_collected', id=self.fields.u_id)
+
+    # Normalize from Rebrickable
+    @staticmethod
+    def from_rebrickable(data: dict[str, Any], /, **_) -> dict[str, Any]:
+        return {
+            'set_num': data['set_num'],
+            'name': data['name'],
+            'year': data['year'],
+            'theme_id': data['theme_id'],
+            'num_parts': data['num_parts'],
+            'set_img_url': data['set_img_url'],
+            'set_url': data['set_url'],
+            'last_modified_dt': data['last_modified_dt'],
+            'mini_col': False,
+            'set_col': False,
+            'set_check': False,
+        }

bricktracker/set_checkbox.py

@@ -1,142 +0,0 @@
-from sqlite3 import Row
-from typing import Any, Self, Tuple
-from uuid import uuid4
-
-from flask import url_for
-
-from .exceptions import DatabaseException, ErrorException, NotFoundException
-from .record import BrickRecord
-from .sql import BrickSQL
-
-
-# Lego set checkbox
-class BrickSetCheckbox(BrickRecord):
-    # Queries
-    select_query: str = 'checkbox/select'
-
-    def __init__(
-        self,
-        /,
-        *,
-        record: Row | dict[str, Any] | None = None,
-    ):
-        super().__init__()
-
-        # Ingest the record if it has one
-        if record is not None:
-            self.ingest(record)
-
-    # SQL column name
-    def as_column(self) -> str:
-        return 'status_{id}'.format(id=self.fields.id)
-
-    # HTML dataset name
-    def as_dataset(self) -> str:
-        return '{id}'.format(
-            id=self.as_column().replace('_', '-')
-        )
-
-    # Delete from database
-    def delete(self) -> None:
-        BrickSQL().executescript(
-            'checkbox/delete',
-            id=self.fields.id,
-        )
-
-    # Grab data from a form
-    def from_form(self, form: dict[str, str]) -> Self:
-        name = form.get('name', None)
-        grid = form.get('grid', None)
-
-        if name is None or name == '':
-            raise ErrorException('Checkbox name cannot be empty')
-
-        # Security: eh.
-        # Prevent self-ownage with accidental quote escape
-        self.fields.name = name
-        self.fields.safe_name = self.fields.name.replace("'", "''")
-        self.fields.displayed_on_grid = grid == 'on'
-
-        return self
-
-    # Insert into database
-    def insert(self, **_) -> Tuple[int, str]:
-        # Generate an ID for the checkbox (with underscores to make it
-        # column name friendly)
-        self.fields.id = str(uuid4()).replace('-', '_')
-
-        BrickSQL().executescript(
-            'checkbox/add',
-            id=self.fields.id,
-            name=self.fields.safe_name,
-            displayed_on_grid=self.fields.displayed_on_grid
-        )
-
-        # To accomodate the parent().insert we have overriden
-        return 0, ''
-
-    # Rename the checkbox
-    def rename(self, /) -> None:
-        # Update the name
-        rows, _ = BrickSQL().execute_and_commit(
-            'checkbox/update/name',
-            parameters=self.sql_parameters(),
-        )
-
-        if rows != 1:
-            raise DatabaseException('Could not update the name for checkbox {name} ({id})'.format(  # noqa: E501
-                name=self.fields.name,
-                id=self.fields.id,
-            ))
-
-    # URL to change the status
-    def status_url(self, id: str) -> str:
-        return url_for(
-            'set.update_status',
-            id=id,
-            checkbox_id=self.fields.id
-        )
-
-    # Select a specific checkbox (with an id)
-    def select_specific(self, id: str, /) -> Self:
-        # Save the parameters to the fields
-        self.fields.id = id
-
-        # Load from database
-        if not self.select():
-            raise NotFoundException(
-                'Checkbox with ID {id} was not found in the database'.format(
-                    id=self.fields.id,
-                ),
-            )
-
-        return self
-
-    # Update a status
-    def update_status(
-        self,
-        name: str,
-        status: bool,
-        /
-    ) -> None:
-        if not hasattr(self.fields, name) or name in ['id', 'name']:
-            raise NotFoundException('{name} is not a field of a checkbox'.format(  # noqa: E501
-                name=name
-            ))
-
-        parameters = self.sql_parameters()
-        parameters['status'] = status
-
-        # Update the status
-        rows, _ = BrickSQL().execute_and_commit(
-            'checkbox/update/status',
-            parameters=parameters,
-            name=name,
-        )
-
-        if rows != 1:
-            raise DatabaseException('Could not update the status "{status}" for checkbox {name} ({id})'.format(  # noqa: E501
-                status=name,
-                name=self.fields.name,
-                id=self.fields.id,
-            ))

bricktracker/set_checkbox_list.py

@@ -1,74 +0,0 @@
-import logging
-
-from .exceptions import NotFoundException
-from .fields import BrickRecordFields
-from .record_list import BrickRecordList
-from .set_checkbox import BrickSetCheckbox
-
-logger = logging.getLogger(__name__)
-
-
-# Lego sets checkbox list
-class BrickSetCheckboxList(BrickRecordList[BrickSetCheckbox]):
-    checkboxes: dict[str, BrickSetCheckbox]
-
-    # Queries
-    select_query = 'checkbox/list'
-
-    def __init__(self, /, *, force: bool = False):
-        # Load checkboxes only if there is none already loaded
-        records = getattr(self, 'records', None)
-
-        if records is None or force:
-            # Don't use super()__init__ as it would mask class variables
-            self.fields = BrickRecordFields()
-
-            logger.info('Loading set checkboxes list')
-
-            BrickSetCheckboxList.records = []
-            BrickSetCheckboxList.checkboxes = {}
-
-            # Load the checkboxes from the database
-            for record in self.select():
-                checkbox = BrickSetCheckbox(record=record)
-
-                BrickSetCheckboxList.records.append(checkbox)
-                BrickSetCheckboxList.checkboxes[checkbox.fields.id] = checkbox
-
-    # Return the checkboxes as columns for a select
-    def as_columns(
-        self,
-        /,
-        *,
-        solo: bool = False,
-        table: str = 'bricktracker_set_statuses'
-    ) -> str:
-        return ', '.join([
-            '"{table}"."{column}"'.format(
-                table=table,
-                column=record.as_column(),
-            )
-            for record
-            in self.records
-            if solo or record.fields.displayed_on_grid
-        ])
-
-    # Grab a specific checkbox
-    def get(self, id: str, /) -> BrickSetCheckbox:
-        if id not in self.checkboxes:
-            raise NotFoundException(
-                'Checkbox with ID {id} was not found in the database'.format(
-                    id=self.fields.id,
-                ),
-            )
-
-        return self.checkboxes[id]
-
-    # Get the list of checkboxes depending on the context
-    def list(self, /, *, all: bool = False) -> list[BrickSetCheckbox]:
-        return [
-            record
-            for record
-            in self.records
-            if all or record.fields.displayed_on_grid
-        ]

bricktracker/set_list.py

@@ -3,7 +3,6 @@ from typing import Self
 from flask import current_app
 
 from .record_list import BrickRecordList
-from .set_checkbox_list import BrickSetCheckboxList
 from .set import BrickSet
 
 
@@ -14,7 +13,6 @@ class BrickSetList(BrickRecordList[BrickSet]):
 
     # Queries
     generic_query: str = 'set/list/generic'
-    light_query: str = 'set/list/light'
     missing_minifigure_query: str = 'set/list/missing_minifigure'
     missing_part_query: str = 'set/list/missing_part'
     select_query: str = 'set/list/all'
@@ -28,21 +26,18 @@ class BrickSetList(BrickRecordList[BrickSet]):
         self.themes = []
 
         # Store the order for this list
-        self.order = current_app.config['SETS_DEFAULT_ORDER']
+        self.order = current_app.config['SETS_DEFAULT_ORDER'].value
 
     # All the sets
     def all(self, /) -> Self:
         themes = set()
 
         # Load the sets from the database
-        for record in self.select(
+        for record in self.select(order=self.order):
-            order=self.order,
-            statuses=BrickSetCheckboxList().as_columns()
-        ):
             brickset = BrickSet(record=record)
 
             self.records.append(brickset)
-            themes.add(brickset.theme.name)
+            themes.add(brickset.theme_name)
 
         # Convert the set into a list and sort it
         self.themes = list(themes)
@@ -63,18 +58,14 @@ class BrickSetList(BrickRecordList[BrickSet]):
         return self
 
     # Last added sets
-    def last(self, /, *, limit: int = 6) -> Self:
+    def last(self, /, limit: int = 6) -> Self:
         # Randomize
-        if current_app.config['RANDOM']:
+        if current_app.config['RANDOM'].value:
             order = 'RANDOM()'
         else:
-            order = '"bricktracker_sets"."rowid" DESC'
+            order = 'sets.rowid DESC'
 
-        for record in self.select(
+        for record in self.select(order=order, limit=limit):
-            order=order,
-            limit=limit,
-            statuses=BrickSetCheckboxList().as_columns()
-        ):
             brickset = BrickSet(record=record)
 
             self.records.append(brickset)
@@ -85,7 +76,7 @@ class BrickSetList(BrickRecordList[BrickSet]):
     def missing_minifigure(
         self,
         fig_num: str,
-        /
+        /,
     ) -> Self:
         # Save the parameters to the fields
         self.fields.fig_num = fig_num
@@ -107,7 +98,6 @@ class BrickSetList(BrickRecordList[BrickSet]):
         part_num: str,
         color_id: int,
         /,
-        *,
         element_id: int | None = None,
     ) -> Self:
         # Save the parameters to the fields
@@ -130,7 +120,7 @@ class BrickSetList(BrickRecordList[BrickSet]):
     def using_minifigure(
         self,
         fig_num: str,
-        /
+        /,
     ) -> Self:
         # Save the parameters to the fields
         self.fields.fig_num = fig_num
@@ -152,7 +142,6 @@ class BrickSetList(BrickRecordList[BrickSet]):
         part_num: str,
         color_id: int,
         /,
-        *,
         element_id: int | None = None,
     ) -> Self:
         # Save the parameters to the fields

bricktracker/socket.py

@@ -6,7 +6,7 @@ from flask_socketio import SocketIO
 
 from .configuration_list import BrickConfigurationList
 from .login import LoginManager
-from .set import BrickSet
+from .rebrickable_set import RebrickableSet
 from .sql import close as sql_close
 
 logger = logging.getLogger(__name__)
@@ -56,19 +56,19 @@ class BrickSocket(object):
 
         # Compute the namespace
         self.namespace = '/{namespace}'.format(
-            namespace=app.config['SOCKET_NAMESPACE']
+            namespace=app.config['SOCKET_NAMESPACE'].value
         )
 
         # Inject CORS if a domain is defined
-        if app.config['DOMAIN_NAME'] != '':
+        if app.config['DOMAIN_NAME'].value != '':
-            kwargs['cors_allowed_origins'] = app.config['DOMAIN_NAME']
+            kwargs['cors_allowed_origins'] = app.config['DOMAIN_NAME'].value
 
         # Instantiate the socket
         self.socket = SocketIO(
             self.app,
             *args,
             **kwargs,
-            path=app.config['SOCKET_PATH'],
+            path=app.config['SOCKET_PATH'].value,
             async_mode='eventlet',
         )
 
@@ -98,7 +98,7 @@ class BrickSocket(object):
                 self.fail(message=str(e))
                 return
 
-            brickset = BrickSet(socket=self)
+            brickset = RebrickableSet(self)
 
             # Start it in a thread if requested
             if self.threaded:
@@ -124,7 +124,7 @@ class BrickSocket(object):
                 self.fail(message=str(e))
                 return
 
-            brickset = BrickSet(socket=self)
+            brickset = RebrickableSet(self)
 
             # Start it in a thread if requested
             if self.threaded:
@@ -140,7 +140,6 @@ class BrickSocket(object):
     def auto_progress(
         self,
         /,
-        *,
         message: str | None = None,
         increment_total=False,
     ) -> None:
@@ -204,7 +203,7 @@ class BrickSocket(object):
         sql_close()
 
     # Update the progress
-    def progress(self, /, *, message: str | None = None) -> None:
+    def progress(self, /, message: str | None = None) -> None:
         # Save the las message
         if message is not None:
             self.progress_message = message
@@ -219,14 +218,14 @@ class BrickSocket(object):
         self.emit('PROGRESS', data)
 
     # Update the progress total only
-    def update_total(self, total: int, /, *, add: bool = False) -> None:
+    def update_total(self, total: int, /, add: bool = False) -> None:
         if add:
             self.progress_total += total
         else:
             self.progress_total = total
 
     # Update the total
-    def total_progress(self, total: int, /, *, add: bool = False) -> None:
+    def total_progress(self, total: int, /, add: bool = False) -> None:
         self.update_total(total, add=add)
 
         self.progress()

bricktracker/sql.py

@@ -1,46 +1,33 @@
 import logging
 import os
 import sqlite3
-from typing import Any, Final, Tuple
+from typing import Any, Tuple
+
+from .sql_stats import BrickSQLStats
 
 from flask import current_app, g
 from jinja2 import Environment, FileSystemLoader
 from werkzeug.datastructures import FileStorage
 
-from .exceptions import DatabaseException
-from .sql_counter import BrickCounter
-from .sql_migration_list import BrickSQLMigrationList
-from .sql_stats import BrickSQLStats
-from .version import __database_version__
-
 logger = logging.getLogger(__name__)
 
-G_CONNECTION: Final[str] = 'database_connection'
-G_ENVIRONMENT: Final[str] = 'database_environment'
-G_DEFER: Final[str] = 'database_defer'
-G_STATS: Final[str] = 'database_stats'
-
 
 # SQLite3 client with our extra features
 class BrickSQL(object):
     connection: sqlite3.Connection
     cursor: sqlite3.Cursor
     stats: BrickSQLStats
-    version: int
 
-    def __init__(self, /, *, failsafe: bool = False):
+    def __init__(self, /):
         # Instantiate the database connection in the Flask
         # application context so that it can be used by all
         # requests without re-opening connections
-        connection = getattr(g, G_CONNECTION, None)
+        database = getattr(g, 'database', None)
 
         # Grab the existing connection if it exists
-        if connection is not None:
+        if database is not None:
-            self.connection = connection
+            self.connection = database
-            self.stats = getattr(g, G_STATS, BrickSQLStats())
+            self.stats = getattr(g, 'database_stats', BrickSQLStats())
-
-            # Grab a cursor
-            self.cursor = self.connection.cursor()
         else:
             # Instantiate the stats
             self.stats = BrickSQLStats()
@@ -50,54 +37,26 @@ class BrickSQL(object):
 
             logger.debug('SQLite3: connect')
             self.connection = sqlite3.connect(
-                current_app.config['DATABASE_PATH']
+                current_app.config['DATABASE_PATH'].value
             )
 
             # Setup the row factory to get pseudo-dicts rather than tuples
             self.connection.row_factory = sqlite3.Row
 
-            # Grab a cursor
-            self.cursor = self.connection.cursor()
-
-            # Grab the version and check
-            try:
-                version = self.fetchone('schema/get_version')
-
-                if version is None:
-                    raise Exception('version is None')
-
-                self.version = version[0]
-            except Exception as e:
-                self.version = 0
-
-                raise DatabaseException('Could not get the database version: {error}'.format(  # noqa: E501
-                    error=str(e)
-                ))
-
-            if self.upgrade_too_far():
-                raise DatabaseException('Your database version ({version}) is too far ahead for this version of the application. Expected at most {required}'.format(  # noqa: E501
-                    version=self.version,
-                    required=__database_version__,
-                ))
-
             # Debug: Attach the debugger
             # Uncomment manually because this is ultra verbose
             # self.connection.set_trace_callback(print)
 
             # Save the connection globally for later use
-            setattr(g, G_CONNECTION, self.connection)
+            g.database = self.connection
-            setattr(g, G_STATS, self.stats)
+            g.database_stats = self.stats
 
-            if not failsafe:
+        # Grab a cursor
-                if self.upgrade_needed():
+        self.cursor = self.connection.cursor()
-                    raise DatabaseException('Your database need to be upgraded from version {version} to version {required}'.format(  # noqa: E501
-                        version=self.version,
-                        required=__database_version__,
-                    ))
 
     # Clear the defer stack
     def clear_defer(self, /) -> None:
-        setattr(g, G_DEFER, [])
+        g.database_defer = []
 
     # Shorthand to commit
     def commit(self, /) -> None:
@@ -113,27 +72,6 @@ class BrickSQL(object):
         logger.debug('SQLite3: commit')
         return self.connection.commit()
 
-    # Count the database records
-    def count_records(self) -> list[BrickCounter]:
-        counters: list[BrickCounter] = []
-
-        # Get all tables
-        for table in self.fetchall('schema/tables'):
-            counter = BrickCounter(table['name'])
-
-            # Failsafe this one
-            try:
-                record = self.fetchone('schema/count', table=counter.table)
-
-                if record is not None:
-                    counter.count = record['count']
-            except Exception:
-                pass
-
-            counters.append(counter)
-
-        return counters
-
     # Defer a call to execute
     def defer(self, query: str, parameters: dict[str, Any], /):
         defer = self.get_defer()
@@ -144,17 +82,16 @@ class BrickSQL(object):
         defer.append((query, parameters))
 
         # Save the defer stack
-        setattr(g, G_DEFER, defer)
+        g.database_defer = defer
 
     # Shorthand to execute, returning number of affected rows
     def execute(
         self,
         query: str,
         /,
-        *,
         parameters: dict[str, Any] = {},
         defer: bool = False,
-        **context: Any,
+        **context,
     ) -> Tuple[int, str]:
         # Stats: execute
         self.stats.execute += 1
@@ -177,7 +114,7 @@ class BrickSQL(object):
             return result.rowcount, query
 
     # Shorthand to executescript
-    def executescript(self, query: str, /, **context: Any) -> None:
+    def executescript(self, query: str, /, **context) -> None:
         # Load the query
         query = self.load_query(query, **context)
 
@@ -192,9 +129,8 @@ class BrickSQL(object):
         self,
         query: str,
         /,
-        *,
         parameters: dict[str, Any] = {},
-        **context: Any,
+        **context,
     ) -> Tuple[int, str]:
         rows, query = self.execute(query, parameters=parameters, **context)
         self.commit()
@@ -206,9 +142,8 @@ class BrickSQL(object):
         self,
         query: str,
         /,
-        *,
         parameters: dict[str, Any] = {},
-        **context: Any,
+        **context,
     ) -> list[sqlite3.Row]:
         _, query = self.execute(query, parameters=parameters, **context)
 
@@ -228,9 +163,8 @@ class BrickSQL(object):
         self,
         query: str,
         /,
-        *,
         parameters: dict[str, Any] = {},
-        **context: Any,
+        **context,
     ) -> sqlite3.Row | None:
         _, query = self.execute(query, parameters=parameters, **context)
 
@@ -248,18 +182,21 @@ class BrickSQL(object):
 
     # Grab the defer stack
     def get_defer(self, /) -> list[Tuple[str, dict[str, Any]]]:
-        defer: list[Tuple[str, dict[str, Any]]] = getattr(g, G_DEFER, [])
+        defer: list[Tuple[str, dict[str, Any]]] = getattr(
+            g,
+            'database_defer',
+            []
+        )
 
         return defer
 
     # Load a query by name
-    def load_query(self, name: str, /, **context: Any) -> str:
+    def load_query(self, name: str, /, **context) -> str:
         # Grab the existing environment if it exists
-        environment = getattr(g, G_ENVIRONMENT, None)
+        environment = getattr(g, 'database_loader', None)
 
         # Instantiate Jinja environment for SQL files
         if environment is None:
-            logger.debug('SQLite3: instantiating the Jinja loader')
             environment = Environment(
                 loader=FileSystemLoader(
                     os.path.join(os.path.dirname(__file__), 'sql/')
@@ -267,10 +204,10 @@ class BrickSQL(object):
             )
 
             # Save the environment globally for later use
-            setattr(g, G_ENVIRONMENT, environment)
+            g.database_environment = environment
 
         # Grab the template
-        logger.debug('SQLite3: loading {name} (context: {context})'.format(
+        logger.debug('SQLite: loading {name} (context: {context})'.format(
             name=name,
             context=context,
         ))
@@ -284,8 +221,7 @@ class BrickSQL(object):
     def raw_execute(
         self,
         query: str,
-        parameters: dict[str, Any],
+        parameters: dict[str, Any]
-        /
     ) -> sqlite3.Cursor:
         logger.debug('SQLite3: execute: {query}'.format(
             query=BrickSQL.clean_query(query)
@@ -293,25 +229,6 @@ class BrickSQL(object):
 
         return self.cursor.execute(query, parameters)
 
-    # Upgrade the database
-    def upgrade(self) -> None:
-        if self.upgrade_needed():
-            for pending in BrickSQLMigrationList().pending(self.version):
-                logger.info('Applying migration {version}'.format(
-                    version=pending.version)
-                )
-
-                self.executescript(pending.get_query())
-                self.execute('schema/set_version', version=pending.version)
-
-    # Tells whether the database needs upgrade
-    def upgrade_needed(self) -> bool:
-        return self.version < __database_version__
-
-    # Tells whether the database is too far
-    def upgrade_too_far(self) -> bool:
-        return self.version > __database_version__
-
     # Clean the query for debugging
     @staticmethod
     def clean_query(query: str, /) -> str:
@@ -332,7 +249,7 @@ class BrickSQL(object):
     # Delete the database
     @staticmethod
     def delete() -> None:
-        os.remove(current_app.config['DATABASE_PATH'])
+        os.remove(current_app.config['DATABASE_PATH'].value)
 
         # Info
         logger.info('The database has been deleted')
@@ -345,10 +262,37 @@ class BrickSQL(object):
         # Info
         logger.info('The database has been dropped')
 
+    # Count the database records
+    @staticmethod
+    def count_records() -> dict[str, int]:
+        database = BrickSQL()
+
+        counters: dict[str, int] = {}
+        for table in ['sets', 'minifigures', 'inventory', 'missing']:
+            record = database.fetchone('schema/count', table=table)
+
+            if record is not None:
+                counters[table] = record['count']
+
+        return counters
+
+    # Initialize the database
+    @staticmethod
+    def initialize() -> None:
+        BrickSQL().executescript('migrations/init')
+
+        # Info
+        logger.info('The database has been initialized')
+
+    # Check if the database is initialized
+    @staticmethod
+    def is_init() -> bool:
+        return BrickSQL().fetchone('schema/is_init') is not None
+
     # Replace the database with a new file
     @staticmethod
     def upload(file: FileStorage, /) -> None:
-        file.save(current_app.config['DATABASE_PATH'])
+        file.save(current_app.config['DATABASE_PATH'].value)
 
         # Info
         logger.info('The database has been imported using file {file}'.format(
@@ -358,11 +302,11 @@ class BrickSQL(object):
 
 # Close all existing SQLite3 connections
 def close() -> None:
-    connection: sqlite3.Connection | None = getattr(g, G_CONNECTION, None)
+    database: sqlite3.Connection | None = getattr(g, 'database', None)
 
-    if connection is not None:
+    if database is not None:
         logger.debug('SQLite3: close')
-        connection.close()
+        database.close()
 
         # Remove the database from the context
-        delattr(g, G_CONNECTION)
+        delattr(g, 'database')

bricktracker/sql/checkbox/add.sql

@@ -1,16 +0,0 @@
-BEGIN TRANSACTION;
-
-ALTER TABLE "bricktracker_set_statuses"
-ADD COLUMN "status_{{ id }}" BOOLEAN NOT NULL DEFAULT 0;
-
-INSERT INTO "bricktracker_set_checkboxes" (
-    "id",
-    "name",
-    "displayed_on_grid"
-) VALUES (
-    '{{ id }}',
-    '{{ name }}',
-    {{ displayed_on_grid }}
-);
-
-COMMIT;

bricktracker/sql/checkbox/base.sql

@@ -1,7 +0,0 @@
-SELECT
-    "bricktracker_set_checkboxes"."id",
-    "bricktracker_set_checkboxes"."name",
-    "bricktracker_set_checkboxes"."displayed_on_grid"
-FROM "bricktracker_set_checkboxes"
-
-{% block where %}{% endblock %}

bricktracker/sql/checkbox/delete.sql

@@ -1,9 +0,0 @@
-BEGIN TRANSACTION;
-
-ALTER TABLE "bricktracker_set_statuses"
-DROP COLUMN "status_{{ id }}";
-
-DELETE FROM "bricktracker_set_checkboxes"
-WHERE "bricktracker_set_checkboxes"."id" IS NOT DISTINCT FROM '{{ id }}';
-
-COMMIT;

bricktracker/sql/checkbox/list.sql

@@ -1 +0,0 @@
-{% extends 'checkbox/base.sql' %}

bricktracker/sql/checkbox/select.sql

@@ -1,5 +0,0 @@
-{% extends 'checkbox/base.sql' %}
-
-{% block where %}
-WHERE "bricktracker_set_checkboxes"."id" IS NOT DISTINCT FROM :id
-{% endblock %}

bricktracker/sql/checkbox/update/name.sql

@@ -1,3 +0,0 @@
-UPDATE "bricktracker_set_checkboxes"
-SET "name" = :safe_name
-WHERE "bricktracker_set_checkboxes"."id" IS NOT DISTINCT FROM :id

bricktracker/sql/checkbox/update/status.sql

@@ -1,3 +0,0 @@
-UPDATE "bricktracker_set_checkboxes"
-SET "{{name}}" = :status
-WHERE "bricktracker_set_checkboxes"."id" IS NOT DISTINCT FROM :id

bricktracker/sql/migrations/0001.sql

@@ -1,66 +0,0 @@
--- description: Original database initialization
--- FROM sqlite3 app.db .schema > init.sql with extra IF NOT EXISTS, transaction and quotes
-BEGIN TRANSACTION;
-
-CREATE TABLE IF NOT EXISTS "wishlist" (
-    "set_num" TEXT,
-    "name" TEXT,
-    "year" INTEGER,
-    "theme_id" INTEGER,
-    "num_parts" INTEGER,
-    "set_img_url" TEXT,
-    "set_url" TEXT,
-    "last_modified_dt" TEXT
-);
-
-CREATE TABLE IF NOT EXISTS "sets" (
-    "set_num" TEXT,
-    "name" TEXT,
-    "year" INTEGER,
-    "theme_id" INTEGER,
-    "num_parts" INTEGER,
-    "set_img_url" TEXT,
-    "set_url" TEXT,
-    "last_modified_dt" TEXT,
-    "mini_col" BOOLEAN,
-    "set_check" BOOLEAN,
-    "set_col" BOOLEAN,
-    "u_id" TEXT
-);
-
-CREATE TABLE IF NOT EXISTS "inventory" (
-    "set_num" TEXT,
-    "id" INTEGER,
-    "part_num" TEXT,
-    "name" TEXT,
-    "part_img_url" TEXT,
-    "part_img_url_id" TEXT,
-    "color_id" INTEGER,
-    "color_name" TEXT,
-    "quantity" INTEGER,
-    "is_spare" BOOLEAN,
-    "element_id" INTEGER,
-    "u_id" TEXT
-);
-
-CREATE TABLE IF NOT EXISTS "minifigures" (
-    "fig_num" TEXT,
-    "set_num" TEXT,
-    "name" TEXT,
-    "quantity" INTEGER,
-    "set_img_url" TEXT,
-    "u_id" TEXT
-);
-
-CREATE TABLE IF NOT EXISTS "missing" (
-    "set_num" TEXT,
-    "id" INTEGER,
-    "part_num" TEXT,
-    "part_img_url_id" TEXT,
-    "color_id" INTEGER,
-    "quantity" INTEGER,
-    "element_id" INTEGER,
-    "u_id" TEXT
-);
-
-COMMIT;

bricktracker/sql/migrations/0002.sql

@@ -1,13 +0,0 @@
--- description: WAL journal, 'None' fix for missing table
-
--- Set the journal mode to WAL
-PRAGMA journal_mode = WAL;
-
-BEGIN TRANSACTION;
-
--- Fix a bug where 'None' was inserted in missing instead of NULL
-UPDATE "missing"
-SET "element_id" = NULL
-WHERE "missing"."element_id" = 'None';
-
-COMMIT;

bricktracker/sql/migrations/0003.sql

@@ -1,48 +0,0 @@
--- description: Creation of the deduplicated table of Rebrickable sets
-
-BEGIN TRANSACTION;
-
--- Create a Rebrickable set table: each unique set imported from Rebrickable
-CREATE TABLE "rebrickable_sets" (
-    "set" TEXT NOT NULL,
-    "number" INTEGER NOT NULL,
-    "version" INTEGER NOT NULL,
-    "name" TEXT NOT NULL,
-    "year" INTEGER NOT NULL,
-    "theme_id" INTEGER NOT NULL,
-    "number_of_parts" INTEGER NOT NULL,
-    "image" TEXT,
-    "url" TEXT,
-    "last_modified" TEXT,
-    PRIMARY KEY("set")
-);
-
--- Insert existing sets into the new table
-INSERT INTO "rebrickable_sets" (
-    "set",
-    "number",
-    "version",
-    "name",
-    "year",
-    "theme_id",
-    "number_of_parts",
-    "image",
-    "url",
-    "last_modified"
-)
-SELECT
-    "sets"."set_num",
-    CAST(SUBSTR("sets"."set_num", 1, INSTR("sets"."set_num", '-') - 1) AS INTEGER),
-    CAST(SUBSTR("sets"."set_num", INSTR("sets"."set_num", '-') + 1) AS INTEGER),
-    "sets"."name",
-    "sets"."year",
-    "sets"."theme_id",
-    "sets"."num_parts",
-    "sets"."set_img_url",
-    "sets"."set_url",
-    "sets"."last_modified_dt"
-FROM "sets"
-GROUP BY
-    "sets"."set_num";
-
-COMMIT;

bricktracker/sql/migrations/0004.sql

@@ -1,25 +0,0 @@
--- description: Migrate the Bricktracker sets
-
-PRAGMA foreign_keys = ON;
-
-BEGIN TRANSACTION;
-
--- Create a Bricktable set table: with their unique IDs, and a reference to the Rebrickable set
-CREATE TABLE "bricktracker_sets" (
-    "id" TEXT NOT NULL,
-    "rebrickable_set" TEXT NOT NULL,
-    PRIMARY KEY("id"),
-    FOREIGN KEY("rebrickable_set") REFERENCES "rebrickable_sets"("set")
-);
-
--- Insert existing sets into the new table
-INSERT INTO "bricktracker_sets" (
-    "id",
-    "rebrickable_set"
-)
-SELECT
-    "sets"."u_id",
-    "sets"."set_num"
-FROM "sets";
-
-COMMIT;

bricktracker/sql/migrations/0005.sql

@@ -1,72 +0,0 @@
--- description: Creation of the configurable set checkboxes
-
-PRAGMA foreign_keys = ON;
-
-BEGIN TRANSACTION;
-
--- Create a table to define each set checkbox: with an ID, a name and if they should be displayed on the grid cards
-CREATE TABLE "bricktracker_set_checkboxes" (
-    "id" TEXT NOT NULL,
-    "name" TEXT NOT NULL,
-    "displayed_on_grid" BOOLEAN NOT NULL DEFAULT 0,
-    PRIMARY KEY("id")
-);
-
--- Seed our checkbox with the 3 original ones
-INSERT INTO "bricktracker_set_checkboxes" (
-    "id",
-    "name",
-    "displayed_on_grid"
-) VALUES (
-    "minifigures_collected",
-    "Minifigures are collected",
-    1
-);
-
-INSERT INTO "bricktracker_set_checkboxes" (
-    "id",
-    "name",
-    "displayed_on_grid"
-) VALUES (
-    "set_checked",
-    "Set is checked",
-    1
-);
-
-INSERT INTO "bricktracker_set_checkboxes" (
-    "id",
-    "name",
-    "displayed_on_grid"
-) VALUES (
-    "set_collected",
-    "Set is collected and boxed",
-    1
-);
-
--- Create a table for the status of each checkbox: with the 3 first status
-CREATE TABLE "bricktracker_set_statuses" (
-    "bricktracker_set_id" TEXT NOT NULL,
-    "status_minifigures_collected" BOOLEAN NOT NULL DEFAULT 0,
-    "status_set_checked" BOOLEAN NOT NULL DEFAULT 0,
-    "status_set_collected" BOOLEAN NOT NULL DEFAULT 0,
-    PRIMARY KEY("bricktracker_set_id"),
-    FOREIGN KEY("bricktracker_set_id") REFERENCES "bricktracker_sets"("id")
-);
-
-INSERT INTO "bricktracker_set_statuses" (
-    "bricktracker_set_id",
-    "status_minifigures_collected",
-    "status_set_checked",
-    "status_set_collected"
-)
-SELECT
-    "sets"."u_id",
-    "sets"."mini_col",
-    "sets"."set_check",
-    "sets"."set_col"
-FROM "sets";
-
--- Rename the original table (don't delete it yet?)
-ALTER TABLE "sets" RENAME TO "sets_old";
-
-COMMIT;

bricktracker/sql/migrations/0006.sql

@@ -1,42 +0,0 @@
--- description: Migrate the whislist to have a Rebrickable sets structure
-
-BEGIN TRANSACTION;
-
--- Create a Rebrickable wish table: each unique (light) set imported from Rebrickable
-CREATE TABLE "bricktracker_wishes" (
-    "set" TEXT NOT NULL,
-    "name" TEXT NOT NULL,
-    "year" INTEGER NOT NULL,
-    "theme_id" INTEGER NOT NULL,
-    "number_of_parts" INTEGER NOT NULL,
-    "image" TEXT,
-    "url" TEXT,
-    PRIMARY KEY("set")
-);
-
--- Insert existing wishes into the new table
-INSERT INTO "bricktracker_wishes" (
-    "set",
-    "name",
-    "year",
-    "theme_id",
-    "number_of_parts",
-    "image",
-    "url"
-)
-SELECT
-    "wishlist"."set_num",
-    "wishlist"."name",
-    "wishlist"."year",
-    "wishlist"."theme_id",
-    "wishlist"."num_parts",
-    "wishlist"."set_img_url",
-    "wishlist"."set_url"
-FROM "wishlist"
-GROUP BY
-    "wishlist"."set_num";
-
--- Rename the original table (don't delete it yet?)
-ALTER TABLE "wishlist" RENAME TO "wishlist_old";
-
-COMMIT;

bricktracker/sql/migrations/init.sql

@@ -0,0 +1,66 @@
+-- FROM sqlite3 app.db .schema > init.sql with extra IF NOT EXISTS and transaction
+BEGIN transaction;
+
+CREATE TABLE IF NOT EXISTS wishlist (
+        set_num TEXT,
+        name TEXT,
+        year INTEGER,
+        theme_id INTEGER,
+        num_parts INTEGER,
+        set_img_url TEXT,
+        set_url TEXT,
+        last_modified_dt TEXT
+    );
+CREATE TABLE IF NOT EXISTS sets (
+        set_num TEXT,
+        name TEXT,
+        year INTEGER,
+        theme_id INTEGER,
+        num_parts INTEGER,
+        set_img_url TEXT,
+        set_url TEXT,
+        last_modified_dt TEXT,
+        mini_col BOOLEAN,
+        set_check BOOLEAN,
+        set_col BOOLEAN,
+        u_id TEXT
+    );
+CREATE TABLE IF NOT EXISTS inventory (
+        set_num TEXT,
+        id INTEGER,
+        part_num TEXT,
+        name TEXT,
+        part_img_url TEXT,
+        part_img_url_id TEXT,
+        color_id INTEGER,
+        color_name TEXT,
+        quantity INTEGER,
+        is_spare BOOLEAN,
+        element_id INTEGER,
+        u_id TEXT
+    );
+CREATE TABLE IF NOT EXISTS minifigures (
+        fig_num TEXT,
+        set_num TEXT,
+        name TEXT,
+        quantity INTEGER,
+        set_img_url TEXT,
+        u_id TEXT
+    );
+CREATE TABLE IF NOT EXISTS missing (
+        set_num TEXT,
+        id INTEGER,
+        part_num TEXT,
+        part_img_url_id TEXT,
+        color_id INTEGER,
+        quantity INTEGER,
+        element_id INTEGER,
+        u_id TEXT
+    );
+
+-- Fix a bug where 'None' was inserted in missing instead of NULL
+UPDATE missing
+SET element_id = NULL
+WHERE element_id = 'None';
+
+COMMIT;

bricktracker/sql/minifigure/base/select.sql

@@ -1,20 +1,20 @@
 SELECT
-    "minifigures"."fig_num",
+    minifigures.fig_num,
-    "minifigures"."set_num",
+    minifigures.set_num,
-    "minifigures"."name",
+    minifigures.name,
-    "minifigures"."quantity",
+    minifigures.quantity,
-    "minifigures"."set_img_url",
+    minifigures.set_img_url,
-    "minifigures"."u_id",
+    minifigures.u_id,
     {% block total_missing %}
-    NULL AS "total_missing", -- dummy for order: total_missing
+    NULL AS total_missing, -- dummy for order: total_missing
     {% endblock %}
     {% block total_quantity %}
-    NULL AS "total_quantity", -- dummy for order: total_quantity
+    NULL AS total_quantity, -- dummy for order: total_quantity
     {% endblock %}
     {% block total_sets %}
-    NULL AS "total_sets" -- dummy for order: total_sets
+    NULL AS total_sets -- dummy for order: total_sets
     {% endblock %}
-FROM "minifigures"
+FROM minifigures
 
 {% block join %}{% endblock %}
 

bricktracker/sql/minifigure/delete/all_from_set.sql

@@ -0,0 +1,2 @@
+DELETE FROM minifigures
+WHERE u_id IS NOT DISTINCT FROM :u_id

bricktracker/sql/minifigure/insert.sql

@@ -1,10 +1,10 @@
-INSERT INTO "minifigures" (
+INSERT INTO minifigures (
-    "fig_num",
+    fig_num,
-    "set_num",
+    set_num,
-    "name",
+    name,
-    "quantity",
+    quantity,
-    "set_img_url",
+    set_img_url,
-    "u_id"
+    u_id
 ) VALUES (
     :fig_num,
     :set_num,

bricktracker/sql/minifigure/list/all.sql

@@ -1,34 +1,34 @@
 {% extends 'minifigure/base/select.sql' %}
 
 {% block total_missing %}
-SUM(IFNULL("missing_join"."total", 0)) AS "total_missing",
+SUM(IFNULL(missing_join.total, 0)) AS total_missing,
 {% endblock %}
 
 {% block total_quantity %}
-SUM(IFNULL("minifigures"."quantity", 0)) AS "total_quantity",
+SUM(IFNULL(minifigures.quantity, 0)) AS total_quantity,
 {% endblock %}
 
 {% block total_sets %}
-COUNT("minifigures"."set_num") AS "total_sets"
+COUNT(minifigures.set_num) AS total_sets
 {% endblock %}
 
 {% block join %}
 -- LEFT JOIN + SELECT to avoid messing the total
 LEFT JOIN (
     SELECT
-        "missing"."set_num",
+        set_num,
-        "missing"."u_id",
+        u_id,
-        SUM("missing"."quantity") AS total
+        SUM(quantity) AS total
-    FROM "missing"
+    FROM missing
     GROUP BY
-        "missing"."set_num",
+        set_num,
-        "missing"."u_id"
+        u_id
 ) missing_join
-ON "minifigures"."u_id" IS NOT DISTINCT FROM "missing_join"."u_id"
+ON minifigures.u_id IS NOT DISTINCT FROM missing_join.u_id
-AND "minifigures"."fig_num" IS NOT DISTINCT FROM "missing_join"."set_num"
+AND minifigures.fig_num IS NOT DISTINCT FROM missing_join.set_num
 {% endblock %}
 
 {% block group %}
 GROUP BY
-    "minifigures"."fig_num"
+    minifigures.fig_num
 {% endblock %}

bricktracker/sql/minifigure/list/from_set.sql

@@ -1,6 +1,6 @@
 {% extends 'minifigure/base/select.sql' %}
 
 {% block where %}
-WHERE "minifigures"."u_id" IS NOT DISTINCT FROM :u_id
+WHERE u_id IS NOT DISTINCT FROM :u_id
-AND "minifigures"."set_num" IS NOT DISTINCT FROM :set_num
+AND set_num IS NOT DISTINCT FROM :set_num
 {% endblock %}

bricktracker/sql/minifigure/list/last.sql

@@ -1,17 +1,17 @@
 {% extends 'minifigure/base/select.sql' %}
 
 {% block total_missing %}
-SUM(IFNULL("missing"."quantity", 0)) AS "total_missing",
+SUM(IFNULL(missing.quantity, 0)) AS total_missing,
 {% endblock %}
 
 {% block join %}
-LEFT JOIN "missing"
+LEFT JOIN missing
-ON "minifigures"."fig_num" IS NOT DISTINCT FROM "missing"."set_num"
+ON minifigures.fig_num IS NOT DISTINCT FROM missing.set_num
-AND "minifigures"."u_id" IS NOT DISTINCT FROM "missing"."u_id"
+AND minifigures.u_id IS NOT DISTINCT FROM missing.u_id
 {% endblock %}
 
 {% block group %}
 GROUP BY
-    "minifigures"."fig_num",
+    minifigures.fig_num,
-    "minifigures"."u_id"
+    minifigures.u_id
 {% endblock %}

bricktracker/sql/minifigure/list/missing_part.sql

@@ -1,30 +1,30 @@
 {% extends 'minifigure/base/select.sql' %}
 
 {% block total_missing %}
-SUM(IFNULL("missing"."quantity", 0)) AS "total_missing",
+SUM(IFNULL(missing.quantity, 0)) AS total_missing,
 {% endblock %}
 
 {% block join %}
-LEFT JOIN "missing"
+LEFT JOIN missing
-ON "minifigures"."fig_num" IS NOT DISTINCT FROM "missing"."set_num"
+ON minifigures.fig_num IS NOT DISTINCT FROM missing.set_num
-AND "minifigures"."u_id" IS NOT DISTINCT FROM "missing"."u_id"
+AND minifigures.u_id IS NOT DISTINCT FROM missing.u_id
 {% endblock %}
 
 {% block where %}
-WHERE "minifigures"."fig_num" IN (
+WHERE minifigures.fig_num IN (
     SELECT
-        "missing"."set_num"
+        missing.set_num
-    FROM "missing"
+    FROM missing
 
-    WHERE "missing"."color_id" IS NOT DISTINCT FROM :color_id
+    WHERE missing.color_id IS NOT DISTINCT FROM :color_id
-    AND "missing"."element_id" IS NOT DISTINCT FROM :element_id
+    AND missing.element_id IS NOT DISTINCT FROM :element_id
-    AND "missing"."part_num" IS NOT DISTINCT FROM :part_num
+    AND missing.part_num IS NOT DISTINCT FROM :part_num
 
-    GROUP BY "missing"."set_num"
+    GROUP BY missing.set_num
 )
 {% endblock %}
 
 {% block group %}
 GROUP BY
-    "minifigures"."fig_num"
+    minifigures.fig_num
 {% endblock %}

bricktracker/sql/minifigure/list/using_part.sql

@@ -1,24 +1,24 @@
 {% extends 'minifigure/base/select.sql' %}
 
 {% block total_quantity %}
-SUM("minifigures"."quantity") AS "total_quantity",
+SUM(minifigures.quantity) AS total_quantity,
 {% endblock %}
 
 {% block where %}
-WHERE "minifigures"."fig_num" IN (
+WHERE minifigures.fig_num IN (
     SELECT
-        "inventory"."set_num"
+        inventory.set_num
-    FROM "inventory"
+    FROM inventory
 
-    WHERE "inventory"."color_id" IS NOT DISTINCT FROM :color_id
+    WHERE inventory.color_id IS NOT DISTINCT FROM :color_id
-    AND "inventory"."element_id" IS NOT DISTINCT FROM :element_id
+    AND inventory.element_id IS NOT DISTINCT FROM :element_id
-    AND "inventory"."part_num" IS NOT DISTINCT FROM :part_num
+    AND inventory.part_num IS NOT DISTINCT FROM :part_num
 
-    GROUP BY "inventory"."set_num"
+    GROUP BY inventory.set_num
 )
 {% endblock %}
 
 {% block group %}
 GROUP BY
-    "minifigures"."fig_num"
+    minifigures.fig_num
 {% endblock %}

bricktracker/sql/minifigure/select/generic.sql

@@ -1,38 +1,38 @@
 {% extends 'minifigure/base/select.sql' %}
 
 {% block total_missing %}
-SUM(IFNULL("missing_join"."total", 0)) AS "total_missing",
+SUM(IFNULL(missing_join.total, 0)) AS total_missing,
 {% endblock %}
 
 {% block total_quantity %}
-SUM(IFNULL("minifigures"."quantity", 0)) AS "total_quantity",
+SUM(IFNULL(minifigures.quantity, 0)) AS total_quantity,
 {% endblock %}
 
 {% block total_sets %}
-COUNT("minifigures"."set_num") AS "total_sets"
+COUNT(minifigures.set_num) AS total_sets
 {% endblock %}
 
 {% block join %}
 -- LEFT JOIN + SELECT to avoid messing the total
 LEFT JOIN (
     SELECT
-        "missing"."set_num",
+        set_num,
-        "missing"."u_id",
+        u_id,
-        SUM("missing"."quantity") AS "total"
+        SUM(quantity) AS total
-    FROM "missing"
+    FROM missing
     GROUP BY
-        "missing"."set_num",
+        set_num,
-        "missing"."u_id"
+        u_id
-) "missing_join"
+) missing_join
-ON "minifigures"."u_id" IS NOT DISTINCT FROM "missing_join"."u_id"
+ON minifigures.u_id IS NOT DISTINCT FROM missing_join.u_id
-AND "minifigures"."fig_num" IS NOT DISTINCT FROM "missing_join"."set_num"
+AND minifigures.fig_num IS NOT DISTINCT FROM missing_join.set_num
 {% endblock %}
 
 {% block where %}
-WHERE "minifigures"."fig_num" IS NOT DISTINCT FROM :fig_num
+WHERE fig_num IS NOT DISTINCT FROM :fig_num
 {% endblock %}
 
 {% block group %}
 GROUP BY
-    "minifigures"."fig_num"
+    minifigures.fig_num
 {% endblock %}

bricktracker/sql/minifigure/select/specific.sql

@@ -1,7 +1,7 @@
 {% extends 'minifigure/base/select.sql' %}
 
 {% block where %}
-WHERE "minifigures"."fig_num" IS NOT DISTINCT FROM :fig_num
+WHERE fig_num IS NOT DISTINCT FROM :fig_num
-AND "minifigures"."u_id" IS NOT DISTINCT FROM :u_id
+AND u_id IS NOT DISTINCT FROM :u_id
-AND "minifigures"."set_num" IS NOT DISTINCT FROM :set_num
+AND set_num IS NOT DISTINCT FROM :set_num
 {% endblock %}

bricktracker/sql/missing/count_none.sql

@@ -0,0 +1,3 @@
+SELECT count(*) AS count
+FROM missing
+WHERE element_id = 'None'

bricktracker/sql/missing/delete/all_from_set.sql

@@ -0,0 +1,2 @@
+DELETE FROM missing
+WHERE u_id IS NOT DISTINCT FROM :u_id

bricktracker/sql/missing/delete/from_set.sql

@@ -1,4 +1,4 @@
-DELETE FROM "missing"
+DELETE FROM missing
-WHERE "missing"."set_num" IS NOT DISTINCT FROM :set_num
+WHERE set_num IS NOT DISTINCT FROM :set_num
-AND "missing"."id" IS NOT DISTINCT FROM :id
+AND id IS NOT DISTINCT FROM :id
-AND "missing"."u_id" IS NOT DISTINCT FROM :u_id
+AND u_id IS NOT DISTINCT FROM :u_id

bricktracker/sql/missing/insert.sql

@@ -1,12 +1,12 @@
-INSERT INTO "missing" (
+INSERT INTO missing (
-    "set_num",
+    set_num,
-    "id",
+    id,
-    "part_num",
+    part_num,
-    "part_img_url_id",
+    part_img_url_id,
-    "color_id",
+    color_id,
-    "quantity",
+    quantity,
-    "element_id",
+    element_id,
-    "u_id"
+    u_id
 )
 VALUES(
     :set_num,

bricktracker/sql/missing/update/from_set.sql

@@ -1,5 +1,5 @@
-UPDATE "missing"
+UPDATE missing
-SET "quantity" = :quantity
+SET quantity = :quantity
-WHERE "missing"."set_num" IS NOT DISTINCT FROM :set_num
+WHERE set_num IS NOT DISTINCT FROM :set_num
-AND "missing"."id" IS NOT DISTINCT FROM :id
+AND id IS NOT DISTINCT FROM :id
-AND "missing"."u_id" IS NOT DISTINCT FROM :u_id
+AND u_id IS NOT DISTINCT FROM :u_id

bricktracker/sql/part/base/select.sql

@@ -1,32 +1,32 @@
 SELECT
-    "inventory"."set_num",
+    inventory.set_num,
-    "inventory"."id",
+    inventory.id,
-    "inventory"."part_num",
+    inventory.part_num,
-    "inventory"."name",
+    inventory.name,
-    "inventory"."part_img_url",
+    inventory.part_img_url,
-    "inventory"."part_img_url_id",
+    inventory.part_img_url_id,
-    "inventory"."color_id",
+    inventory.color_id,
-    "inventory"."color_name",
+    inventory.color_name,
-    "inventory"."quantity",
+    inventory.quantity,
-    "inventory"."is_spare",
+    inventory.is_spare,
-    "inventory"."element_id",
+    inventory.element_id,
-    "inventory"."u_id",
+    inventory.u_id,
     {% block total_missing %}
-    NULL AS "total_missing", -- dummy for order: total_missing
+    NULL AS total_missing, -- dummy for order: total_missing
     {% endblock %}
     {% block total_quantity %}
-    NULL AS "total_quantity", -- dummy for order: total_quantity
+    NULL AS total_quantity, -- dummy for order: total_quantity
     {% endblock %}
     {% block total_spare %}
-    NULL AS "total_spare", -- dummy for order: total_spare
+    NULL AS total_spare, -- dummy for order: total_spare
     {% endblock %}
     {% block total_sets %}
-    NULL AS "total_sets", -- dummy for order: total_sets
+    NULL AS total_sets, -- dummy for order: total_sets
     {% endblock %}
     {% block total_minifigures %}
-    NULL AS "total_minifigures" -- dummy for order: total_minifigures
+    NULL AS total_minifigures -- dummy for order: total_minifigures
     {% endblock %}
-FROM "inventory"
+FROM inventory
 
 {% block join %}{% endblock %}
 

bricktracker/sql/part/delete/all_from_set.sql

@@ -0,0 +1,2 @@
+DELETE FROM inventory
+WHERE u_id IS NOT DISTINCT FROM :u_id

bricktracker/sql/part/insert.sql

@@ -1,16 +1,16 @@
 INSERT INTO inventory (
-    "set_num",
+    set_num,
-    "id",
+    id,
-    "part_num",
+    part_num,
-    "name",
+    name,
-    "part_img_url",
+    part_img_url,
-    "part_img_url_id",
+    part_img_url_id,
-    "color_id",
+    color_id,
-    "color_name",
+    color_name,
-    "quantity",
+    quantity,
-    "is_spare",
+    is_spare,
-    "element_id",
+    element_id,
-    "u_id"
+    u_id
 ) VALUES (
     :set_num,
     :id,

bricktracker/sql/part/list/all.sql

@@ -1,43 +1,43 @@
 {% extends 'part/base/select.sql' %}
 
 {% block total_missing %}
-SUM(IFNULL("missing"."quantity", 0)) AS "total_missing",
+SUM(IFNULL(missing.quantity, 0)) AS total_missing,
 {% endblock %}
 
 {% block total_quantity %}
-SUM("inventory"."quantity" * IFNULL("minifigures"."quantity", 1)) AS "total_quantity",
+SUM(inventory.quantity * IFNULL(minifigures.quantity, 1)) AS total_quantity,
 {% endblock %}
 
 {% block total_sets %}
-COUNT(DISTINCT "bricktracker_sets"."id") AS "total_sets",
+COUNT(DISTINCT sets.u_id) AS total_sets,
 {% endblock %}
 
 {% block total_minifigures %}
-SUM(IFNULL("minifigures"."quantity", 0)) AS "total_minifigures"
+SUM(IFNULL(minifigures.quantity, 0)) AS total_minifigures
 {% endblock %}
 
 {% block join %}
-LEFT JOIN "missing"
+LEFT JOIN missing
-ON "inventory"."set_num" IS NOT DISTINCT FROM "missing"."set_num"
+ON inventory.set_num IS NOT DISTINCT FROM missing.set_num
-AND "inventory"."id" IS NOT DISTINCT FROM "missing"."id"
+AND inventory.id IS NOT DISTINCT FROM missing.id
-AND "inventory"."part_num" IS NOT DISTINCT FROM "missing"."part_num"
+AND inventory.part_num IS NOT DISTINCT FROM missing.part_num
-AND "inventory"."color_id" IS NOT DISTINCT FROM "missing"."color_id"
+AND inventory.color_id IS NOT DISTINCT FROM missing.color_id
-AND "inventory"."element_id" IS NOT DISTINCT FROM "missing"."element_id"
+AND inventory.element_id IS NOT DISTINCT FROM missing.element_id
-AND "inventory"."u_id" IS NOT DISTINCT FROM "missing"."u_id"
+AND inventory.u_id IS NOT DISTINCT FROM missing.u_id
 
-LEFT JOIN "minifigures"
+LEFT JOIN minifigures
-ON "inventory"."set_num" IS NOT DISTINCT FROM "minifigures"."fig_num"
+ON inventory.set_num IS NOT DISTINCT FROM minifigures.fig_num
-AND "inventory"."u_id" IS NOT DISTINCT FROM "minifigures"."u_id"
+AND inventory.u_id IS NOT DISTINCT FROM minifigures.u_id
 
-LEFT JOIN "bricktracker_sets"
+LEFT JOIN sets
-ON "inventory"."u_id" IS NOT DISTINCT FROM "bricktracker_sets"."id"
+ON inventory.u_id IS NOT DISTINCT FROM sets.u_id
 {% endblock %}
 
 {% block group %}
 GROUP BY
-    "inventory"."part_num",
+    inventory.part_num,
-    "inventory"."name",
+    inventory.name,
-    "inventory"."color_id",
+    inventory.color_id,
-    "inventory"."is_spare",
+    inventory.is_spare,
-    "inventory"."element_id"
+    inventory.element_id
 {% endblock %}

bricktracker/sql/part/list/from_minifigure.sql

@@ -2,27 +2,27 @@
 {% extends 'part/base/select.sql' %}
 
 {% block total_missing %}
-SUM(IFNULL("missing"."quantity", 0)) AS "total_missing",
+SUM(IFNULL(missing.quantity, 0)) AS total_missing,
 {% endblock %}
 
 {% block join %}
-LEFT JOIN "missing"
+LEFT JOIN missing
-ON "missing"."set_num" IS NOT DISTINCT FROM "inventory"."set_num"
+ON missing.set_num IS NOT DISTINCT FROM inventory.set_num
-AND "missing"."id" IS NOT DISTINCT FROM "inventory"."id"
+AND missing.id IS NOT DISTINCT FROM inventory.id
-AND "missing"."part_num" IS NOT DISTINCT FROM "inventory"."part_num"
+AND missing.part_num IS NOT DISTINCT FROM inventory.part_num
-AND "missing"."color_id" IS NOT DISTINCT FROM "inventory"."color_id"
+AND missing.color_id IS NOT DISTINCT FROM inventory.color_id
-AND "missing"."element_id" IS NOT DISTINCT FROM "inventory"."element_id"
+AND missing.element_id IS NOT DISTINCT FROM inventory.element_id
 {% endblock %}
 
 {% block where %}
-WHERE "inventory"."set_num" IS NOT DISTINCT FROM :set_num
+WHERE inventory.set_num IS NOT DISTINCT FROM :set_num
 {% endblock %}
 
 {% block group %}
 GROUP BY
-    "inventory"."part_num",
+    inventory.part_num,
-    "inventory"."name",
+    inventory.name,
-    "inventory"."color_id",
+    inventory.color_id,
-    "inventory"."is_spare",
+    inventory.is_spare,
-    "inventory"."element_id"
+    inventory.element_id
 {% endblock %}

bricktracker/sql/part/list/from_set.sql

@@ -2,20 +2,20 @@
 {% extends 'part/base/select.sql' %}
 
 {% block total_missing %}
-IFNULL("missing"."quantity", 0) AS "total_missing",
+IFNULL(missing.quantity, 0) AS total_missing,
 {% endblock %}
 
 {% block join %}
-LEFT JOIN "missing"
+LEFT JOIN missing
-ON "inventory"."set_num" IS NOT DISTINCT FROM "missing"."set_num"
+ON inventory.set_num IS NOT DISTINCT FROM missing.set_num
-AND "inventory"."id" IS NOT DISTINCT FROM "missing"."id"
+AND inventory.id IS NOT DISTINCT FROM missing.id
-AND "inventory"."part_num" IS NOT DISTINCT FROM "missing"."part_num"
+AND inventory.part_num IS NOT DISTINCT FROM missing.part_num
-AND "inventory"."color_id" IS NOT DISTINCT FROM "missing"."color_id"
+AND inventory.color_id IS NOT DISTINCT FROM missing.color_id
-AND "inventory"."element_id" IS NOT DISTINCT FROM "missing"."element_id"
+AND inventory.element_id IS NOT DISTINCT FROM missing.element_id
-AND "inventory"."u_id" IS NOT DISTINCT FROM "missing"."u_id"
+AND inventory.u_id IS NOT DISTINCT FROM missing.u_id
 {% endblock %}
 
 {% block where %}
-WHERE "inventory"."u_id" IS NOT DISTINCT FROM :u_id
+WHERE inventory.u_id IS NOT DISTINCT FROM :u_id
-AND "inventory"."set_num" IS NOT DISTINCT FROM :set_num
+AND inventory.set_num IS NOT DISTINCT FROM :set_num
 {% endblock %}

bricktracker/sql/part/list/missing.sql

@@ -1,36 +1,36 @@
 {% extends 'part/base/select.sql' %}
 
 {% block total_missing %}
-SUM(IFNULL("missing"."quantity", 0)) AS "total_missing",
+SUM(IFNULL(missing.quantity, 0)) AS total_missing,
 {% endblock %}
 
 {% block total_sets %}
-COUNT("inventory"."u_id")  - COUNT("minifigures"."u_id") AS "total_sets",
+COUNT(inventory.u_id)  - COUNT(minifigures.u_id) AS total_sets,
 {% endblock %}
 
 {% block total_minifigures %}
-SUM(IFNULL("minifigures"."quantity", 0)) AS "total_minifigures"
+SUM(IFNULL(minifigures.quantity, 0)) AS total_minifigures
 {% endblock %}
 
 {% block join %}
-INNER JOIN "missing"
+INNER JOIN missing
-ON "missing"."set_num" IS NOT DISTINCT FROM "inventory"."set_num"
+ON missing.set_num IS NOT DISTINCT FROM inventory.set_num
-AND "missing"."id" IS NOT DISTINCT FROM "inventory"."id"
+AND missing.id IS NOT DISTINCT FROM inventory.id
-AND "missing"."part_num" IS NOT DISTINCT FROM "inventory"."part_num"
+AND missing.part_num IS NOT DISTINCT FROM inventory.part_num
-AND "missing"."color_id" IS NOT DISTINCT FROM "inventory"."color_id"
+AND missing.color_id IS NOT DISTINCT FROM inventory.color_id
-AND "missing"."element_id" IS NOT DISTINCT FROM "inventory"."element_id"
+AND missing.element_id IS NOT DISTINCT FROM inventory.element_id
-AND "missing"."u_id" IS NOT DISTINCT FROM "inventory"."u_id"
+AND missing.u_id IS NOT DISTINCT FROM inventory.u_id
 
-LEFT JOIN "minifigures"
+LEFT JOIN minifigures
-ON "missing"."set_num" IS NOT DISTINCT FROM "minifigures"."fig_num"
+ON missing.set_num IS NOT DISTINCT FROM minifigures.fig_num
-AND "missing"."u_id" IS NOT DISTINCT FROM "minifigures"."u_id"
+AND missing.u_id IS NOT DISTINCT FROM minifigures.u_id
 {% endblock %}
 
 {% block group %}
 GROUP BY
-    "inventory"."part_num",
+    inventory.part_num,
-    "inventory"."name",
+    inventory.name,
-    "inventory"."color_id",
+    inventory.color_id,
-    "inventory"."is_spare",
+    inventory.is_spare,
-    "inventory"."element_id"
+    inventory.element_id
 {% endblock %}

bricktracker/sql/part/select/generic.sql

@@ -1,40 +1,40 @@
 {% extends 'part/base/select.sql' %}
 
 {% block total_missing %}
-SUM(IFNULL("missing"."quantity", 0)) AS "total_missing",
+SUM(IFNULL(missing.quantity, 0)) AS total_missing,
 {% endblock %}
 
 {% block total_quantity %}
-SUM((NOT "inventory"."is_spare") * "inventory"."quantity" * IFNULL("minifigures"."quantity", 1)) AS "total_quantity",
+SUM((NOT inventory.is_spare) * inventory.quantity * IFNULL(minifigures.quantity, 1)) AS total_quantity,
 {% endblock %}
 
 {% block total_spare %}
-SUM("inventory"."is_spare" * "inventory"."quantity" * IFNULL("minifigures"."quantity", 1)) AS "total_spare",
+SUM(inventory.is_spare * inventory.quantity * IFNULL(minifigures.quantity, 1)) AS total_spare,
 {% endblock %}
 
 {% block join %}
-LEFT JOIN "missing"
+LEFT JOIN missing
-ON "inventory"."set_num" IS NOT DISTINCT FROM "missing"."set_num"
+ON inventory.set_num IS NOT DISTINCT FROM missing.set_num
-AND "inventory"."id" IS NOT DISTINCT FROM "missing"."id"
+AND inventory.id IS NOT DISTINCT FROM missing.id
-AND "inventory"."part_num" IS NOT DISTINCT FROM "missing"."part_num"
+AND inventory.part_num IS NOT DISTINCT FROM missing.part_num
-AND "inventory"."color_id" IS NOT DISTINCT FROM "missing"."color_id"
+AND inventory.color_id IS NOT DISTINCT FROM missing.color_id
-AND "inventory"."element_id" IS NOT DISTINCT FROM "missing"."element_id"
+AND inventory.element_id IS NOT DISTINCT FROM missing.element_id
-AND "inventory"."u_id" IS NOT DISTINCT FROM "missing"."u_id"
+AND inventory.u_id IS NOT DISTINCT FROM missing.u_id
 
-LEFT JOIN "minifigures"
+LEFT JOIN minifigures
-ON "inventory"."set_num" IS NOT DISTINCT FROM "minifigures"."fig_num"
+ON inventory.set_num IS NOT DISTINCT FROM minifigures.fig_num
-AND "inventory"."u_id" IS NOT DISTINCT FROM "minifigures"."u_id"
+AND inventory.u_id IS NOT DISTINCT FROM minifigures.u_id
 {% endblock %}
 
 {% block where %}
-WHERE "inventory"."part_num" IS NOT DISTINCT FROM :part_num
+WHERE inventory.part_num IS NOT DISTINCT FROM :part_num
-AND "inventory"."color_id" IS NOT DISTINCT FROM :color_id
+AND inventory.color_id IS NOT DISTINCT FROM :color_id
-AND "inventory"."element_id" IS NOT DISTINCT FROM :element_id
+AND inventory.element_id IS NOT DISTINCT FROM :element_id
 {% endblock %}
 
 {% block group %}
 GROUP BY
-    "inventory"."part_num",
+    inventory.part_num,
-    "inventory"."color_id",
+    inventory.color_id,
-    "inventory"."element_id"
+    inventory.element_id
 {% endblock %}

bricktracker/sql/part/select/specific.sql

@@ -1,24 +1,24 @@
 {% extends 'part/base/select.sql' %}
 
 {% block join %}
-LEFT JOIN "missing"
+LEFT JOIN missing
-ON "inventory"."set_num" IS NOT DISTINCT FROM "missing"."set_num"
+ON inventory.set_num IS NOT DISTINCT FROM missing.set_num
-AND "inventory"."id" IS NOT DISTINCT FROM "missing"."id"
+AND inventory.id IS NOT DISTINCT FROM missing.id
-AND "inventory"."u_id" IS NOT DISTINCT FROM "missing"."u_id"
+AND inventory.u_id IS NOT DISTINCT FROM missing.u_id
 {% endblock %}
 
 {% block where %}
-WHERE "inventory"."u_id" IS NOT DISTINCT FROM :u_id
+WHERE inventory.u_id IS NOT DISTINCT FROM :u_id
-AND "inventory"."set_num" IS NOT DISTINCT FROM :set_num
+AND inventory.set_num IS NOT DISTINCT FROM :set_num
-AND "inventory"."id" IS NOT DISTINCT FROM :id
+AND inventory.id IS NOT DISTINCT FROM :id
 {% endblock %}
 
 {% block group %}
 GROUP BY
-    "inventory"."set_num",
+    inventory.set_num,
-    "inventory"."id",
+    inventory.id,
-    "inventory"."part_num",
+    inventory.part_num,
-    "inventory"."color_id",
+    inventory.color_id,
-    "inventory"."element_id",
+    inventory.element_id,
-    "inventory"."u_id"
+    inventory.u_id
 {% endblock %}

bricktracker/sql/rebrickable/set/insert.sql

@@ -1,23 +0,0 @@
-INSERT OR IGNORE INTO "rebrickable_sets" (
-    "set",
-    "number",
-    "version",
-    "name",
-    "year",
-    "theme_id",
-    "number_of_parts",
-    "image",
-    "url",
-    "last_modified"
-) VALUES (
-    :set,
-    :number,
-    :version,
-    :name,
-    :year,
-    :theme_id,
-    :number_of_parts,
-    :image,
-    :url,
-    :last_modified
-)

bricktracker/sql/rebrickable/set/list.sql

@@ -1,11 +0,0 @@
-SELECT
-    "rebrickable_sets"."set",
-    "rebrickable_sets"."number",
-    "rebrickable_sets"."version",
-    "rebrickable_sets"."name",
-    "rebrickable_sets"."year",
-    "rebrickable_sets"."theme_id",
-    "rebrickable_sets"."number_of_parts",
-    "rebrickable_sets"."image",
-    "rebrickable_sets"."url"
-FROM "rebrickable_sets"

bricktracker/sql/rebrickable/set/select.sql

@@ -1,13 +0,0 @@
-SELECT
-    "rebrickable_sets"."set",
-    "rebrickable_sets"."number",
-    "rebrickable_sets"."version",
-    "rebrickable_sets"."name",
-    "rebrickable_sets"."year",
-    "rebrickable_sets"."theme_id",
-    "rebrickable_sets"."number_of_parts",
-    "rebrickable_sets"."image",
-    "rebrickable_sets"."url"
-FROM "rebrickable_sets"
-
-WHERE "rebrickable_sets"."set" IS NOT DISTINCT FROM :set

bricktracker/sql/schema/count.sql

@@ -1,2 +1,2 @@
-SELECT COUNT(*) AS "count"
+SELECT COUNT(*) AS count
-FROM "{{ table }}"
+FROM {{ table }}

bricktracker/sql/schema/drop.sql

@@ -1,18 +1,9 @@
 BEGIN transaction;
 
-DROP TABLE IF EXISTS "bricktracker_sets";
+DROP TABLE IF EXISTS wishlist;
-DROP TABLE IF EXISTS "bricktracker_set_checkboxes";
+DROP TABLE IF EXISTS sets;
-DROP TABLE IF EXISTS "bricktracker_set_statuses";
+DROP TABLE IF EXISTS inventory;
-DROP TABLE IF EXISTS "bricktracker_wishes";
+DROP TABLE IF EXISTS minifigures;
-DROP TABLE IF EXISTS "inventory";
+DROP TABLE IF EXISTS missing;
-DROP TABLE IF EXISTS "minifigures";
-DROP TABLE IF EXISTS "missing";
-DROP TABLE IF EXISTS "rebrickable_sets";
-DROP TABLE IF EXISTS "sets";
-DROP TABLE IF EXISTS "sets_old";
-DROP TABLE IF EXISTS "wishlist";
-DROP TABLE IF EXISTS "wishlist_old";
 
 COMMIT;
-
-PRAGMA user_version = 0;

bricktracker/sql/schema/get_version.sql

@@ -1 +0,0 @@
-PRAGMA user_version

bricktracker/sql/schema/is_init.sql

@@ -0,0 +1,4 @@
+SELECT name
+FROM sqlite_master
+WHERE type="table"
+AND name="sets"

bricktracker/sql/schema/set_version.sql

@@ -1 +0,0 @@
-PRAGMA user_version = {{ version }}

bricktracker/sql/schema/tables.sql

@@ -1 +0,0 @@
-SELECT "name" FROM "sqlite_master" WHERE type='table' ORDER BY "name" ASC

bricktracker/sql/set/base/base.sql

@@ -1,38 +0,0 @@
-SELECT
-    {% block id %}{% endblock %}
-    "rebrickable_sets"."set",
-    "rebrickable_sets"."number",
-    "rebrickable_sets"."version",
-    "rebrickable_sets"."name",
-    "rebrickable_sets"."year",
-    "rebrickable_sets"."theme_id",
-    "rebrickable_sets"."number_of_parts",
-    "rebrickable_sets"."image",
-    "rebrickable_sets"."url",
-    {% block statuses %}
-        {% if statuses %}{{ statuses }},{% endif %}
-    {% endblock %}
-    {% block total_missing %}
-    NULL AS "total_missing", -- dummy for order: total_missing
-    {% endblock %}
-    {% block total_quantity %}
-    NULL AS "total_quantity", -- dummy for order: total_quantity
-    {% endblock %}
-FROM "bricktracker_sets"
-
-INNER JOIN "rebrickable_sets"
-ON "bricktracker_sets"."rebrickable_set" IS NOT DISTINCT FROM "rebrickable_sets"."set"
-
-{% block join %}{% endblock %}
-
-{% block where %}{% endblock %}
-
-{% block group %}{% endblock %}
-
-{% if order %}
-ORDER BY {{ order }}
-{% endif %}
-
-{% if limit %}
-LIMIT {{ limit }}
-{% endif %}

bricktracker/sql/set/base/full.sql

@@ -1,42 +0,0 @@
-{% extends 'set/base/base.sql' %}
-
-{% block id %}
-"bricktracker_sets"."id",
-{% endblock %}
-
-{% block total_missing %}
-IFNULL("missing_join"."total", 0) AS "total_missing",
-{% endblock %}
-
-{% block total_quantity %}
-IFNULL("minifigures_join"."total", 0) AS "total_minifigures"
-{% endblock %}
-
-{% block join %}
-{% if statuses %}
-LEFT JOIN "bricktracker_set_statuses"
-ON "bricktracker_sets"."id" IS NOT DISTINCT FROM "bricktracker_set_statuses"."bricktracker_set_id"
-{% endif %}
-
--- LEFT JOIN + SELECT to avoid messing the total
-LEFT JOIN (
-    SELECT
-        "missing"."u_id",
-        SUM("missing"."quantity") AS "total"
-    FROM "missing"
-    {% block where_missing %}{% endblock %}
-    GROUP BY "u_id"
-) "missing_join"
-ON "bricktracker_sets"."id" IS NOT DISTINCT FROM "missing_join"."u_id"
-
--- LEFT JOIN + SELECT to avoid messing the total
-LEFT JOIN (
-    SELECT
-       "minifigures"."u_id",
-       SUM("minifigures"."quantity") AS "total"
-    FROM "minifigures"
-    {% block where_minifigures %}{% endblock %}
-    GROUP BY "u_id"
-) "minifigures_join"
-ON "bricktracker_sets"."id" IS NOT DISTINCT FROM "minifigures_join"."u_id"
-{% endblock %}

bricktracker/sql/set/base/light.sql

@@ -1,18 +0,0 @@
-SELECT
-    "bricktracker_sets"."id",
-    "bricktracker_sets"."rebrickable_set" AS "set"
-FROM "bricktracker_sets"
-
-{% block join %}{% endblock %}
-
-{% block where %}{% endblock %}
-
-{% block group %}{% endblock %}
-
-{% if order %}
-ORDER BY {{ order }}
-{% endif %}
-
-{% if limit %}
-LIMIT {{ limit }}
-{% endif %}

bricktracker/sql/set/base/select.sql

@@ -0,0 +1,52 @@
+SELECT
+    sets.set_num,
+    sets.name,
+    sets.year,
+    sets.theme_id,
+    sets.num_parts,
+    sets.set_img_url,
+    sets.set_url,
+    sets.last_modified_dt,
+    sets.mini_col,
+    sets.set_check,
+    sets.set_col,
+    sets.u_id,
+    {% block number %}
+    CAST(SUBSTR(sets.set_num, 1, INSTR(sets.set_num, '-') - 1) AS INTEGER) AS set_number,
+    CAST(SUBSTR(sets.set_num, 1, INSTR(sets.set_num, '-') + 1) AS INTEGER) AS set_version,
+    {% endblock %}
+    IFNULL(missing_join.total, 0) AS total_missing,
+    IFNULL(minifigures_join.total, 0) AS total_minifigures
+FROM sets
+
+-- LEFT JOIN + SELECT to avoid messing the total
+LEFT JOIN (
+    SELECT
+        u_id,
+        SUM(quantity) AS total
+    FROM missing
+    {% block where_missing %}{% endblock %}
+    GROUP BY u_id
+) missing_join
+ON sets.u_id IS NOT DISTINCT FROM missing_join.u_id
+
+-- LEFT JOIN + SELECT to avoid messing the total
+LEFT JOIN (
+    SELECT
+        u_id,
+       SUM(quantity) AS total
+    FROM minifigures
+    {% block where_minifigures %}{% endblock %}
+    GROUP BY u_id
+) minifigures_join
+ON sets.u_id IS NOT DISTINCT FROM minifigures_join.u_id
+
+{% block where %}{% endblock %}
+
+{% if order %}
+ORDER BY {{ order }}
+{% endif %}
+
+{% if limit %}
+LIMIT {{ limit }}
+{% endif %}

bricktracker/sql/set/delete/set.sql

@@ -1,21 +1,2 @@
--- A bit unsafe as it does not use a prepared statement but it
+DELETE FROM sets
--- should not be possible to inject anything through the {{ id }} context
+WHERE u_id IS NOT DISTINCT FROM :u_id
-
-BEGIN TRANSACTION;
-
-DELETE FROM "bricktracker_sets"
-WHERE "bricktracker_sets"."id" IS NOT DISTINCT FROM '{{ id }}';
-
-DELETE FROM "bricktracker_set_statuses"
-WHERE "bricktracker_set_statuses"."bricktracker_set_id" IS NOT DISTINCT FROM '{{ id }}';
-
-DELETE FROM "minifigures"
-WHERE "minifigures"."u_id" IS NOT DISTINCT FROM '{{ id }}';
-
-DELETE FROM "missing"
-WHERE "missing"."u_id" IS NOT DISTINCT FROM '{{ id }}';
-
-DELETE FROM "inventory"
-WHERE "inventory"."u_id" IS NOT DISTINCT FROM '{{ id }}';
-
-COMMIT;

bricktracker/sql/set/insert.sql

@@ -1,7 +1,27 @@
-INSERT OR IGNORE INTO "bricktracker_sets" (
+INSERT INTO sets (
-    "id",
+    set_num,
-    "rebrickable_set"
+    name,
+    year,
+    theme_id,
+    num_parts,
+    set_img_url,
+    set_url,
+    last_modified_dt,
+    mini_col,
+    set_check,
+    set_col,
+    u_id
 ) VALUES (
-    :id,
+    :set_num,
-    :set
+    :name,
+    :year,
+    :theme_id,
+    :num_parts,
+    :set_img_url,
+    :set_url,
+    :last_modified_dt,
+    :mini_col,
+    :set_check,
+    :set_col,
+    :u_id
 )

bricktracker/sql/set/list/all.sql

@@ -1 +1 @@
-{% extends 'set/base/full.sql' %}
+{% extends 'set/base/select.sql' %}

bricktracker/sql/set/list/generic.sql

@@ -1,6 +1,12 @@
-{% extends 'set/base/base.sql' %}
+SELECT
+    sets.set_num,
+    sets.name,
+    sets.year,
+    sets.theme_id,
+    sets.num_parts,
+    sets.set_img_url,
+    sets.set_url
+FROM sets
 
-{% block group %}
 GROUP BY
-    "bricktracker_sets"."rebrickable_set"
+    sets.set_num
-{% endblock %}

bricktracker/sql/set/list/missing_minifigure.sql

@@ -1,13 +1,13 @@
-{% extends 'set/base/full.sql' %}
+{% extends 'set/base/select.sql' %}
 
 {% block where %}
-WHERE "bricktracker_sets"."id" IN (
+WHERE sets.u_id IN (
     SELECT
-        "missing"."u_id"
+        missing.u_id
-    FROM "missing"
+    FROM missing
 
-    WHERE "missing"."set_num" IS NOT DISTINCT FROM :fig_num
+    WHERE missing.set_num IS NOT DISTINCT FROM :fig_num
 
-    GROUP BY "missing"."u_id"
+    GROUP BY missing.u_id
 )
 {% endblock %}

bricktracker/sql/set/list/missing_part.sql

@@ -1,15 +1,15 @@
-{% extends 'set/base/full.sql' %}
+{% extends 'set/base/select.sql' %}
 
 {% block where %}
-WHERE "bricktracker_sets"."id" IN (
+WHERE sets.u_id IN (
     SELECT
-        "missing"."u_id"
+        missing.u_id
-    FROM "missing"
+    FROM missing
 
-    WHERE "missing"."color_id" IS NOT DISTINCT FROM :color_id
+    WHERE missing.color_id IS NOT DISTINCT FROM :color_id
-    AND "missing"."element_id" IS NOT DISTINCT FROM :element_id
+    AND missing.element_id IS NOT DISTINCT FROM :element_id
-    AND "missing"."part_num" IS NOT DISTINCT FROM :part_num
+    AND missing.part_num IS NOT DISTINCT FROM :part_num
 
-    GROUP BY "missing"."u_id"
+    GROUP BY missing.u_id
 )
 {% endblock %}

bricktracker/sql/set/list/using_minifigure.sql

@@ -1,13 +1,13 @@
-{% extends 'set/base/full.sql' %}
+{% extends 'set/base/select.sql' %}
 
 {% block where %}
-WHERE "bricktracker_sets"."id" IN (
+WHERE sets.u_id IN (
     SELECT
-        "inventory"."u_id"
+        inventory.u_id
-    FROM "inventory"
+    FROM inventory
 
-    WHERE "inventory"."set_num" IS NOT DISTINCT FROM :fig_num
+    WHERE inventory.set_num IS NOT DISTINCT FROM :fig_num
 
-    GROUP BY "inventory"."u_id"
+    GROUP BY inventory.u_id
 )
 {% endblock %}

bricktracker/sql/set/list/using_part.sql

@@ -1,15 +1,15 @@
-{% extends 'set/base/full.sql' %}
+{% extends 'set/base/select.sql' %}
 
 {% block where %}
-WHERE "bricktracker_sets"."id" IN (
+WHERE sets.u_id IN (
     SELECT
-        "inventory"."u_id"
+        inventory.u_id
-    FROM "inventory"
+    FROM inventory
 
-    WHERE "inventory"."color_id" IS NOT DISTINCT FROM :color_id
+    WHERE inventory.color_id IS NOT DISTINCT FROM :color_id
-    AND "inventory"."element_id" IS NOT DISTINCT FROM :element_id
+    AND inventory.element_id IS NOT DISTINCT FROM :element_id
-    AND "inventory"."part_num" IS NOT DISTINCT FROM :part_num
+    AND inventory.part_num IS NOT DISTINCT FROM :part_num
 
-    GROUP BY "inventory"."u_id"
+    GROUP BY inventory.u_id
 )
 {% endblock %}

bricktracker/sql/set/select.sql

@@ -0,0 +1,13 @@
+{% extends 'set/base/select.sql' %}
+
+{% block where_missing %}
+WHERE u_id IS NOT DISTINCT FROM :u_id
+{% endblock %}
+
+{% block where_minifigures %}
+WHERE u_id IS NOT DISTINCT FROM :u_id
+{% endblock %}
+
+{% block where %}
+WHERE sets.u_id IS NOT DISTINCT FROM :u_id
+{% endblock %}

bricktracker/sql/set/select/full.sql

@@ -1,13 +0,0 @@
-{% extends 'set/base/full.sql' %}
-
-{% block where_missing %}
-WHERE "missing"."u_id" IS NOT DISTINCT FROM :id
-{% endblock %}
-
-{% block where_minifigures %}
-WHERE "minifigures"."u_id" IS NOT DISTINCT FROM :id
-{% endblock %}
-
-{% block where %}
-WHERE "bricktracker_sets"."id" IS NOT DISTINCT FROM :id
-{% endblock %}

bricktracker/sql/set/select/light.sql

@@ -1,5 +0,0 @@
-{% extends 'set/base/light.sql' %}
-
-{% block where %}
-WHERE "bricktracker_sets"."id" IS NOT DISTINCT FROM :id
-{% endblock %}

bricktracker/sql/set/update/status.sql

@@ -1,10 +0,0 @@
-INSERT INTO "bricktracker_set_statuses" (
-    "bricktracker_set_id",
-    "{{name}}"
-) VALUES (
-    :id,
-    :status
-)
-ON CONFLICT("bricktracker_set_id")
-DO UPDATE SET "{{name}}" = :status
-WHERE "bricktracker_set_statuses"."bricktracker_set_id" IS NOT DISTINCT FROM :id

bricktracker/sql/set/update_checked.sql

@@ -0,0 +1,3 @@
+UPDATE sets
+SET {{name}} = :status
+WHERE u_id IS NOT DISTINCT FROM :u_id

bricktracker/sql/wish/base/base.sql

@@ -1,19 +0,0 @@
-SELECT
-    "bricktracker_wishes"."set",
-    "bricktracker_wishes"."name",
-    "bricktracker_wishes"."year",
-    "bricktracker_wishes"."theme_id",
-    "bricktracker_wishes"."number_of_parts",
-    "bricktracker_wishes"."image",
-    "bricktracker_wishes"."url"
-FROM "bricktracker_wishes"
-
-{% block where %}{% endblock %}
-
-{% if order %}
-ORDER BY {{ order }}
-{% endif %}
-
-{% if limit %}
-LIMIT {{ limit }}
-{% endif %}

bricktracker/sql/wish/base/select.sql

@@ -0,0 +1,20 @@
+SELECT
+    wishlist.set_num,
+    wishlist.name,
+    wishlist.year,
+    wishlist.theme_id,
+    wishlist.num_parts,
+    wishlist.set_img_url,
+    wishlist.set_url,
+    wishlist.last_modified_dt
+FROM wishlist
+
+{% block where %}{% endblock %}
+
+{% if order %}
+ORDER BY {{ order }}
+{% endif %}
+
+{% if limit %}
+LIMIT {{ limit }}
+{% endif %}