0.2.4b version increment, bugfix coffee count

Reviewed-on: #14

compile.sh

@@ -1,8 +1,22 @@
 #!/usr/bin/env bash
+
+set -e
+
 if [ "$VIRTUAL_ENV" == "" ]
 then
-  source venv/bin/activate
+	if [ ! -d "./venv/bin" ]; then
+		echo "venv not found, trying to create one"
+		python3 -m venv venv
+	fi
+	source venv/bin/activate
 fi
+
+if [[ ! $(pip3 freeze | grep pyinstaller) ]];
+then
+	echo "pyinstaller not found"
+	pip3 install -r requirements.txt
+fi
+
 version=$(cat version.txt)
 echo "current version set to: $version"
 new_version=""
@@ -11,10 +25,11 @@ if [ "$new_version" != "" ]
 then
   echo "$new_version" | tee version.txt
 fi
-sed -i "s/VERSION = '[0-9]\.[0-9]\w'/VERSION = '$(cat version.txt)'/g" src/brovski-adress-etiketten-verwaltung.py
-sed -i "s/Version: [0-9]\.[0-9]\w/Version: $(cat version.txt)/g" deb-package/brovski-adressetiketten/DEBIAN/control
+sed -i "s/VERSION = '[0-9]\.[0-9].[0-9]\w'/VERSION = '$(cat version.txt)'/g" src/brovski-adress-etiketten-verwaltung.py
+sed -i "s/Version: [0-9]\.[0-9].[0-9]\w/Version: $(cat version.txt)/g" deb-package/brovski-adressetiketten/DEBIAN/control
 
 pyinstaller --clean --onefile src/brovski-adress-etiketten-verwaltung.py
+mkdir -p deb-package/brovski-adressetiketten/usr/local/bin
 cp dist/brovski-adress-etiketten-verwaltung deb-package/brovski-adressetiketten/usr/local/bin/brovski-adressetiketten
 dpkg-deb --build deb-package/brovski-adressetiketten
 mv deb-package/brovski-adressetiketten.deb ./

deb-package/brovski-adressetiketten/DEBIAN/control

@@ -1,5 +1,5 @@
 Package: brovski-adressetiketten
-Version: 0.1.0b
+Version: 0.2.4b
 Maintainer: Ovski
 Architecture: all
-Description: manage csv files for glables address labels
+Description: Manage and export addresses to csv. Can be used with glabels (example included in the source).

requirements.txt

@@ -0,0 +1,5 @@
+altgraph==0.17.4
+packaging==25.0
+pyinstaller==6.16.0
+pyinstaller-hooks-contrib==2025.9
+setuptools==80.9.0

src/brovski-adress-etiketten-verwaltung.py

@@ -1,3 +1,4 @@
+import _csv
 import csv
 import os
 import sys
@@ -8,17 +9,19 @@ from tkinter import ttk
 
 from config import Config
 from model import Model
+from connector import JSONConnector
 from windows import SettingsWindow, EditRecord, show_error
 
 
 class Application:
     def __init__(self):
+        os.chdir(os.getcwd())
         # tkinter settings
         x_offset = 700
         y_offset = 200
         width = 1050
         height = 700
-        VERSION = '0.1.0b'
+        VERSION = "0.2.3b"
         title = f"Brovski Adress-Etiketten Verwaltung {VERSION}"
 
         self.root = tk.Tk(className="BrovskiAdressEtiketten")
@@ -36,7 +39,7 @@ class Application:
         self.filter_active = tk.BooleanVar(value=False)
 
         # model connector
-        self.model = Model(self.config)
+        self.model = Model(JSONConnector(self.config))
 
         # init paths to json and csv file
         self.json_file_name = "brovski-adress-etiketten-verwaltung.json"
@@ -49,13 +52,15 @@ class Application:
         self.statusbar = tk.StringVar()
         self.length_address_list = None
         self.length_address_list_active = None
+        self.count_coffee = None
 
         # leave application if settings are bad
         if not self.config_good:
-            show_error(message_title="Fehler Konfiguration",
-                       message="Die Konfiguration ist fehlerhaft, bitte prüfe deine config.ini",
-                       parent=self.root
-                       )
+            show_error(
+                message_title="Fehler Konfiguration",
+                message="Die Konfiguration ist fehlerhaft, bitte prüfe deine config.ini",
+                parent=self.root,
+            )
             sys.exit()
 
         # frames
@@ -68,26 +73,50 @@ class Application:
 
         # top buttons
         button_width = 8
-        tk.Button(top_frame, text="Insert", command=self.insert_record, width=button_width).pack(side=tk.LEFT)
-        tk.Button(top_frame, text="Delete", command=self.delete_record, width=button_width).pack(side=tk.LEFT)
-        tk.Button(top_frame, text="Export CSV", command=self.export_csv, width=button_width).pack(side=tk.LEFT)
-        tk.Button(top_frame, text="Toggle Aktiv", command=self.toggle_active, width=button_width).pack(side=tk.LEFT)
-        tk.Checkbutton(top_frame, text="Filter aktiv", variable=self.filter_active, command=self.populate_table).pack(
-            side=tk.LEFT)
-        tk.Button(top_frame, text="Quit", command=self.on_close, width=button_width).pack(side=tk.RIGHT)
-        tk.Button(top_frame, text="Settings", command=self.show_settings, width=button_width).pack(side=tk.RIGHT)
+        tk.Button(
+            top_frame, text="Insert", command=self.insert_record, width=button_width
+        ).pack(side=tk.LEFT)
+        tk.Button(
+            top_frame, text="Delete", command=self.delete_record, width=button_width
+        ).pack(side=tk.LEFT)
+        tk.Button(
+            top_frame, text="Export CSV", command=self.export_csv, width=button_width
+        ).pack(side=tk.LEFT)
+        tk.Button(
+            top_frame,
+            text="Toggle Aktiv",
+            command=self.toggle_active,
+            width=button_width,
+        ).pack(side=tk.LEFT)
+        tk.Checkbutton(
+            top_frame,
+            text="Filter aktiv",
+            variable=self.filter_active,
+            command=self.populate_table,
+        ).pack(side=tk.LEFT)
+        tk.Button(
+            top_frame, text="Quit", command=self.on_close, width=button_width
+        ).pack(side=tk.RIGHT)
+        tk.Button(
+            top_frame, text="Settings", command=self.show_settings, width=button_width
+        ).pack(side=tk.RIGHT)
 
         # table content
         scrollbar = ttk.Scrollbar(data_frame, orient=tk.VERTICAL)
-        self.table = ttk.Treeview(data_frame, yscrollcommand=scrollbar.set, columns=("0", "1", "2", "3", "4"),
-                                  show="headings")
+        self.table = ttk.Treeview(
+            data_frame,
+            yscrollcommand=scrollbar.set,
+            columns=("0", "1", "2", "3", "4", "5"),
+            show="headings",
+        )
         scrollbar.config(command=self.table.yview)
-        self.table.heading('0', text="Aktiv")
-        self.table.column('0', anchor=tk.CENTER, width=0)
-        self.table.heading('1', text="Firma")
-        self.table.heading('2', text="Name")
-        self.table.heading('3', text="Strasse")
-        self.table.heading('4', text="Plz/Ort")
+        self.table.heading("0", text="Aktiv")
+        self.table.column("0", anchor=tk.CENTER, width=0)
+        self.table.heading("1", text="Firma")
+        self.table.heading("2", text="Name")
+        self.table.heading("3", text="Strasse")
+        self.table.heading("4", text="Plz/Ort")
+        self.table.heading("5", text="Anzahl")
         self.table.pack(side=tk.LEFT, fill=tk.BOTH, expand=True)
         scrollbar.pack(side=tk.LEFT, fill=tk.Y)
 
@@ -121,9 +150,11 @@ class Application:
             self.show_settings()
 
     def show_config_error(self):
-        show_error(message_title="Fehlerhafte Konfiguration",
-                   message="Konnte benötigte Parameter in config.ini nicht finden",
-                   parent=self.root)
+        show_error(
+            message_title="Fehlerhafte Konfiguration",
+            message="Konnte benötigte Parameter in config.ini nicht finden",
+            parent=self.root,
+        )
 
     def on_close(self):
         self.root.destroy()
@@ -138,7 +169,8 @@ class Application:
             "firma": "Firma",
             "name": "Name",
             "strasse": "Strasse",
-            "plzort": "Plz/Ort"
+            "plzort": "Plz/Ort",
+            "anzahl": "1",
         }
         self.model.create_new(values)
         self.populate_table()
@@ -149,14 +181,17 @@ class Application:
             return
 
         if len(self.table.selection()) > 1:
-            show_error(message_title="Mehrere Adressen ausgewählt",
-                       message="Es können nur einzelne Adressen gelöscht werden",
-                       parent=self.root)
+            show_error(
+                message_title="Mehrere Adressen ausgewählt",
+                message="Es können nur einzelne Adressen gelöscht werden",
+                parent=self.root,
+            )
             return
 
         if messagebox.askyesno(
-                "Eintrag löschen?",
-                "Willst du diesen Eintrag wirklich löschen?\nDies kann nicht rückgängig gemacht werden"):
+            "Eintrag löschen?",
+            "Willst du diesen Eintrag wirklich löschen?\nDies kann nicht rückgängig gemacht werden",
+        ):
             self.model.delete_by_id(self.current_record)
 
         self.deselect_tree()
@@ -206,7 +241,7 @@ class Application:
                 self.edit_selected_record()
 
     def enter_button(self, event):
-       self.edit_selected_record()
+        self.edit_selected_record()
 
     def click_on_header(self, event):
         column = self.table.identify_column(event.x)
@@ -227,6 +262,8 @@ class Application:
                 field = "strasse"
             case "#5":
                 field = "plzort"
+            case "#6":
+                field = "anzahl"
             case _:
                 field = "name"
 
@@ -239,7 +276,6 @@ class Application:
         self.current_record = int(self.table.focus())
         self.open_window_edit_records(self.current_record)
 
-
     def export_csv(self):
         try:
             with open(self.csv_file, "w", encoding="utf-8") as f:
@@ -247,18 +283,30 @@ class Application:
                 for address in self.address_list:
                     if address["aktiv"] != "x":
                         continue
-                    line = []
-                    if address["firma"] != "":
-                        line.append(address["firma"])
-                    line.append(address["name"])
-                    line.append(address["strasse"])
-                    line.append(address["plzort"])
-                    writer.writerow(line)
+                    for index in range(int(address["anzahl"])):
+                        self.write_sender_to_csv(address, writer)
+                        self.write_receiver_to_csv(address, writer)
         except FileNotFoundError:
-            show_error(message_title="Unexpected error",
-                       message=f"Could not write file {self.csv_file}",
-                       parent=self.root
-                       )
+            show_error(
+                message_title="Unexpected error",
+                message=f"Could not write file {self.csv_file}",
+                parent=self.root,
+            )
+
+    def write_receiver_to_csv(self, address: dict, csv_writer: _csv.writer):
+        receiver_line = []
+        if address["firma"] != "":
+            receiver_line.append(address["firma"])
+        receiver_line.append(address["name"])
+        receiver_line.append(address["strasse"])
+        receiver_line.append(address["plzort"])
+        csv_writer.writerow(receiver_line)
+
+    def write_sender_to_csv(self, address: dict, csv_writer: _csv.writer):
+        sender_line = []
+        for idx in range(4):
+            sender_line.append(self.config.get("absender", f"{idx}"))
+        csv_writer.writerow(sender_line)
 
     def populate_table(self, reload=True):
         if reload:
@@ -271,17 +319,26 @@ class Application:
             # skip inactive records if filter is true
             if self.filter_active.get() and address["aktiv"] != "x":
                 continue
-            self.table.insert('', 'end', iid=address["record_id"],
-                              values=(address["aktiv"], address["firma"], address["name"], address["strasse"],
-                                      address["plzort"])
-                              )
+            self.table.insert(
+                "",
+                "end",
+                iid=address["record_id"],
+                values=(
+                    address["aktiv"],
+                    address["firma"],
+                    address["name"],
+                    address["strasse"],
+                    address["plzort"],
+                    address["anzahl"],
+                ),
+            )
         self.update_status_bar()
 
     def export_table_to_address_list(self):
         self.address_list.clear()
         for child in self.table.get_children():
             self.address_list.append([])
-            for value in self.table.item(child)['values']:
+            for value in self.table.item(child)["values"]:
                 self.address_list[-1].append(value)
         self.update_status_bar()
 
@@ -304,15 +361,22 @@ class Application:
 
     def update_status_bar(self):
         self._count_address_records()
-        self.statusbar.set(f"Adressen: {self.length_address_list} | Aktive Adressen: {self.length_address_list_active}")
+        self.statusbar.set(
+            f"Adressen: {self.length_address_list} | "
+            f"Aktive Adressen: {self.length_address_list_active} | "
+            f"Total Kaffee: {self.count_coffee}"
+        )
 
     def _count_address_records(self):
         self.length_address_list = len(self.address_list)
         count = 0
+        count_coffee = 0
         for address in self.address_list:
             if address["aktiv"] == "x":
                 count += 1
+                count_coffee += int(address["anzahl"])
         self.length_address_list_active = count
+        self.count_coffee = count_coffee
 
     def first_sort_after_start(self):
         self.address_list.sort(key=lambda x: (x["firma"], x["name"]))
@@ -329,5 +393,5 @@ class Application:
             self.table.focus_force()
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     Application()

src/connector.py

@@ -2,7 +2,6 @@ import json
 import os
 from abc import ABC, abstractmethod
 
-import config
 from config import Config
 
 

src/model.py

@@ -1,11 +1,9 @@
-from config import Config
-from connector import JSONConnector
+from connector import Connector
 
 
 class Model:
-    def __init__(self, config: Config):
-        self.connector = JSONConnector(config)
-        self.config = config
+    def __init__(self, connector: Connector):
+        self.connector = connector
 
     def get_all(self):
         return self.connector.get_all()

src/windows.py

@@ -48,6 +48,7 @@ class EditRecord(Window):
         self.name = tk.StringVar(value=record.get("name"))
         self.strasse = tk.StringVar(value=record.get("strasse"))
         self.plz_ort = tk.StringVar(value=record.get("plzort"))
+        self.anzahl = tk.StringVar(value=record.get("anzahl"))
 
         edit_frame = tk.Frame(self)
         edit_frame.pack(side=tk.TOP, fill=tk.X, pady=20, padx=20)
@@ -56,6 +57,7 @@ class EditRecord(Window):
         tk.Label(edit_frame, text="Name").grid(row=0, column=2)
         tk.Label(edit_frame, text="Strasse").grid(row=0, column=3)
         tk.Label(edit_frame, text="Plz/Ort").grid(row=0, column=4)
+        tk.Label(edit_frame, text="Anzahl").grid(row=0, column=5)
         edit_aktiv = tk.Checkbutton(edit_frame, variable=self.aktiv, onvalue="x", offvalue="")
         edit_aktiv.grid(row=1, column=0)
         edit_firma = tk.Entry(edit_frame, textvariable=self.firma)
@@ -66,6 +68,8 @@ class EditRecord(Window):
         edit_strasse.grid(row=1, column=3)
         edit_plz_ort = tk.Entry(edit_frame, textvariable=self.plz_ort)
         edit_plz_ort.grid(row=1, column=4)
+        edit_anzahl = tk.Entry(edit_frame, textvariable=self.anzahl)
+        edit_anzahl.grid(row=1, column=5)
 
         button_frame = tk.Frame(self)
         button_frame.pack(side=tk.TOP, pady=10)
@@ -80,6 +84,7 @@ class EditRecord(Window):
             "name": self.name.get(),
             "strasse": self.strasse.get(),
             "plzort": self.plz_ort.get(),
+            "anzahl": self.anzahl.get(),
         }
         self.model.update_record(new_record)
         self.close_window()
@@ -88,18 +93,23 @@ class EditRecord(Window):
 class SettingsWindow(Window):
     def __init__(self, parent, root: tk.Tk, config: Config):
         super().__init__(parent, root)
-        self.geometry(f"500x330+{self.root.winfo_x() + 20}+{self.root.winfo_y() + 20}")
+        width = 500
+        height = 630
+        self.geometry(f"{width}x{height}+{self.root.winfo_x() + 20}+{self.root.winfo_y() + 20}")
         self.config = config
         self.json_file = tk.StringVar()
         self.csv_file = tk.StringVar()
+        self.absender_line = [tk.StringVar() for idx in range(4)]
 
         title = font.Font(family='Ubuntu Mono', size=20, weight=font.BOLD)
         tk.Label(self, text="Einstellungen", font=title).pack(pady=20)
 
-        path_frame = tk.Frame(self)
-        path_frame.pack(pady=(10, 40))
 
-        tk.Label(path_frame, text="Datenpfad JSON Datei").grid(row=0, column=0)
+        tk.Label(self, text="Datenpfad JSON Datei").pack()
+
+        path_frame = tk.Frame(self)
+        path_frame.pack(pady=(10, 10))
+
         tk.Entry(path_frame, textvariable=self.json_file, width=50).grid(row=1, column=0)
         tk.Button(path_frame, text="Pfad", command=lambda: self.set_json_path(self.json_file.get())).grid(row=1,
                                                                                                           column=1)
@@ -108,6 +118,13 @@ class SettingsWindow(Window):
         tk.Entry(path_frame, textvariable=self.csv_file, width=50).grid(row=3, column=0)
         tk.Button(path_frame, text="Pfad", command=lambda: self.set_csv_path(self.csv_file.get())).grid(row=3, column=1)
 
+        absender_frame = tk.Frame(self)
+        absender_frame.pack(pady=(10, 40))
+
+        tk.Label(absender_frame, text="Absender").pack(side=tk.TOP)
+        for idx in range(4):
+             tk.Entry(absender_frame, textvariable=self.absender_line[idx], width=50).pack(side=tk.TOP)
+
         bottom_frame = tk.Frame(self)
         bottom_frame.pack()
         tk.Button(bottom_frame, text="Ok", command=self.ok).pack(side=tk.LEFT)
@@ -144,6 +161,15 @@ class SettingsWindow(Window):
         except NoOptionError:
             self.config.set("csv", "path", "")
 
+        for idx in range(4):
+            try:
+                self.absender_line[idx].set(self.config.get(f"absender", f"{idx}"))
+            except NoSectionError:
+                self.config.add_section(f"line")
+                self.config.set("line", f"{idx}", "")
+            except NoOptionError:
+                self.config.set("line", f"{idx}", "")
+
     def ok(self):
         if self.json_file.get() == "" or self.csv_file.get() == "":
             show_error(message_title="Fehlerhafte Konfiguration",
@@ -152,6 +178,8 @@ class SettingsWindow(Window):
             return
         self.config.set("json", "path", self.json_file.get())
         self.config.set("csv", "path", self.csv_file.get())
+        for i in range(4):
+            self.config.set("absender", f"{i}", f"{self.absender_line[i].get()}")
         self.close_window()
 
     def cancel(self):

version.txt

@@ -1 +1 @@
-0.1.0b
+0.2.4b