Spaces:

zundom
/

pentest-lab

Sleeping

App Files Files Community

admin commited on Jun 4, 2024

Commit

470f9a1

1 Parent(s): fd41354

update styles

Browse files

Files changed (5) hide show

requirements.txt +1 -1
src/modules/app.py +10 -7
src/modules/link.py +50 -10
src/modules/main.py +12 -64
style.css +77 -12

requirements.txt CHANGED Viewed

@@ -1,6 +1,6 @@
 gradio==4.32.2
-links==1.0
 Markdown==3.6
 Pillow==10.3.0
 python_frontmatter==1.1.0
 qrcode==7.4.2

 gradio==4.32.2
 Markdown==3.6
+pandas==1.5.3
 Pillow==10.3.0
 python_frontmatter==1.1.0
 qrcode==7.4.2

src/modules/app.py CHANGED Viewed

@@ -40,11 +40,18 @@ with gr.Blocks() as demo:
         with gr.Column():
             access_token = gr.Textbox(label="Access Token", placeholder="***")
             api_url = gr.Textbox(label="API base URL", placeholder="https://")
-            txt_input = gr.TextArea(label="Enter Text with URLs")
             count_url = gr.Dropdown(visible=False, allow_custom_value=True)
             @gr.render(inputs=[txt_input])
             def update_cnt(txt):
-                urls = re.findall(r'http[s]?://\S+', txt)
                 return urls
             with gr.Row():
@@ -87,7 +94,7 @@ with gr.Blocks() as demo:
             txt_input, cm_img_input, idv_img_input
         ]
         examples =     [
-            ['https://example.com',
             ['demo/demo.jpg'],
             ['demo/logo.png']
             ]
@@ -102,10 +109,6 @@ with gr.Blocks() as demo:
     cm_img_input.change(update_df, cm_img_input, df)
     idv_img_input.change(update_df, idv_img_input, df)
-    # example_temp_html = TextProcessor.apply_style('demo/demo.md', 'style.css') # TODO
-    with open('demo/demo.md') as f:
-        demo_txt = f.read()
     submit_button.click(
         UrlProcessor.shorten_and_generate_qr,
         inputs=[

         with gr.Column():
             access_token = gr.Textbox(label="Access Token", placeholder="***")
             api_url = gr.Textbox(label="API base URL", placeholder="https://")
+            txt_input = gr.MultimodalTextbox(label="Enter Text with URLs")
             count_url = gr.Dropdown(visible=False, allow_custom_value=True)
             @gr.render(inputs=[txt_input])
             def update_cnt(txt):
+                text = ''
+                if txt['files']:
+                    for f in txt['files']:
+                        with open(f) as f:
+                            text += f.read()
+                if txt['text']:
+                    text += txt['text']
+                urls = re.findall(r'http[s]?://\S+', text)
                 return urls
             with gr.Row():
             txt_input, cm_img_input, idv_img_input
         ]
         examples =     [
+            [{'files': ['demo/demo.md'], 'text': 'https://example.com'},
             ['demo/demo.jpg'],
             ['demo/logo.png']
             ]
     cm_img_input.change(update_df, cm_img_input, df)
     idv_img_input.change(update_df, idv_img_input, df)
     submit_button.click(
         UrlProcessor.shorten_and_generate_qr,
         inputs=[

src/modules/link.py CHANGED Viewed

@@ -1,16 +1,27 @@
 import os
-import requests
 import re
-import base64
 import json
 import qrcode
 import markdown
 import itertools
 from io import BytesIO
 from PIL import ImageOps
 from utils import Utils
-from main import Image, ImageProcessor
 BITLY_ACCESS_TOKEN = os.getenv('BITLY_ACCESS_TOKEN', None)
@@ -82,15 +93,23 @@ class UrlProcessor:
             return None, None, {"error": str(e)}
-    @staticmethod
-    def shorten_and_generate_qr(access_token, api_url, txt, shorten, generate_qr, common_images, individual_images, positions_df):
         bitly = UrlProcessor(access_token, api_url)
         urls = re.findall(r'http[s]?://\S+', txt)
         results = []
         ts, tmpd = Utils.get_tempdir()
         markdown_links = txt
         all_json_responses = []
         qr_svgs = []
@@ -175,6 +194,18 @@ class UrlProcessor:
         else:
             num_iterations = 1
         for idx in range(num_iterations):
             qr_idx = idx % len(qr_pngs) if qr_pngs else 0
             indv_idx = idx // len(qr_pngs) if individual_images else 0
@@ -183,7 +214,6 @@ class UrlProcessor:
             indv = individual_images[indv_idx] if individual_images else None
             if qr or indv:
-                print(idx)
                 try:
                     pos_x = int(positions_df.loc[idx, 'PosX'])
                     pos_y = int(positions_df.loc[idx, 'PosY'])
@@ -203,6 +233,9 @@ class UrlProcessor:
                     if indv:
                         layer = processor.combine_images(layer, indv, (size_x, size_y), (pos_x, pos_y))
                     if qr:
                         layer = processor.combine_images(layer, qr, (size_px, size_py), (pos_px, pos_py))
@@ -215,12 +248,16 @@ class UrlProcessor:
                     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:
             json_output_path = os.path.join(tmpd, 'response.json')
             with open(json_output_path, 'w') as json_file:
@@ -254,15 +291,18 @@ class UrlProcessor:
             for idx, png in enumerate(card_pngs):
                 card_png_output_paths.append(png)
-            index_html = f'<html><head><link rel="stylesheet" type="text/css" href="{css_path}"></head><body>'
             for card_html in card_htmls:
                 index_html += card_html
-            index_html += '</body></html>'
             index_output_path = os.path.join(tmpd, index_path)
             with open(index_output_path, 'w') as index_file:
                 index_file.write(index_html)
             zip_output_path = os.path.join(tmpd, f"{ts}.zip")
             zip_content_list = [
                 json_output_path,
@@ -272,7 +312,7 @@ class UrlProcessor:
                 *card_svg_output_paths,
                 *card_png_output_paths,
                 index_output_path,
-                css_path
             ]
             zip_output_path = Utils.create_zip(zip_content_list, zip_output_path)
         except Exception as e:

 import os
 import re
 import json
+import base64
+import shutil
 import qrcode
+import requests
 import markdown
+from markdown.extensions.codehilite import CodeHiliteExtension
+from markdown.extensions.toc import TocExtension
+from markdown.extensions.sane_lists import SaneListExtension
+from markdown.extensions.nl2br import Nl2BrExtension
+from markdown.extensions.fenced_code import FencedCodeExtension
+from markdown.extensions.wikilinks import WikiLinkExtension
+from markdown.extensions.footnotes import FootnoteExtension
+from markdown.extensions.tables import TableExtension
 import itertools
+import frontmatter
 from io import BytesIO
 from PIL import ImageOps
 from utils import Utils
+from main import Image, ImageProcessor, TextProcessor
 BITLY_ACCESS_TOKEN = os.getenv('BITLY_ACCESS_TOKEN', None)
             return None, None, {"error": str(e)}
+    def shorten_and_generate_qr(access_token, api_url, text, shorten, generate_qr, common_images, individual_images, positions_df):
         bitly = UrlProcessor(access_token, api_url)
+        txt = ''
+        if text['files']:
+            for f in text['files']:
+                with open(f) as f:
+                    txt += f.read()
+        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 = []
         else:
             num_iterations = 1
+        # -------------------content start --------------------------------
+        index_html = f'<html><head><link rel="stylesheet" type="text/css" href="{css_path}"></head><body>'
+        processed_text = ''
+        md = markdown.Markdown()
+        for idx, file in enumerate(text['files']):
+            fm = frontmatter.load(file)  # TODO
+            replacements = {key: list(item.values())[0] \
+                for item in fm.metadata['replace'] for key in item}
+            processed_text += TextProcessor.apply_frontmatter(fm.content, replacements)
         for idx in range(num_iterations):
             qr_idx = idx % len(qr_pngs) if qr_pngs else 0
             indv_idx = idx // len(qr_pngs) if individual_images else 0
             indv = individual_images[indv_idx] if individual_images else None
             if qr or indv:
                 try:
                     pos_x = int(positions_df.loc[idx, 'PosX'])
                     pos_y = int(positions_df.loc[idx, 'PosY'])
                     if indv:
                         layer = processor.combine_images(layer, indv, (size_x, size_y), (pos_x, pos_y))
+                    # if anno_txt:
+                    #     layer = processor.combine_txt(layer, anno_txt, (size_px, size_py), (pos_px, pos_py))
                     if qr:
                         layer = processor.combine_images(layer, qr, (size_px, size_py), (pos_px, pos_py))
                     with open(card_path, "rb") as image_file:
                         encoded_string = base64.b64encode(image_file.read()).decode()
+                    html_txt = md.convert(processed_text)
+                    card_html = f'<div class="card"><img src="data:image/png;base64,{encoded_string}" alt="Card">{html_txt}</div>'
                     card_htmls.append(card_html)
                 except Exception as e:
                     raise Exception(f"Error combining images: {e}")
+        index_html += '</body></html>'
+        # -------------------content end --------------------------------
         try:
             json_output_path = os.path.join(tmpd, 'response.json')
             with open(json_output_path, 'w') as json_file:
             for idx, png in enumerate(card_pngs):
                 card_png_output_paths.append(png)
             for card_html in card_htmls:
                 index_html += card_html
             index_output_path = os.path.join(tmpd, index_path)
             with open(index_output_path, 'w') as index_file:
                 index_file.write(index_html)
+            css_output_path = os.path.join(tmpd, css_path)
+            shutil.copy(css_path, css_output_path)
             zip_output_path = os.path.join(tmpd, f"{ts}.zip")
             zip_content_list = [
                 json_output_path,
                 *card_svg_output_paths,
                 *card_png_output_paths,
                 index_output_path,
+                css_output_path
             ]
             zip_output_path = Utils.create_zip(zip_content_list, zip_output_path)
         except Exception as e:

src/modules/main.py CHANGED Viewed

@@ -1,6 +1,4 @@
 import os
-import markdown
-import frontmatter
 from PIL import Image, ImageDraw, ImageFont, ImageOps
 from utils import Utils
@@ -11,26 +9,6 @@ class TextProcessor:
             text = text.replace(f'{{{key}}}', value)
         return text
-    def apply_style(input_markdown_path, style_css_path):
-        with open(input_markdown_path, 'r') as file:
-            md_content = file.read()
-        fm = frontmatter.load(input_markdown_path)
-        replacements = {key: list(item.values())[0] \
-            for item in fm.metadata['replace'] for key in item}
-        processed_text = TextProcessor.apply_frontmatter(md_content, replacements)
-        with open(style_css_path, 'r') as file:
-            style_css = file.read()
-        html_content = markdown.markdown(processed_text)
-        html_content = f'<html><head><style>{style_css}</style></head><body>{html_content}</body></html>'
-        temp_html_path = os.path.join(tempfile.gettempdir(), 'processed.html')
-        with open(temp_html_path, 'w') as file:
-            file.write(html_content)
-        return temp_html_path
 class ImageProcessor:
     def __init__(self):
@@ -71,46 +49,16 @@ class ImageProcessor:
             return base_img
         except Exception as e:
             raise Exception(f"Error combining images: {e}")
-    # @staticmethod
-    # def insert_txt(png_path, text):
-    #     img = Image.open(png_path)
-    #     draw = ImageDraw.Draw(img)
-    #     font = ImageFont.load_default()  # Update to a specific font if needed
-    #     width, height = img.size
-    #     text_width, text_height = draw.textlength(text, font=font)
-    #     text_position = (width - text_width - 10, height - text_height - 10)
-    #     draw.text(text_position, text, font=font, fill="black")
-    #     with tempfile.NamedTemporaryFile(delete=False, suffix='.png') as tmpfile:
-    #         img.save(tmpfile.name, format="PNG")
-    #         return tmpfile.name
-    # @staticmethod
-    # def insert_txt(png_path, text):
-    #     img = Image.open(png_path)
-    #     draw = ImageDraw.Draw(img)
-    #     font = ImageFont.load_default()  # Update to a specific font if needed
-    #     width, height = img.size
-    #     text_width, text_height = draw.textlength(text, font=font)
-    #     text_position = (width - text_width - 10, height - text_height - 10)
-    #     draw.text(text_position, text, font=font, fill="black")
-    #     with tempfile.NamedTemporaryFile(delete=False, suffix='.png') as tmpfile:
-    #         img.save(tmpfile.name, format="PNG")
-    #         return tmpfile.name
-    @staticmethod
-    def move_image(image_path, position, temp_dir=None):
-        try:
-            if temp_dir is None:
-                _, temp_dir = Utils.get_tempdir()
-            with open(image_path, 'rb') as f:
-                img = Image.open(f).convert("RGBA")
-            result_img = Image.new("RGBA", img.size, (255, 255, 255, 0))
-            result_img.paste(img, position, img)
-            file_path = os.path.join(temp_dir, 'moved.png')
-            result_img.save(file_path, format="PNG")
-            return file_path
-        except Exception as e:
-            raise Exception(f"Error moving image: {e}")

 import os
 from PIL import Image, ImageDraw, ImageFont, ImageOps
 from utils import Utils
             text = text.replace(f'{{{key}}}', value)
         return text
 class ImageProcessor:
     def __init__(self):
             return base_img
         except Exception as e:
             raise Exception(f"Error combining images: {e}")
+    # def combine_txt(self, base_image, text, size, position, font_path='fonts/msmincho.ttc', font_size=12, fill="black"):
+    #     try:
+    #         font_path = str(Path(__file__).parent / "../fonts/msmincho.ttc")
+    #         font = ImageFont.truetype(font_path, font_size)
+    #         base_img = base_image.convert("RGBA")
+    #         draw = ImageDraw.Draw(base_img)
+    #         w, h = size
+    #         draw.text(position, text, font=font, fill=fill)
+    #         return base_img
+    #     except Exception as e:
+    #         raise Exception(f"Error combining text: {e}")

style.css CHANGED Viewed

@@ -1,41 +1,106 @@
 h1 {
-        font-weight: bold;
 }
-/* フォントとマージンの設定 */
 p {
   font-family: 'MS Mincho', serif;
-  margin: 10%;
 }
-/* 画像の透明度設定 */
 img {
-  opacity: 0.5;
 }
-/* QRコードの位置設定 */
 .qr {
   position: absolute;
   bottom: 10px;
   right: 10px;
-  margin: 10%;
 }
-/* カードのサイズとグリッドレイアウト設定 */
 .card {
   width: 91mm;
   height: 55mm;
   display: grid;
   grid-template-columns: 1fr;
-  grid-template-rows: 1fr;
   align-items: center;
   justify-items: center;
-  border: 1px solid black;
-  margin: 5mm;
   position: relative;
 }
-/* 印刷時のA4用紙設定 */
 @media print {
   .a4 {
       page-break-after: always;

+@import url('https://fonts.googleapis.com/css2?family=Alegreya:ital,wght@0,400;0,500;0,700;0,800;0,900;1,400;1,500;1,700;1,800;1,900&display=swap');
+@font-face {
+  font-family: 'YuMincho';
+  src: url("./fonts/yumin.ttf") format('truetype');
+  font-weight: regular;
+}
+body {
+  font-size: 10pt;
+  font-family: Alegreya, "Times New Roman", "游明朝", YuMincho, "Hiragino Mincho ProN", "MS PMincho", "Crimson Text", serif;
+}
 h1 {
+  font-weight: bold;
 }
 p {
   font-family: 'MS Mincho', serif;
 }
 img {
+  opacity: 1;
 }
 .qr {
   position: absolute;
   bottom: 10px;
   right: 10px;
 }
 .card {
   width: 91mm;
   height: 55mm;
   display: grid;
   grid-template-columns: 1fr;
+  grid-template-rows: 2fr 1fr 1fr  1fr 3fr;
   align-items: center;
   justify-items: center;
+  border: 0px solid black;
   position: relative;
 }
+.card > * {
+  margin: 0;
+}
+.card h1 {
+  font-size: 1.4rem;
+  font-weight: bold;
+  grid-column: 1;
+  grid-row: 2;
+}
+.card h2 {
+  font-size: 1rem;
+  grid-column: 1;
+  grid-row: 3;
+}
+.card h3 {
+  font-size: 1rem;
+  grid-column: 1;
+  grid-row: 4;
+}
+.card h4 {
+  font-size: 1rem;
+}
+.card h5 {
+  font-size: 1rem;
+}
+.card h6 {
+  font-size: 1rem;
+}
+.card ul {
+  list-style: none;
+  justify-self: start;
+  grid-column: 1;
+  grid-row: 5;
+}
+.card ol {
+  list-style: none;
+  padding: 0;
+}
+.card li {
+  font-size: 0.6rem;
+}
+.card img {
+  max-width: 100%;
+  max-height: 100%;
+  grid-row: 4;
+  justify-self: end;
+  align-self: end;
+  position: fixed;
+}
 @media print {
   .a4 {
       page-break-after: always;