Merge branch 'master' into hotfix/pagination-bug

Reviewed-on: #98

.gitignore

@@ -21,6 +21,8 @@ static/sets/
 # Temporary
 *.csv
 /local/
+run_local.sh
+settings.local.json
 
 # Apple idiocy
 .DS_Store

CHANGELOG.md

@@ -1,12 +1,8 @@
 # Changelog
 
-## Unreleased
+## Unreleased 
 
-### Current PR
-
-- Added search/filter/sort options to `parts` and `minifigures`.
-
-### Next PR
+### 1.2.4
 
 > **Warning**
 > To use the new BrickLink color parameter in URLs, update your `.env` file:
@@ -18,6 +14,10 @@
   - Enhanced BrickLink URL generation with proper part number fallback
   - Extended admin set refresh to detect and track missing BrickLink data
 
+## 1.2.3
+
+Added search/filter/sort options to `parts` and `minifigures`.
+
 ## 1.2.2
 
 Fix legibility of "Damaged" and "Missing" fields for tiny screen by reducing horizontal padding

Dockerfile

@@ -5,6 +5,9 @@ WORKDIR /app
 # Bricktracker
 COPY . .
 
+# Fix line endings and set executable permissions for entrypoint script
+RUN sed -i 's/\r$//' entrypoint.sh && chmod +x entrypoint.sh
+
 # Python library requirements
 RUN pip --no-cache-dir install -r requirements.txt
 

app.py

@@ -1,6 +1,6 @@
 # This need to be first
-import eventlet
-eventlet.monkey_patch()
+import gevent.monkey
+gevent.monkey.patch_all()
 
 import logging  # noqa: E402
 

bricktracker/socket.py

@@ -70,7 +70,7 @@ class BrickSocket(object):
             *args,
             **kwargs,
             path=app.config['SOCKET_PATH'],
-            async_mode='eventlet',
+            async_mode='gevent',
         )
 
         # Store the socket in the app config

bricktracker/version.py

@@ -1,4 +1,4 @@
 from typing import Final
 
-__version__: Final[str] = '1.2.2'
+__version__: Final[str] = '1.2.4'
 __database_version__: Final[int] = 17

bricktracker/views/admin/image.py

@@ -25,6 +25,7 @@ def update() -> Response:
         BrickSet(),
         minifigure=BrickMinifigure(record={
             'set_img_url': None,
+            'image': None,
         })
     ).download()
 
@@ -33,7 +34,9 @@ def update() -> Response:
         BrickSet(),
         part=BrickPart(record={
             'part_img_url': None,
-            'part_img_url_id': None
+            'part_img_url_id': None,
+            'image_id': None,
+            'image': None,
         })
     ).download()
 

entrypoint.sh

@@ -13,4 +13,4 @@ then
 fi
 
 # Execute the WSGI server
-gunicorn --bind "${BK_SERVER}:${BK_PORT}" "app:create_app()" --worker-class "eventlet" "$@"
+gunicorn --bind "${BK_HOST}:${BK_PORT}" "wsgi:application" --worker-class "gevent" --workers 1 "$@"

requirements.txt

@@ -2,6 +2,7 @@ eventlet
 flask
 flask_socketio
 flask-login
+gevent
 gunicorn
 humanize
 jinja2

templates/base.html

@@ -91,8 +91,12 @@
     <script src="{{ url_for('static', filename='scripts/socket/instructions.js') }}"></script>
     <script src="{{ url_for('static', filename='scripts/socket/set.js') }}"></script>
     <script src="{{ url_for('static', filename='scripts/table.js') }}"></script>
+    {% if request.endpoint == 'minifigure.list' %}
     <script src="{{ url_for('static', filename='scripts/minifigures.js') }}"></script>
+    {% endif %}
+    {% if request.endpoint == 'part.list' %}
     <script src="{{ url_for('static', filename='scripts/parts.js') }}"></script>
+    {% endif %}
     <script type="text/javascript">
       document.addEventListener("DOMContentLoaded", () => {
         setup_grids();

wsgi.py

@@ -0,0 +1,18 @@
+#!/usr/bin/env python3
+"""
+WSGI entry point for BrickTracker - Production Docker deployment
+This ensures proper gevent monkey patching before any imports
+"""
+
+# CRITICAL: Monkey patch must be first, before ANY other imports
+import gevent.monkey
+gevent.monkey.patch_all()
+
+# Now import the regular app factory
+from app import create_app
+
+# Create the application - this will be a BrickSocket instance
+app_instance = create_app()
+
+# For gunicorn, we need the Flask app, not the BrickSocket wrapper
+application = app_instance.app if hasattr(app_instance, 'app') else app_instance