From 9ff0a5946c49856b1a177f741e9338eddcc70e44 Mon Sep 17 00:00:00 2001 From: Thomas Vogl Date: Fri, 16 Dec 2022 23:40:58 +0100 Subject: [PATCH] some refactoring --- .../CalendarSync.py | 0 .../LocalDataStorage.py | 0 .../MyMuellDataModel.py | 3 +- databinding/__init__.py | 0 MyMuell2CalDavGui.py => mymuell2caldav.py | 38 ++++++------------- GuiWorker.py => utils/GuiWorker.py | 0 utils/__init__.py | 0 7 files changed, 12 insertions(+), 29 deletions(-) rename CalendarSync.py => databinding/CalendarSync.py (100%) rename LocalDataStorage.py => databinding/LocalDataStorage.py (100%) rename MyMuellDataModel.py => databinding/MyMuellDataModel.py (97%) create mode 100644 databinding/__init__.py rename MyMuell2CalDavGui.py => mymuell2caldav.py (95%) rename GuiWorker.py => utils/GuiWorker.py (100%) create mode 100644 utils/__init__.py diff --git a/CalendarSync.py b/databinding/CalendarSync.py similarity index 100% rename from CalendarSync.py rename to databinding/CalendarSync.py diff --git a/LocalDataStorage.py b/databinding/LocalDataStorage.py similarity index 100% rename from LocalDataStorage.py rename to databinding/LocalDataStorage.py diff --git a/MyMuellDataModel.py b/databinding/MyMuellDataModel.py similarity index 97% rename from MyMuellDataModel.py rename to databinding/MyMuellDataModel.py index 3a7dd54..d7033ca 100644 --- a/MyMuellDataModel.py +++ b/databinding/MyMuellDataModel.py @@ -1,7 +1,6 @@ import http.client import json -import LocalDataStorage -from appdirs import * +import databinding.LocalDataStorage as LocalDataStorage import logging import re diff --git a/databinding/__init__.py b/databinding/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/MyMuell2CalDavGui.py b/mymuell2caldav.py similarity index 95% rename from MyMuell2CalDavGui.py rename to mymuell2caldav.py index 7f9ffc3..e0bc7a4 100644 --- a/MyMuell2CalDavGui.py +++ b/mymuell2caldav.py @@ -17,13 +17,11 @@ from PyQt5.QtWidgets import \ QSizePolicy, \ QMainWindow - -from PyQt5.QtCore import QModelIndex, Qt -import MyMuellDataModel +from PyQt5.QtCore import Qt import sys -import CalendarSync -from GuiWorker import GuiWorker +from databinding import CalendarSync, MyMuellDataModel +from utils.GuiWorker import GuiWorker class MyMuell2CalDavGui(QMainWindow): @@ -61,10 +59,9 @@ class MyMuell2CalDavGui(QMainWindow): self._workerSync = GuiWorker(self.runnable_sync_events) self._workerDelete = GuiWorker(self.runnable_delete_events) + self.__init_ui() - self.initUI() - - self.__fillCities() + self.__fill_cities() def entrySelected(self, i: QListWidgetItem): city = self._dataModel.get_city_by_id(i.data(QListWidgetItem.UserType)) @@ -103,7 +100,7 @@ class MyMuell2CalDavGui(QMainWindow): for i in range(0, len(events)): worker.stateChanged.emit("creating event {} {}".format(events[i]["title"], events[i]["day"])) self._davClient.syncEvents(events[i]) - worker.progressChanged.emit(i+1) + worker.progressChanged.emit(i + 1) worker.stateChanged.emit("syncing events finished") return True, "syncing events finished" @@ -126,14 +123,13 @@ class MyMuell2CalDavGui(QMainWindow): for i in range(0, len(events)): worker.stateChanged.emit("deleting event {}".format(events[i].vobject_instance.vevent.uid.value)) events[i].delete() - worker.progressChanged.emit(i+1) + worker.progressChanged.emit(i + 1) worker.stateChanged.emit("deletion finished.") return True, "deleting events finished" def runnable_connect_caldav(self, worker: GuiWorker) -> tuple[bool, str]: - try: worker.stateChanged.emit("connecting to {}".format(self._url.text())) self._davClient.connect(self._url.text(), self._user.text(), self._password.text()) @@ -147,20 +143,15 @@ class MyMuell2CalDavGui(QMainWindow): if self._settings["calendar"] != '': self._calendarNames.setCurrentText(self._settings["calendar"]) - - worker.stateChanged.emit("connected.") - - - except Exception as e: worker.stateChanged.emit("connection failed.") return False, str(e) return True, "connect successful" - def initUI(self): + def __init_ui(self): tlWidget = QWidget() layout = QGridLayout() @@ -168,8 +159,6 @@ class MyMuell2CalDavGui(QMainWindow): self.setCentralWidget(tlWidget) - - groupBoxMyMuell = QGroupBox("MyMüll.de Cities") layoutGroupBoxMyMuell = QGridLayout() groupBoxMyMuell.setLayout(layoutGroupBoxMyMuell) @@ -223,7 +212,7 @@ class MyMuell2CalDavGui(QMainWindow): self._calendarNames.setEnabled(False) self._citiesWidget.currentItemChanged.connect(lambda cur, prev: self.entrySelected(cur)) - self._filterText.textChanged.connect(self.__fillCities) + self._filterText.textChanged.connect(self.__fill_cities) self._url.textChanged.connect(self.saveSettings) self._user.textChanged.connect(self.saveSettings) @@ -257,13 +246,10 @@ class MyMuell2CalDavGui(QMainWindow): self._user.setContentsMargins(0, 10, 0, 10) self._calendarNames.setContentsMargins(0, 10, 0, 10) - - #self.setGeometry(300, 300, 1000, 800) + # self.setGeometry(300, 300, 1000, 800) self.setMinimumWidth(800) self.setWindowTitle("MyMuell DAV GUI") - - def slot_process_finished(self, result: bool, msg: str): if result: self._errorMessage.information(self, "info", msg) @@ -280,7 +266,7 @@ class MyMuell2CalDavGui(QMainWindow): else: self._syncButton.setEnabled(False) - def __fillCities(self, pattern=".+"): + def __fill_cities(self, pattern=".+"): self._citiesWidget.blockSignals(True) self._citiesWidget.clear() @@ -303,8 +289,6 @@ class MyMuell2CalDavGui(QMainWindow): self._citiesWidget.setCurrentItem(items[0]) - - def main(): app = QApplication(sys.argv) w = MyMuell2CalDavGui() diff --git a/GuiWorker.py b/utils/GuiWorker.py similarity index 100% rename from GuiWorker.py rename to utils/GuiWorker.py diff --git a/utils/__init__.py b/utils/__init__.py new file mode 100644 index 0000000..e69de29