updated to version 0.1.1b

Reviewed-on: #14

compile.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-if [ $VIRTUAL_ENV=="" ]
+if [ "$VIRTUAL_ENV" == "" ]
 then
   source venv/bin/activate
 fi
@@ -11,8 +11,8 @@ 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
 cp dist/brovski-adress-etiketten-verwaltung deb-package/brovski-adressetiketten/usr/local/bin/brovski-adressetiketten

deb-package/brovski-adressetiketten/DEBIAN/control

@@ -1,5 +1,5 @@
 Package: brovski-adressetiketten
-Version: 0.1.0b
+Version: 0.1.1b
 Maintainer: Ovski
 Architecture: all
 Description: manage csv files for glables address labels

src/brovski-adress-etiketten-verwaltung.py

@@ -18,7 +18,7 @@ class Application:
         y_offset = 200
         width = 1050
         height = 700
-        VERSION = '0.1.0b'
+        VERSION = '0.1.1b'
         title = f"Brovski Adress-Etiketten Verwaltung {VERSION}"
 
         self.root = tk.Tk(className="BrovskiAdressEtiketten")
@@ -264,6 +264,7 @@ class Application:
         if reload:
             self.address_list = self.model.get_all()
         if len(self.address_list) == 0:
+            self.delete_all_table_items()
             return
         self.delete_all_table_items()
         for address in self.address_list:
@@ -289,14 +290,14 @@ class Application:
             self.table.delete(item)
 
     def open_window_settings(self):
-        window = SettingsWindow(self, self.root)
+        window = SettingsWindow(self, self.root, self.config)
         window.wm_transient(self.root)
         window.wait_visibility()
         window.grab_set()
         return window
 
     def open_window_edit_records(self, record_id: int):
-        window = EditRecord(self, self.root, record_id)
+        window = EditRecord(self, self.root, record_id, self.config)
         window.wm_transient(self.root)
         window.wait_visibility()
         window.grab_set()

src/config.py

@@ -1,12 +1,11 @@
-import configparser
 import os
-from configparser import ConfigParser, DuplicateSectionError
+from configparser import ConfigParser, NoOptionError, NoSectionError, DuplicateSectionError
 
 
 class Config:
     parser: ConfigParser
 
-    def __init__(self, path: str = None, filename: str = "config.ini"):
+    def __init__(self, filename: str = "config.ini"):
         """
         Config parser reading config.ini
 
@@ -15,18 +14,12 @@ class Config:
             self.__filename: Path and name to the config file
         """
         self.parser = ConfigParser()
-        self.path = path
-        self.filename = filename
 
-        if self.path is None:
         home_path = os.environ["HOME"]
         full_path = os.path.join(home_path, ".config", "brovski-adress-etiketten" )
-        else:
-            full_path = self.path
-
         if not os.path.exists(full_path):
             os.makedirs(full_path)
-        self.config_file = os.path.join(full_path, self.filename)
+        self.config_file = os.path.join(full_path, filename)
 
         self._load()
 
@@ -42,7 +35,8 @@ class Config:
         try:
             self.parser.add_section(section)
         except DuplicateSectionError:
-            pass
+            return
+
         self._save()
 
     def set(self, section: str, option: str, value: str):
@@ -53,4 +47,10 @@ class Config:
 
     def get(self, section: str, option: str):
         self._load()
-        return self.parser.get(section, option)
+        try:
+            option = self.parser.get(section, option)
+        except NoOptionError:
+            option = ""
+        except NoSectionError:
+            option = ""
+        return option

src/connector.py

@@ -1,6 +1,8 @@
 import json
 import os
 from abc import ABC, abstractmethod
+
+import config
 from config import Config
 
 
@@ -34,14 +36,17 @@ class Connector(ABC):
 
 
 class JSONConnector(Connector):
-    def __init__(self, config: Config, ):
+    def __init__(self, config: Config):
         super().__init__(config)
         self.json_path = self.config.get("json", "path")
         self.json_file = os.path.join(self.json_path, "brovski-adress-etiketten-verwaltung-v7.json")
 
     def get_all(self) -> list:
+        try:
             with open(self.json_file, "r") as f:
                 return json.load(f)
+        except FileNotFoundError:
+            return []
 
     def get_all_sorted_by(self, field: str, reverse=False) -> list:
         with open(self.json_file, "r") as f:

src/model.py

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

src/windows.py

@@ -3,7 +3,7 @@ from configparser import NoSectionError, NoOptionError
 from tkinter import font, filedialog, messagebox
 
 from config import Config
-from model import Model
+from connector import JSONConnector
 
 
 def show_error(message_title: str, message: str, parent: tk.Tk | tk.Toplevel):
@@ -18,7 +18,6 @@ class Window(tk.Toplevel):
     def __init__(self, parent, root: tk.Tk):
         super().__init__(root)
         self.parent = parent
-        self.config = parent.config
         self.root = root
         self.protocol("WM_DELETE_WINDOW", self.close_window)
         self.bind("<Escape>", self.close_window)
@@ -33,11 +32,11 @@ class Window(tk.Toplevel):
 
 
 class EditRecord(Window):
-    def __init__(self, parent, root: tk.Tk, record_id: int):
+    def __init__(self, parent, root: tk.Tk, record_id: int, config: Config):
         super().__init__(parent, root)
         self.bind("<Return>", self._update)
 
-        self.model = Model(self.config)
+        self.model = JSONConnector(config)
 
         record = self.model.get_by_id(record_id)
 
@@ -87,10 +86,10 @@ class EditRecord(Window):
 
 
 class SettingsWindow(Window):
-    def __init__(self, parent, root: tk.Tk):
+    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}")
-        self.config = Config()
+        self.config = config
         self.json_file = tk.StringVar()
         self.csv_file = tk.StringVar()
 

tests/test_config.py

@@ -1,30 +0,0 @@
-import os
-from typing import assert_type
-
-import pytest
-
-from src.config import Config
-
-
-@pytest.fixture
-def config() -> Config:
-    config = Config(path="testfiles", filename="configtest.ini")
-    return config
-
-def teardown_config():
-    print("tearing down config test")
-
-def test_construction(config):
-    assert_type(config, Config)
-
-def test_file_creation(config):
-    config._save()
-    assert os.path.isfile(os.path.join(config.path, config.filename))
-
-def test_add_section(config):
-    config.add_section("test_section")
-    assert "test_section" in config.parser.sections()
-
-def test_set_and_get(config):
-    config.set(section="section", option="option", value="value")
-    assert config.get(section="section", option="option") == "value"

version.txt

@@ -1 +1 @@
-0.1.0b
+0.1.1b