update if none

src/modules/app.py

@@ -12,22 +12,22 @@ For more information, see
 - https://app.bitly.com/settings/api
 '''
 
-def calculate_positions(image_count, card_size=(91, 55), page_size=(210, 297), padding=(14, 11)):
+def calculate_positions(image_count, item_size=(20, 20), page_size=(91, 55), padding=(10, 10)):
     positions = []
     x, y = 0, 0
     pos_px, pos_py = padding
 
     for i in range(image_count):
-        if x + card_size[0] > page_size[0]:  # Check for horizontal overflow
+        if x + item_size[0] > page_size[0]:  # Check for horizontal overflow
             x = 0
-            y += card_size[1] + pos_py
+            y += item_size[1] + pos_py
 
-        if y + card_size[1] > page_size[1]:  # Check for vertical overflow
+        if y + item_size[1] > page_size[1]:  # Check for vertical overflow
             x = 0
             y = 0
 
         positions.append((x, y, pos_px, pos_py))
-        x += card_size[0] + pos_px
+        x += item_size[0] + pos_px
     print(positions)
     return positions
 
@@ -62,8 +62,8 @@ with gr.Blocks() as demo:
                 pos_df = gr.Dataframe(headers=headers, label="Positions")
 
                 cm_img_input.change(update_df, cm_img_input, pos_df)
+                idv_img_input.change(update_df, idv_img_input, pos_df)
 
-            # positions = [(10, 10), (int(0.9 * s * 3.7795), int(0.9 * 55 * 3.7795))]
         with gr.Column():
             file_output = gr.File(label="Download ZIP")
             with gr.Accordion(open=True, label="Gallery"):

src/modules/link.py

@@ -166,41 +166,46 @@ class UrlProcessor:
         #         encoded_string = base64.b64encode(image_file.read()).decode()
 
         os.makedirs(f'{tmpd}/img/cards', exist_ok=True)
-        for idx, (qr, indv) in enumerate(itertools.product(qr_pngs, individual_images), start=1):
-            try:
-                i = int(idx) - 1
-                print(i)
-                pos_x = int(positions_df.loc[i, 'PosX'])
-                pos_y = int(positions_df.loc[i, 'PosY'])
 
-                size = (int(91 * 3.7795), int(55 * 3.7795))
+        if qr_pngs is not None or individual_images is not None:
+            qr_pngs = qr_pngs if qr_pngs is not None else []
+            individual_images = individual_images if individual_images is not None else []
 
-                if common_images:
-                    for common_img in common_images:
-                        layer = processor.combine_images(layer, common_img, size, (pos_x, pos_y))
-                if individual_images:
-                    layer = processor.combine_images(layer, indv, size, (pos_x, pos_y))
+            for idx, (qr, indv) in enumerate(itertools.product(qr_pngs, individual_images), start=1):
+                try:
+                    i = int(idx) - 1
+                    print(i)
+                    pos_x = int(positions_df.loc[i, 'PosX'])
+                    pos_y = int(positions_df.loc[i, 'PosY'])
 
-                if qr:
-                    qr_size = (int(size[0] * 0.1), int(size[1] * 0.1))
-                    qr_pos = (int(0.9 * pos_x * 3.7795), int(0.9 * pos_y * 3.7795))
-                    layer = processor.combine_images(layer, qr, qr_size, qr_pos)
+                    size = (int(91 * 3.7795), int(55 * 3.7795))
 
+                    if common_images:
+                        for common_img in common_images:
+                            layer = processor.combine_images(layer, common_img, size, (pos_x, pos_y))
+                    if individual_images:
+                        layer = processor.combine_images(layer, indv, size, (pos_x, pos_y))
 
-                card_png_path = f'img/cards/CD{idx:05d}.png'
-                card_path = os.path.join(tmpd, card_png_path)
+                    if qr:
+                        qr_size = (int(size[0] * 0.1), int(size[1] * 0.1))
+                        qr_pos = (int(0.9 * pos_x * 3.7795), int(0.9 * pos_y * 3.7795))
+                        layer = processor.combine_images(layer, qr, qr_size, qr_pos)
 
-                layer.save(card_path, format="PNG")
-                card_pngs.append(card_path)
 
-                with open(card_path, "rb") as image_file:
-                    encoded_string = base64.b64encode(image_file.read()).decode()
+                    card_png_path = f'img/cards/CD{idx:05d}.png'
+                    card_path = os.path.join(tmpd, card_png_path)
 
-                card_html = f'<img src="data:image/png;base64,{encoded_string}" alt="Card"> '
-                card_htmls.append(card_html)
+                    layer.save(card_path, format="PNG")
+                    card_pngs.append(card_path)
 
-            except Exception as e:
-                raise Exception(f"Error combining images: {e}")
+                    with open(card_path, "rb") as image_file:
+                        encoded_string = base64.b64encode(image_file.read()).decode()
+
+                    card_html = f'<img src="data:image/png;base64,{encoded_string}" alt="Card"> '
+                    card_htmls.append(card_html)
+
+                except Exception as e:
+                    raise Exception(f"Error combining images: {e}")
 
 
         try: