add scale param

src/modules/app.py

@@ -14,25 +14,24 @@ For more information, see
 - https://app.bitly.com/settings/api
 '''
 
-def calculate_layout(image_count, item_size=(40, 40), page_size=(91, 55), pos=(300, 200), position=(30, 67)):
+def calculate_layout(image_count, item_size=(40, 40), page_size=(91, 55), pos=(280, 20), position=(30, 67)):
     layout = []
-    x, y = 0, 0
     pos_x, pos_y = pos
     pos_px, pos_py = position
     size_x, size_y = item_size
     size_px, size_py = item_size
 
     for i in range(image_count):
-        if x + item_size[0] > page_size[0]:  # Check for horizontal overflow
-            x = 0
-            y += item_size[1] + pos_py
+        if pos_x + item_size[0] > page_size[0]:  # Check for horizontal overflow
+            pos_x = 0
+            pos_y += item_size[1] + pos_py
 
-        if y + item_size[1] > page_size[1]:  # Check for vertical overflow
-            x = 0
-            y = 0
+        if pos_y + item_size[1] > page_size[1]:  # Check for vertical overflow
+            pos_x = 0
+            pos_y = 0
 
-        layout.append((image_count, x, y, pos_px, pos_py, size_x, size_y, size_px, size_py))
-        x += item_size[0] + pos_px
+        layout.append((image_count, pos_x, pos_y, pos_px, pos_py, size_x, size_y, size_px, size_py))
+        pos_x += item_size[0] + pos_px
     return layout
 
 with gr.Blocks() as demo:
@@ -49,7 +48,7 @@ with gr.Blocks() as demo:
                 if txt['files']:
                     for f in txt['files']:
                         with open(f) as f:
-                            text += f.read()
+                            text += f.read() + '\n\n'
                 if txt['text']:
                     text += txt['text']
                 urls = re.findall(r'http[s]?://\S+', text)
@@ -62,6 +61,7 @@ with gr.Blocks() as demo:
             with gr.Row():
                 sx = gr.Number(label="Card Width", minimum=1, maximum=210, value=91, step=1)
                 sy = gr.Number(label="Card Height", minimum=1, maximum=297, value=55, step=1)
+                scale = gr.Number(label="Scale", minimum=1, maximum=10, step=0.1)
 
             with gr.Row():
                 clear_button = gr.ClearButton(txt_input)
@@ -106,8 +106,7 @@ with gr.Blocks() as demo:
             ['demo/demo.jpg'],
             ['demo/logo.png']
             ],
-            # [{'files': ['demo/demo.md', 'demo/demo2.md']},
-            [{'files': ['demo/demo.md']},
+            [{'files': ['demo/demo.md', 'demo/demo2.md']},
             ['demo/demo.jpg'],
             ['demo/img/number-1.png', 'demo/img/number-2.png', 'demo/img/number-3.png', 'demo/img/number-4.png', 'demo/img/number-5.png', ]
             ]
@@ -134,6 +133,7 @@ with gr.Blocks() as demo:
             idv_img_input,
             sx,
             sy,
+            scale,
             df
             ],
         outputs=[preview_output, gallery_output, file_output, json_output]

src/modules/link.py

@@ -93,32 +93,30 @@ class UrlProcessor:
             return None, None, {"error": str(e)}
 
 
-    def shorten_and_generate_qr(access_token, api_url, text, shorten, generate_qr, common_images, individual_images, sx, sy, df):
+    def shorten_and_generate_qr(access_token, api_url, text, shorten, generate_qr, common_images, individual_images, sx, sy, scale, df):
         bitly = UrlProcessor(access_token, api_url)
+        index_path = 'index.html'
+        css_path = 'style.css'
+        results = []
+        ts, tmpd = Utils.get_tempdir()
+        all_json_responses = []
+        qr_svgs = []
+        qr_pngs = []
+        card_htmls = []
+        card_pngs = []
+        layer_output_paths = []
 
+        # TODO: Rotate Text follows each files?
         txt = ''
         if text['files']:
             for f in text['files']:
                 with open(f) as f:
-                    txt += f.read()
+                    txt += f.read() + '\n\n'
         if text['text']:
             txt += text['text']
 
         urls = re.findall(r'http[s]?://\S+', txt)
-
-        results = []
-        ts, tmpd = Utils.get_tempdir()
-
-        anno_txt = 'test'
         markdown_links = txt
-        all_json_responses = []
-        qr_svgs = []
-        qr_pngs = []
-        card_htmls = []
-        card_pngs = []
-        layer_output_paths = []
-        index_path = 'index.html'
-        css_path = 'style.css'
 
         if urls is not None:
             urls = urls if urls is not None else []
@@ -180,7 +178,7 @@ class UrlProcessor:
                 except Exception as e:
                     results.append((str(e), url))
 
-        size = (int(sx * 3.7795), int(sy * 3.7795))
+        size = (int(sx * 3.7795 * scale), int(sy * 3.7795 * scale))
 
         processor = ImageProcessor(size)
 
@@ -197,7 +195,6 @@ class UrlProcessor:
         else:
             num_iterations = 1
 
-
         # -------------------content start --------------------------------
         index_html = f'<html><head><link rel="stylesheet" type="text/css" href="{css_path}"></head><body>\n'
 
@@ -218,40 +215,40 @@ class UrlProcessor:
 
             if qr or indv:
                 try:
-                    pos_x = int(df.loc[idx, 'PosX'])
-                    pos_y = int(df.loc[idx, 'PosY'])
-                    pos_px = int(df.loc[idx, 'PosPx'])
-                    pos_py = int(df.loc[idx, 'PosPy'])
+                    pos_x = int(int(df.loc[idx, 'PosX']) * scale)
+                    pos_y = int(int(df.loc[idx, 'PosY']) * scale)
+                    pos_px = int(int(df.loc[idx, 'PosPx']) * scale)
+                    pos_py = int(int(df.loc[idx, 'PosPy']) * scale)
 
-                    size_x = int(df.loc[idx, 'SizeX'])
-                    size_y = int(df.loc[idx, 'SizeY'])
-                    size_px = int(df.loc[idx, 'SizePx'])
-                    size_py = int(df.loc[idx, 'SizePy'])
+                    size_x = int(int(df.loc[idx, 'SizeX']) * scale)
+                    size_y = int(int(df.loc[idx, 'SizeY']) * scale)
+                    size_px = int(int(df.loc[idx, 'SizePx']) * scale)
+                    size_py = int(int(df.loc[idx, 'SizePy']) * scale)
 
                     if common_images:
-                        os.makedirs(f'{tmpd}/img/layer/common', exist_ok=True)
+                        # os.makedirs(f'{tmpd}/img/layer/common', exist_ok=True)
                         for common_img in common_images:
                             layer = processor.combine_images(layer, common_img, size, (0, 0))
-                            layer_path = os.path.join(tmpd, f'img/layer/common/CM{idx:05d}.png')
-                            layer.save(layer_path, format="PNG")
-                            layer_output_paths.append(layer_path)
+                            # layer_path = os.path.join(tmpd, f'img/layer/common/CM{idx:05d}.png')
+                            # layer.save(layer_path, format="PNG")
+                            # layer_output_paths.append(layer_path)
 
                     if indv:
-                        os.makedirs(f'{tmpd}/img/layer/individual', exist_ok=True)
+                        # os.makedirs(f'{tmpd}/img/layer/individual', exist_ok=True)
                         layer = processor.combine_images(layer, indv, (size_x, size_y), (pos_x, pos_y))
-                        layer_path = os.path.join(tmpd, f'img/layer/individual/ID{idx:05d}.png')
-                        layer.save(layer_path, format="PNG")
-                        layer_output_paths.append(layer_path)
+                        # layer_path = os.path.join(tmpd, f'img/layer/individual/ID{idx:05d}.png')
+                        # layer.save(layer_path, format="PNG")
+                        # layer_output_paths.append(layer_path)
 
                     # if anno_txt:
                     #     layer = processor.combine_txt(layer, anno_txt, (size_px, size_py), (pos_px, pos_py))
 
                     if qr:
-                        os.makedirs(f'{tmpd}/img/layer/qr', exist_ok=True)
+                        # os.makedirs(f'{tmpd}/img/layer/qr', exist_ok=True)
                         layer = processor.combine_images(layer, qr, (size_px, size_py), (pos_px, pos_py))
-                        layer_path = os.path.join(tmpd, f'img/layer/qr/QR{idx:05d}.png')
-                        layer.save(layer_path, format="PNG")
-                        layer_output_paths.append(layer_path)
+                        # layer_path = os.path.join(tmpd, f'img/layer/qr/QR{idx:05d}.png')
+                        # layer.save(layer_path, format="PNG")
+                        # layer_output_paths.append(layer_path)
 
                     card_png_path = f'img/cards/CD{idx:05d}.png'
                     card_path = os.path.join(tmpd, card_png_path)

style.css

@@ -17,6 +17,7 @@
 
 body {
  font-size: 10pt;
+ color: #666;
  font-family: Alegreya, "Times New Roman", "游明朝", YuMincho, "Hiragino Mincho ProN", "MS PMincho", "Crimson Text", serif;
  display: grid;
  grid-template-columns: repeat(auto-fit, minmax(var(--card-width), 1fr));
@@ -33,7 +34,7 @@ p {
 }
 
 img {
- opacity: 0.1;
+ opacity: 1;
 }
 
 .card {