excel2moodle 0.3.5__py3-none-any.whl → 0.3.6__py3-none-any.whl

excel2moodle/__init__.py

@@ -56,14 +56,9 @@ if __package__ is not None:
 settings = Settings()
 logfile = Path(settings.get(SettingsKey.LOGFILE)).resolve()
 e2mMetadata["logfile"] = logfile
-logfile.replace(f"{logfile}.old")
+if logfile.exists():
+    logfile.replace(f"{logfile}.old")
 
-logger = logging.getLogger(__name__)
+mainLogger = logging.getLogger(__name__)
 logConfig.dictConfig(config=loggerConfig)
 qSignalLogger = LogWindowHandler()
-logger.addHandler(qSignalLogger)
-
-
-for k, v in e2mMetadata.items():
-    msg = f"{k:^14s}:  {v}"
-    logger.info(msg)

excel2moodle/__main__.py

@@ -1,19 +1,27 @@
-"""Main Function to make the Package executable"""
+"""Main Function to make the Package executable."""
+
+import signal
 
 from PySide6 import QtWidgets, sys
 
+from excel2moodle import e2mMetadata, mainLogger, qSignalLogger
 from excel2moodle.core import dataStructure
 from excel2moodle.ui import appUi as ui
 from excel2moodle.ui.settings import Settings
 
 
 def main() -> None:
+    mainLogger.addHandler(qSignalLogger)
+    signal.signal(signal.SIGINT, signal.SIG_DFL)
     app = QtWidgets.QApplication(sys.argv)
     settings = Settings()
     database: dataStructure.QuestionDB = dataStructure.QuestionDB(settings)
     window = ui.MainWindow(settings, database)
     database.window = window
     window.show()
+    for k, v in e2mMetadata.items():
+        msg = f"{k:^14s}:  {v}"
+        mainLogger.info(msg)
     sys.exit(app.exec())
 
 

excel2moodle/core/dataStructure.py

@@ -79,7 +79,7 @@ class QuestionDB:
                             points=points,
                             version=version,
                         )
-        self.dataChanged.signal.emit("whoo")
+        # self.dataChanged.signal.emit("whoo")
 
     def parseAll(self) -> None:
         self.mainTree = ET.Element("quiz")

excel2moodle/logger.py

@@ -90,7 +90,6 @@ class LogWindowHandler(logging.Handler):
         log_message = self.format(record)
         color = self.logLevelColors.get(record.levelname, "black")
         prettyMessage = f'<span style="color:{color};">{log_message}</span>'
-        print("emitting new log signal")  # noqa:T201
         self.emitter.signal.emit(prettyMessage)
 
 

excel2moodle/ui/appUi.py

@@ -8,11 +8,9 @@ import logging
 from pathlib import Path
 
 from PySide6 import QtCore, QtWidgets
-from PySide6.QtCore import Qt
+from PySide6.QtCore import QRunnable, Qt, QThreadPool
 
 from excel2moodle import qSignalLogger
-
-# from excel2moodle.logger import LogWindowHandler
 from excel2moodle.core.dataStructure import QuestionDB
 from excel2moodle.extra import equationVerification as eqVerif
 from excel2moodle.ui import dialogs
@@ -35,7 +33,8 @@ class MainWindow(QtWidgets.QMainWindow):
         self.testDB = testDB
         self.ui = Ui_MoodleTestGenerator()
         self.ui.setupUi(self)
-
+        self.connectEvents()
+        logger.info("Settings are stored under: %s", self.settings.fileName())
         self.ui.treeWidget.setSelectionMode(QtWidgets.QAbstractItemView.MultiSelection)
         self.ui.treeWidget.header().setSectionResizeMode(
             QtWidgets.QHeaderView.ResizeToContents,
@@ -43,20 +42,20 @@ class MainWindow(QtWidgets.QMainWindow):
         self.ui.checkBoxIncludeCategories.setChecked(
             self.settings.get(SettingsKey.INCLUDEINCATS),
         )
-
-        self.ui.retranslateUi(self)
-        logger.info("Settings are stored under: %s", self.settings.fileName())
+        self.ui.spinBoxDefaultQVariant.setValue(
+            self.settings.get(SettingsKey.QUESTIONVARIANT)
+        )
         self.ui.pointCounter.setReadOnly(True)
         self.ui.questionCounter.setReadOnly(True)
         self.setStatus(
-            "Wählen Sie bitte eine Excel Tabelle und einen Export Ordner für die Fragen aus",
+            "Wählen Sie eine Excel Tabelle mit den Fragen aus",
         )
         try:
             self.resize(self.settings.value("windowSize"))
             self.move(self.settings.value("windowPosition"))
         except Exception:
             pass
-        self.connectEvents()
+        self.threadPool = QThreadPool()
 
     def connectEvents(self) -> None:
         self.ui.treeWidget.itemClicked.connect(self.onSelectionChanged)
@@ -69,7 +68,7 @@ class MainWindow(QtWidgets.QMainWindow):
             self.setIncludeCategoriesSetting,
         )
         self.ui.actionParseAll.triggered.connect(self.onParseAll)
-        self.testDB.dataChanged.signal.connect(self.refreshList)
+        # self.testDB.dataChanged.signal.connect(self.refreshList)
         self.ui.buttonSpreadSheet.clicked.connect(self.onButSpreadsheet)
         self.ui.buttonTestGen.clicked.connect(self.onButGenTest)
         self.ui.actionPreviewQ.triggered.connect(self.openPreviewQuestionDlg)
@@ -81,6 +80,18 @@ class MainWindow(QtWidgets.QMainWindow):
     def setQVariantDefault(self, value: int) -> None:
         self.settings.set(SettingsKey.QUESTIONVARIANT, value)
 
+    @QtCore.Slot()
+    def onParseAll(self) -> None:
+        """Event triggered by the *Tools/Parse all Questions* Event.
+
+        It parses all the Questions found in the spreadsheet
+        and then refreshes the list of questions.
+        If successful it prints out a list of all exported Questions
+        """
+        self.ui.treeWidget.clear()
+        process = ParseSpreadsheetThread(self.testDB, self)
+        self.threadPool.start(process)
+
     @QtCore.Slot(Path)
     def onSheetPathChanged(self, sheet: Path) -> None:
         logger.debug("Slot, new Spreadsheet triggered")
@@ -90,9 +101,7 @@ class MainWindow(QtWidgets.QMainWindow):
         svgFolder.resolve()
         self.settings.set(SettingsKey.PICTUREFOLDER, svgFolder)
         self.ui.buttonSpreadSheet.setText(str(sheet.name))
-        self.testDB.readSpreadsheetData(self.spreadSheetPath)
-        self.testDB.parseAll()
-        self.refreshList()
+        self.onParseAll()
 
     def updateLog(self, log) -> None:
         self.ui.loggerWindow.append(log)
@@ -156,22 +165,8 @@ class MainWindow(QtWidgets.QMainWindow):
         )
         self.excelPath = Path(file[0]).resolve()
         self.settings.setSpreadsheet(self.excelPath)
-        logger.debug(f"Saved Spreadsheet Path: {self.excelPath}\n")
         self.setStatus("[OK] Excel Tabelle wurde eingelesen")
 
-    @QtCore.Slot()
-    def onParseAll(self) -> None:
-        """Event triggered by the *Tools/Parse all Questions* Event.
-
-        It parses all the Questions found in the spreadsheet
-        and then refreshes the list of questions.
-        If successful it prints out a list of all exported Questions
-        """
-        self.testDB.readSpreadsheetData(self.spreadSheetPath)
-        self.testDB.parseAll()
-        self.setStatus("[OK] Alle Fragen wurden erfolgreich in XML-Dateien umgewandelt")
-        self.refreshList()
-
     def refreshList(self) -> None:
         """Refresh the question overview in the main window.
 
@@ -214,6 +209,21 @@ class MainWindow(QtWidgets.QMainWindow):
         about.exec()
 
 
+class ParseSpreadsheetThread(QRunnable):
+    def __init__(self, questionDB: QuestionDB, mainApp: MainWindow) -> None:
+        super().__init__()
+        self.testDB = questionDB
+        self.mainApp = mainApp
+
+    @QtCore.Slot()
+    def run(self) -> None:
+        self.testDB.readSpreadsheetData(self.mainApp.spreadSheetPath)
+        self.mainApp.setStatus("[OK] Tabellen wurde eingelesen")
+        self.testDB.parseAll()
+        self.mainApp.setStatus("[OK] Alle Fragen wurden erfolgreich geparsed")
+        self.mainApp.refreshList()
+
+
 class EqCheckerWindow(QtWidgets.QWidget):
     def __init__(self) -> None:
         super().__init__()

excel2moodle/ui/settings.py

@@ -51,10 +51,11 @@ class Settings(QSettings):
     def __init__(self) -> None:
         """Instantiate the settings."""
         super().__init__("jbosse3", "excel2moodle")
+        logger.info("Settings are stored under: %s", self.fileName())
         if self.contains(SettingsKey.SPREADSHEETFOLDER):
             self.sheet = self.get(SettingsKey.SPREADSHEETFOLDER)
             if self.sheet.is_file():
-                QTimer.singleShot(0, self._emitSpreadsheetChanged)
+                QTimer.singleShot(300, self._emitSpreadsheetChanged)
 
     def _emitSpreadsheetChanged(self) -> None:
         self.shPathChanged.emit(self.sheet)

{excel2moodle-0.3.5.dist-info → excel2moodle-0.3.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: excel2moodle
-Version: 0.3.5
+Version: 0.3.6
 Summary: A package for converting questions from a spreadsheet, to valid moodle-xml
 Author: Jakob Bosse
 License-Expression: GPL-3.0-or-later

{excel2moodle-0.3.5.dist-info → excel2moodle-0.3.6.dist-info}/RECORD

@@ -1,9 +1,9 @@
-excel2moodle/__init__.py,sha256=b5hZTSd7Ffy89ct8mGHQbplbqcylrLx3u2h__tyvhs0,2324
-excel2moodle/__main__.py,sha256=8o3KK_RDgyTNW05cRL_iiu7BBHbIqWX9H878eHvf9Ag,544
-excel2moodle/logger.py,sha256=Af4IuJ4bJUCGSNoABakgUzVrYLAD3n9YTQXEXHk4j5Q,3138
+excel2moodle/__init__.py,sha256=tJopLP1Oks1wtiFPiW25qKwgJWa-X_C0UNQijM-pRnw,2236
+excel2moodle/__main__.py,sha256=gPhAh5GmRw-atxu-3JCdElFBKFw5ZB-G_G3xoPPJQVM,812
+excel2moodle/logger.py,sha256=WomQ_EAiqZ2oVHNReG4KdfGRMrJl3jC3LIr8cbvOlbY,3084
 excel2moodle/core/__init__.py,sha256=H4Bt6u076RKb6BH5F58nHLQvYPDUoayosM_Onyr9yT0,398
 excel2moodle/core/category.py,sha256=VunNsfRUv7O8L3XMe1BB2EFxtfCAJFaRafRYRKF15kE,3006
-excel2moodle/core/dataStructure.py,sha256=1lZtV2CULCDbzmfgaFO_l4Jn0OJ6vYJ3hDN2oe81nfE,6215
+excel2moodle/core/dataStructure.py,sha256=G-XpkcmP4ZpySvpi9ykvETrP-U69BNtjTR762ZekuBk,6217
 excel2moodle/core/etHelpers.py,sha256=i8DAx7YBxrQqzbXFsU-pIvYMPHSRhYci-JvuzY1MzeI,2299
 excel2moodle/core/exceptions.py,sha256=VgbxrnoR9RRnmDYK2rbB_Bv00r7NLWET6FgddPwo3uw,748
 excel2moodle/core/globals.py,sha256=OGBxkgD19etaMP6sTtsTZ_u8NXbnHYdCQYAu9E3pcgE,3692
@@ -16,18 +16,18 @@ excel2moodle/core/stringHelpers.py,sha256=XZAyXKZcQT_bAQSb9tBQs5tMC5soJf_ZhYFHrD
 excel2moodle/extra/__init__.py,sha256=PM-id60HD21A3IcGC_fCYFihS8osBGZMIJCcN-ZRsIM,293
 excel2moodle/extra/equationVerification.py,sha256=GLJl1r90d8AAiNy0H2hooZrg3D6aEwNfifYKAe3aGxM,3921
 excel2moodle/ui/__init__.py,sha256=4EdGtpzwH3rgw4xW9E5x9kdPQYwKbo9rehHRZTNxCrQ,44
-excel2moodle/ui/appUi.py,sha256=axZ-DtP2ugz68CPWtqVKU81i5Wq8yG1df3tw3YatDvU,9991
+excel2moodle/ui/appUi.py,sha256=wbvAPrPFAZaXP7sPQmGt9P4KoKgzhAAwnxdh6gN1Gak,10355
 excel2moodle/ui/dialogs.py,sha256=EgAKcydF4clyEweocjmtyCdsQJdQmvY-LVzOlu_cl_8,5320
 excel2moodle/ui/questionPreviewDialog.py,sha256=_rJvz1GM90aNnj3P6SugEezK7JW6m74ZALgkChohWLM,4980
-excel2moodle/ui/settings.py,sha256=pzYkMz1fBNW2t_H1KRBtcAqMxRbirj4aUY9yK5kuqIY,4288
+excel2moodle/ui/settings.py,sha256=eN5h1YeSYJ84-hDe13ief31Am5y46CxahoRx5Cn8usQ,4360
 excel2moodle/ui/treewidget.py,sha256=mTRqmZHMZT3QTTvt5Gw9L-yl4KdhhulkF7O1KBwW-_E,2449
 excel2moodle/ui/variantDialog.py,sha256=snVaF3_YAc7NWjMRg7NzbjL_PzNbOpt4eiqElkE46io,5414
 excel2moodle/ui/windowDoc.py,sha256=IciZpwrLnGzIQV1aCdKQBg6km3oufHGs8havTFzNJyU,1055
 excel2moodle/ui/windowEquationChecker.py,sha256=fLyal3sbJwpthWCAxLB5vbSFOX23JoivoYksNp3mZVY,7925
 excel2moodle/ui/windowMain.py,sha256=FsaApCyWgngnWPb46R8_01z8q4XeWxRFVqewSIt742c,19027
-excel2moodle-0.3.5.dist-info/licenses/LICENSE,sha256=ywQqe6Sitymkf2lV2NRcx_aGsaC-KbSl_EfEsRXmNRw,35135
-excel2moodle-0.3.5.dist-info/METADATA,sha256=MstfP8n_sfCdP2buwc8lmgX3C4cO9JzReftV-JMehJU,2945
-excel2moodle-0.3.5.dist-info/WHEEL,sha256=DnLRTWE75wApRYVsjgc6wsVswC54sMSJhAEd4xhDpBk,91
-excel2moodle-0.3.5.dist-info/entry_points.txt,sha256=myfMLDThuGgWHMJDPPfILiZqo_7D3fhmDdJGqWOAjPw,60
-excel2moodle-0.3.5.dist-info/top_level.txt,sha256=5V1xRUQ9o7UmOCmNoWCZPAuy5nXp3Qbzyqch8fUGT_c,13
-excel2moodle-0.3.5.dist-info/RECORD,,
+excel2moodle-0.3.6.dist-info/licenses/LICENSE,sha256=ywQqe6Sitymkf2lV2NRcx_aGsaC-KbSl_EfEsRXmNRw,35135
+excel2moodle-0.3.6.dist-info/METADATA,sha256=O1NBWfHhc6EMKGMaBJRHW9DmPWotmbJKUzN16gv3wsA,2945
+excel2moodle-0.3.6.dist-info/WHEEL,sha256=DnLRTWE75wApRYVsjgc6wsVswC54sMSJhAEd4xhDpBk,91
+excel2moodle-0.3.6.dist-info/entry_points.txt,sha256=myfMLDThuGgWHMJDPPfILiZqo_7D3fhmDdJGqWOAjPw,60
+excel2moodle-0.3.6.dist-info/top_level.txt,sha256=5V1xRUQ9o7UmOCmNoWCZPAuy5nXp3Qbzyqch8fUGT_c,13
+excel2moodle-0.3.6.dist-info/RECORD,,