update

src/modules/bitly-api.min.py

@@ -79,9 +79,9 @@ class ShortenUrl:
             buffered = BytesIO()
             img.save(buffered, format="PNG")
             qr_code_png = base64.b64encode(buffered.getvalue())
-            img_str = qr_code_png.decode()
+            img_str = qr_code_png.decode('ascii')
 
-            qr_code_html = f'<img src="data:image/png;base64,{img_str}" alt="QR Code" height="40px">'
+            qr_code_html = f'<nobr><img src="data:image/png;base64,{img_str}" alt="QR Code" height="40px"></nobr>'
             json_str = {"url": url}
             return qr_code_html, buffered.getvalue(), json_str
         except Exception as e:
@@ -91,14 +91,17 @@ def shorten_and_generate_qr(api_key, text, shorten, generate_qr):
     bitly = ShortenUrl(api_key)
     urls = re.findall(r'http[s]?://\S+', text)
     results = []
+    ts, tmpd = Interface.get_tempdir()
 
     markdown_links = text
     all_json_responses = []
     qr_svgs = []
     qr_pngs = []
 
-    for url in urls:
+    for idx, url in enumerate(urls):
         shorten_url, shorten_response_json = None, None
+        png_file_name = f'qr_code_{idx}.png'
+        png_output_path = os.path.join(tmpd, png_file_name)
         try:
             if shorten:
                 shorten_url, shorten_response_json = bitly.shorten(url)
@@ -117,7 +120,8 @@ def shorten_and_generate_qr(api_key, text, shorten, generate_qr):
 
                 if qr_png:
                     markdown_links = markdown_links.replace(
-                        url, f'{qr_html} [{url_to_process}]({url}) '
+                        # url, f'{qr_html} [{url_to_process}]({url}) '
+                        url, f'<img src="{png_file_name}" height="40"> [{url}]({url_to_process}) '
                     )
                     qr_pngs.append(qr_png)
                     qr_svgs.append(qr_html)
@@ -128,7 +132,8 @@ def shorten_and_generate_qr(api_key, text, shorten, generate_qr):
                 qr_html, qr_png, qr_json = bitly.generate_qr_local(url)
                 if qr_png:
                     markdown_links = markdown_links.replace(
-                        url, f'{qr_html} [{url}]({url}) '
+                        # url, f'{qr_html} [{url}]({url}) '
+                        url, f'<img src="{png_file_name}" height="40") [{url}]({url}) '
                     )
                     qr_pngs.append(qr_png)
                     qr_svgs.append(qr_html)
@@ -146,7 +151,6 @@ def shorten_and_generate_qr(api_key, text, shorten, generate_qr):
             results.append((str(e), url))
 
     try:
-        ts, tmpd = Interface.get_tempdir()
         json_output_path = os.path.join(tmpd, 'response.json')
         with open(json_output_path, 'w') as json_file:
             json.dump(all_json_responses, json_file)