excel2moodle 0.3.5__tar.gz → 0.3.6__tar.gz

{excel2moodle-0.3.5/excel2moodle.egg-info → excel2moodle-0.3.6}/PKG-INFO

@@ -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 → excel2moodle-0.3.6}/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-0.3.5 → excel2moodle-0.3.6}/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-0.3.5 → excel2moodle-0.3.6}/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-0.3.5 → excel2moodle-0.3.6}/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-0.3.5 → excel2moodle-0.3.6}/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-0.3.5 → excel2moodle-0.3.6}/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 → excel2moodle-0.3.6/excel2moodle.egg-info}/PKG-INFO

@@ -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 → excel2moodle-0.3.6}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "excel2moodle"
-version = "0.3.5"
+version = "0.3.6"
 authors = [
   { name="Jakob Bosse" },
 ]