remove hardcoded folders

nimarion · Apr 1, 2024 · b613ae1 · b613ae1
1 parent 210d604
commit b613ae1
Show file tree

Hide file tree

Showing 27 changed files with 27 additions and 14 deletions.
diff --git a/.gitignore b/.gitignore
@@ -192,6 +192,4 @@ pyrightconfig.json
 .history
 .ionide
 
-output
-
 # End of https://www.toptal.com/developers/gitignore/api/python,visualstudiocode
diff --git a/README.md b/README.md
@@ -1,11 +1,21 @@
 # bib-generator
 
+Automatically generate DIN A5 (148 x 210) bibs for sports events. Text size is automatically adjusted to fit the bib. Supports custom fonts, headers and footers.
+
+## Using csv file
+
+- [Example file](data.dsv)
+
+
+
 ```bash
-python3 .\main.py --excel .\data.xlsx --output .\output\ --font .\agency_fb.ttf --header-offset 60
+python3 .\main.py --data .\example\data.csv --footer .\example\footer.png  --output .\example\output\ --font .\example\agency_fb.ttf --header-offset 60 --seperator ';'
 ```
 
+## Manual input
+
 ```bash
-python3 .\bib.py --text MARION --output NiklasMarion.png --header .\header\lotto.png --footer .\footer\rehlingen.png --font .\agency_fb.ttf --header-offset 60
+python3 .\bib.py --text LYLES --output .\example\output\Lyles.png --header .\example\globus.png --font .\example\agency_fb.ttf  --footer .\example\footer.png --header-offset 60--footer .\example\footer.png --header-offset 60
 ```
 
 ![image](https://github.com/nimarion/bib-generator/assets/23435250/5a7272fb-e5bb-4117-b3e0-b769daf06912)

diff --git a/bib.py b/bib.py
@@ -5,8 +5,8 @@
 def generate_image(txt, header_file, footer_file, font_file, header_offset = 0):
     # A5 size
     image = Image.new("RGB", (3508, 2480), "white") 
-    header = Image.open("header/" + header_file)
-    footer = Image.open("footer/" + footer_file)
+    header = Image.open(header_file)
+    footer = Image.open(footer_file)
     draw = ImageDraw.Draw(image)
     fontsize = 1  # starting font size
 

diff --git a/fonts/BebasNeue-Regular.ttf → example/BebasNeue-Regular.ttf b/fonts/BebasNeue-Regular.ttf → example/BebasNeue-Regular.ttf
diff --git a/fonts/agency_fb.ttf → example/agency_fb.ttf b/fonts/agency_fb.ttf → example/agency_fb.ttf
diff --git a/header/bitburger.png → example/bitburger.png b/header/bitburger.png → example/bitburger.png
diff --git a/example/data.csv b/example/data.csv
@@ -0,0 +1,5 @@
+firstname;lastname;header
+Imke;Onnen;example/globus.png
+Luna;Thiel;example/bitburger.png
+Joshua;Abuaku;example/bitburger.png
+Alexandra;Bell;example/globus.png
diff --git a/footer/rehlingen.png → example/footer.png b/footer/rehlingen.png → example/footer.png
diff --git a/header/globus.png → example/globus.png b/header/globus.png → example/globus.png
diff --git a/footer/.gitkeep → example/output/.gitkeep b/footer/.gitkeep → example/output/.gitkeep
diff --git a/example/output/Abuaku_Joshua.png b/example/output/Abuaku_Joshua.png
diff --git a/example/output/Bell_Alexandra.png b/example/output/Bell_Alexandra.png
diff --git a/example/output/Lyles.png b/example/output/Lyles.png
diff --git a/example/output/Onnen_Imke.png b/example/output/Onnen_Imke.png
diff --git a/example/output/Thiel_Luna.png b/example/output/Thiel_Luna.png
diff --git a/header/.gitkeep b/header/.gitkeep
diff --git a/header/edeka.png b/header/edeka.png
diff --git a/header/ford.png b/header/ford.png
diff --git a/header/heitz.png b/header/heitz.png
diff --git a/header/ikk.png b/header/ikk.png
diff --git a/header/innenministerium.png b/header/innenministerium.png
diff --git a/header/ksk.png b/header/ksk.png
diff --git a/header/lotto.png b/header/lotto.png
diff --git a/header/shs.png b/header/shs.png
diff --git a/header/vse.png b/header/vse.png
diff --git a/header/vvb.png b/header/vvb.png
diff --git a/main.py b/main.py
@@ -6,7 +6,8 @@
     argparse = argparse.ArgumentParser(
         prog='Bib Generator')
     argparse.add_argument(
-        '--excel', '-e', help='Excel file name', required=True)
+        '--data', '-d', help='CSV file name', required=True)
+    argparse.add_argument('--seperator', '-s', help='CSV seperator', default=',', required=False)
     argparse.add_argument(
         '--output', '-o', help='Output folder', required=True)
     argparse.add_argument('--font', '-F', help='Font file name', required=True)
@@ -17,20 +18,19 @@
 
     args = argparse.parse_args()
 
-    excel_file = args.excel
+    data_file = args.data
     output_folder = args.output
     font_file = args.font
     footer_file = args.footer
     header_offset = args.header_offset
 
-    df = pd.read_excel(excel_file)
+    df = pd.read_csv(data_file, sep=args.seperator)
 
     for index, row in df.iterrows():
-        firstname = row['Vorname']
-        lastname = row['Nachname']
+        firstname = row['firstname'] 
+        lastname = row['lastname']
         text = lastname.upper()
-        sponsor = row['Sponsor']
-        header_file = sponsor + ".png"
+        header_file = row['header']
         output_file = output_folder + "/" + lastname + "_" + firstname + ".png"
-        print("Generating bib for", firstname, lastname, "with sponsor", sponsor)
+        print("Generating bib for", firstname, lastname, "with header", header_file)
         bib_generator(text, output_file, header_file, footer_file, font_file, header_offset)
-Original file line number
+Diff line change
@@ Expand Up / @@ -192,6 +192,4 @@ pyrightconfig.json @@
     .history
     .ionide
-    output
     # End of https://www.toptal.com/developers/gitignore/api/python,visualstudiocode