Updated changelog

CHANGELOG.md

@@ -4,10 +4,8 @@
 
 ### Bug Fixes
 
-- **Fixed crash when importing sets containing minifigures or parts with no image on Rebrickable** (Issue #149c, branch `bugfix/issue-149c`): Adding or refreshing a set would fail entirely if any minifigure or part had no image URL, with error `Invalid URL '': No scheme supplied`
+- **Fixed previously added set being re-added when adding an individual minifigure** (Issue #150, branch `bugfix/issue-150`): After adding a set, entering a `fig-` ID and confirming would add the previous set again instead of the minifigure, if user did not reload inbetween. 
-  - Rebrickable returns an empty string (not `None`) for missing images; normalize empty strings to `None` at the point of ingestion in `rebrickable_minifigure.py` and `individual_minifigure.py`, matching the existing pattern in `rebrickable_set.py`
+  - `add.js` was creating a second `BrickMinifigureSocket` with its own listeners on the same button and input as `BrickSetSocket`, causing duplicate socket events and cross-socket state confusion
-  - Updated `rebrickable_image.py` to treat empty strings the same as `None` throughout, falling back to the configured nil placeholder image
-  - Note: the originally reported sets could no longer reproduce the crash (images may have since been added on Rebrickable), so this fix is based on asumptions only
 - **Fixed deleting a wish with an owner assigned** (Issue #152): Resolved foreign key constraint error when removing a set from the wishlist that had an owner assigned
   - Wish owners are now deleted before the wish itself, respecting the FK constraint
 

bricktracker/individual_minifigure.py

@@ -543,6 +543,6 @@ class IndividualMinifigure(RebrickableMinifigure):
             'figure': str(data['set_num']),
             'number': int(number),
             'name': str(data['set_name']),
-            'image': str(data['set_img_url']) if data.get('set_img_url') else None,
+            'image': data.get('set_img_url'),
             'number_of_parts': int(data.get('num_parts', 0)),
         }

bricktracker/rebrickable_image.py

@@ -55,7 +55,7 @@ class RebrickableImage(object):
 
         # Get the URL (this handles nil images via url() method)
         url = self.url()
-        if not url:
+        if url is None:
             return
 
         # Grab the image
@@ -88,7 +88,7 @@ class RebrickableImage(object):
                 return self.part.fields.image_id
 
         if self.minifigure is not None:
-            if not self.minifigure.fields.image:
+            if self.minifigure.fields.image is None:
                 return RebrickableImage.nil_minifigure_name()
             else:
                 return self.minifigure.fields.figure
@@ -113,13 +113,13 @@ class RebrickableImage(object):
     # Return the url depending on the objects provided
     def url(self, /) -> str:
         if self.part is not None:
-            if not self.part.fields.image:
+            if self.part.fields.image is None:
                 return current_app.config['REBRICKABLE_IMAGE_NIL']
             else:
                 return self.part.fields.image
 
         if self.minifigure is not None:
-            if not self.minifigure.fields.image:
+            if self.minifigure.fields.image is None:
                 return current_app.config['REBRICKABLE_IMAGE_NIL_MINIFIGURE']
             else:
                 return self.minifigure.fields.image

bricktracker/rebrickable_minifigure.py

@@ -110,5 +110,5 @@ class RebrickableMinifigure(BrickRecord):
             'number': int(number),
             'name': str(data['set_name']),
             'quantity': int(data['quantity']),
-            'image': str(data['set_img_url']) if data['set_img_url'] else None,
+            'image': data['set_img_url'],
         }

static/scripts/add.js

@@ -1,6 +1,6 @@
 // Add page - handles both sets and individual minifigures
+// Server auto-routes fig- numbers to IndividualMinifigure via LOAD_SET / IMPORT_SET
 document.addEventListener("DOMContentLoaded", () => {
-  // Initialize date pickers
   document.querySelectorAll('[data-add-date="true"]').forEach(el => {
     new Datepicker(el, {
       buttonClass: 'btn',
@@ -8,81 +8,23 @@ document.addEventListener("DOMContentLoaded", () => {
     });
   });
 
-  // Get template data from data attributes
   const addContainer = document.getElementById('add-set');
   if (!addContainer) return;
 
-  // Read data from data attributes
+  new BrickSetSocket(
-  const templateData = {
+    'add',
-    path: addContainer.dataset.path,
+    addContainer.dataset.path,
-    namespace: addContainer.dataset.namespace,
+    addContainer.dataset.namespace,
-    messages: {
+    {
       COMPLETE: addContainer.dataset.msgComplete,
       FAIL: addContainer.dataset.msgFail,
       IMPORT_SET: addContainer.dataset.msgImportSet,
       LOAD_SET: addContainer.dataset.msgLoadSet,
       PROGRESS: addContainer.dataset.msgProgress,
       SET_LOADED: addContainer.dataset.msgSetLoaded,
-      IMPORT_MINIFIGURE: addContainer.dataset.msgImportMinifigure,
-      LOAD_MINIFIGURE: addContainer.dataset.msgLoadMinifigure,
       MINIFIGURE_LOADED: addContainer.dataset.msgMinifigureLoaded,
-    }
-  };
-
-  // Default: create set socket
-  const setSocket = new BrickSetSocket(
-    'add',
-    templateData.path,
-    templateData.namespace,
-    {
-      COMPLETE: templateData.messages.COMPLETE,
-      FAIL: templateData.messages.FAIL,
-      IMPORT_SET: templateData.messages.IMPORT_SET,
-      LOAD_SET: templateData.messages.LOAD_SET,
-      PROGRESS: templateData.messages.PROGRESS,
-      SET_LOADED: templateData.messages.SET_LOADED,
     },
     false,
     false
   );
-
-  // Override the execute method to check for minifigures
-  const originalExecute = setSocket.execute.bind(setSocket);
-  let minifigSocket = null;
-
-  setSocket.execute = function() {
-    const inputValue = document.getElementById('add-set').value.trim();
-
-    if (inputValue.startsWith('fig-') || inputValue.match(/^fig\d/i)) {
-      // It's a minifigure - create minifig socket if needed and execute when ready
-      if (!minifigSocket) {
-        minifigSocket = new BrickMinifigureSocket(
-          'add',
-          templateData.path,
-          templateData.namespace,
-          {
-            COMPLETE: templateData.messages.COMPLETE,
-            FAIL: templateData.messages.FAIL,
-            IMPORT_MINIFIGURE: templateData.messages.IMPORT_MINIFIGURE,
-            LOAD_MINIFIGURE: templateData.messages.LOAD_MINIFIGURE,
-            MINIFIGURE_LOADED: templateData.messages.MINIFIGURE_LOADED,
-            PROGRESS: templateData.messages.PROGRESS,
-          }
-        );
-
-        // Wait for socket to connect before executing
-        const checkConnection = setInterval(() => {
-          if (minifigSocket.socket && minifigSocket.socket.connected) {
-            clearInterval(checkConnection);
-            minifigSocket.execute();
-          }
-        }, 100);
-      } else {
-        minifigSocket.execute();
-      }
-    } else {
-      // It's a set - use original execute
-      originalExecute();
-    }
-  };
 });