excel2moodle 0.4.2__py3-none-any.whl → 0.4.4__py3-none-any.whl

excel2moodle/__init__.py

@@ -48,11 +48,4 @@ if __package__ is not None:
     }
 
 
-isMain: bool = False
-
 mainLogger = logging.getLogger(__name__)
-
-
-def isMainState() -> bool:
-    mainLogger.debug("Returning mainState %s", isMain)
-    return isMain

excel2moodle/core/dataStructure.py

@@ -76,7 +76,18 @@ class QuestionDB:
         self.categoriesMetaData: pd.DataFrame
         self.categories: dict[str, Category]
 
-    def readCategoriesMetadata(self, sheetPath: Path) -> pd.DataFrame:
+    @property
+    def spreadsheet(self) -> Path:
+        return self._spreadsheet
+
+    @spreadsheet.setter
+    def spreadsheet(self, sheet) -> None:
+        self.settings.clear()
+        self._spreadsheet = sheet
+        self.settings.set(Tags.SPREADSHEETPATH, sheet)
+        logger.info("saved new spreadsheet %s", sheet)
+
+    def readCategoriesMetadata(self, sheetPath: Path | None = None) -> pd.DataFrame:
         """Read the metadata and questions from the spreadsheet.
 
         Get the category data from the spreadsheet and stores it in the
@@ -84,6 +95,7 @@ class QuestionDB:
         Setup the categories and store them  in ``self.categories = {}``
         Pass the question data to the categories.
         """
+        sheetPath = sheetPath if sheetPath else self.spreadsheet
         logger.info("Start Parsing the Excel Metadata Sheet\n")
         with Path(sheetPath).open("rb") as f:
             settingDf = pd.read_excel(
@@ -111,17 +123,29 @@ class QuestionDB:
     ) -> None:
         settings = self.harmonizeDFIndex(settings)
         for tag, value in settings.iterrows():
-            self.settings.set(tag, value.iloc[0], local=True)
-        extraModule = self.settings.get(Tags.IMPORTMODULE)
-        if extraModule:
+            value = value.iloc[0]
+            if tag == Tags.TOLERANCE:
+                tol = value if value < 1 else value / 100
+                if tol > 0 and tol < 1:
+                    self.settings.set(Tags.TOLERANCE, tol)
+            else:
+                self.settings.set(tag, value)
+        if Tags.IMPORTMODULE in settings.index:
             logger.warning(
                 "Appending: %s to sys.path. All names defined by it will be usable",
                 mainPath,
             )
             sys.path.append(str(mainPath))
+        imgFolder = self.settings.get(Tags.SPREADSHEETPATH).parent / self.settings.get(
+            Tags.PICTURESUBFOLDER
+        )
+        if Tags.PICTURESUBFOLDER not in settings.index:
+            logger.warning("You didn't specify an image Folder. This may cause errors.")
+        self.settings.set(Tags.PICTUREFOLDER, imgFolder.resolve())
 
-    def initAllCategories(self, sheetPath: Path) -> None:
+    def initAllCategories(self, sheetPath: Path | None = None) -> None:
         """Read all category sheets and initialize all Categories."""
+        sheetPath = sheetPath if sheetPath else self.spreadsheet
         if not hasattr(self, "categoriesMetaData"):
             logger.error("Can't process the Categories without Metadata")
             return
@@ -133,14 +157,15 @@ class QuestionDB:
             for categoryName in excelFile.sheet_names:
                 logger.debug("Starting to read category %s", categoryName)
                 if categoryName in self.categoriesMetaData.index:
-                    self.initCategory(sheetPath, categoryName)
+                    self.initCategory(categoryName, sheetPath=sheetPath)
 
-    def asyncInitAllCategories(self, sheetPath: Path) -> None:
+    def asyncInitAllCategories(self, sheetPath: Path | None = None) -> None:
         """Read all category sheets asynchron and initialize all Categories.
 
         It does the same as `initAllCategories` but the parsing of the excelfile
         is done asynchron via `concurrent.futures.ProcessPoolExecutor`
         """
+        sheetPath = sheetPath if sheetPath else self.spreadsheet
         if not hasattr(self, "categoriesMetaData"):
             logger.error("Can't process the Categories without Metadata")
             return
@@ -171,10 +196,13 @@ class QuestionDB:
                     logger.exception("Error processing sheet %s: %s", categoryName, e)
                     logger.debug("Future exception: %s", future.exception())
 
-    def initCategory(self, sheetPath: Path, categoryName: str) -> bool | Category:
+    def initCategory(
+        self, categoryName: str, sheetPath: Path | None = None
+    ) -> bool | Category:
         """Read `categoryName` from the ``sheetPath`` and initialize the category.
         Returns the Category and appends it to `self.categories`.
         """
+        sheetPath = sheetPath if sheetPath else self.spreadsheet
         katDf = pd.read_excel(
             sheetPath,
             sheet_name=str(categoryName),

excel2moodle/core/question.py

@@ -139,12 +139,12 @@ class Question:
     def assemble(self, variant=0) -> None:
         """Assemble the question to the valid xml Tree."""
         mainText = self._getTextElement()
-        textParts = self._assembleMainTextParts()
         self.logger.debug("Starting assembly")
-        if hasattr(self, "picture") and self.picture.ready:
-            self._appendPicture(textParts, mainText)
-        self.logger.debug("inserted MainText to element")
         self._setAnswerElement(variant=variant)
+        textParts = self._assembleMainTextParts()
+        if hasattr(self, "picture") and self.picture.ready:
+            mainText.append(self.picture.element)
+            self.logger.debug("Appended Picture element to text")
         mainText.append(etHelpers.getCdatTxtElement(textParts))
 
     def _assembleMainTextParts(self, variant=0) -> list[ET.Element]:
@@ -152,11 +152,15 @@ class Question:
 
         Intended for the cloze question, where the answers parts are part of the text.
         """
+        self.logger.debug("inserting MainText to element")
         textParts: list[ET.Element] = []
         textParts.extend(self.qtextParagraphs)
         bullets = self._getBPoints(variant=variant)
         if bullets is not None:
             textParts.append(bullets)
+        if hasattr(self, "picture") and self.picture.ready:
+            textParts.append(self.picture.htmlTag)
+            self.logger.debug("Appended Picture html to text")
         return textParts
 
     def _getTextElement(self) -> ET.Element:
@@ -171,10 +175,6 @@ class Question:
         msg = "Cant assamble, if element is none"
         raise QNotParsedException(msg, self.id)
 
-    def _appendPicture(self, textParts: list[ET.Element], mainText: ET.Element) -> None:
-        textParts.append(self.picture.htmlTag)
-        mainText.append(self.picture.element)
-
     def _getBPoints(self, variant: int = 0) -> ET.Element:
         if hasattr(self, "bulletList"):
             return self.bulletList

excel2moodle/core/settings.py

@@ -5,10 +5,6 @@ from enum import StrEnum
 from pathlib import Path
 from typing import ClassVar, Literal, overload
 
-from PySide6.QtCore import QSettings, QTimer, Signal
-
-import excel2moodle
-
 logger = logging.getLogger(__name__)
 
 
@@ -64,7 +60,7 @@ class Tags(StrEnum):
         """Get type of the keys data."""
         return self._typ_
 
-    QUESTIONVARIANT = "defaultQuestionVariant", int, 0, "testgen"
+    QUESTIONVARIANT = "defaultQuestionVariant", int, 1, "testgen"
     INCLUDEINCATS = "includeCats", bool, False, "testgen"
     TOLERANCE = "tolerance", float, 0.01, "parser/nf"
     PICTUREFOLDER = "pictureFolder", Path, None, "core"
@@ -83,7 +79,7 @@ class Tags(StrEnum):
     NAME = "name", str, None
     RESULT = "result", float, None
     EQUATION = "formula", str, None
-    PICTURE = "picture", str, False
+    PICTURE = "picture", str, None
     NUMBER = "number", int, None
     ANSTYPE = "answertype", str, None
     QUESTIONPART = "part", list, None
@@ -93,36 +89,26 @@ class Tags(StrEnum):
     PICTUREWIDTH = "imgwidth", int, 500
     ANSPICWIDTH = "answerimgwidth", int, 120
     WRONGSIGNPERCENT = "wrongsignpercentage", int, 50
-    FIRSTRESULT = "firstresult", float, None
-
+    FIRSTRESULT = "firstresult", float, 0
 
-class Settings(QSettings):
-    """Settings for Excel2moodle."""
 
-    shPathChanged = Signal(Path)
-    localSettings: ClassVar[dict[str, str | float | Path]] = {}
+class Settings:
+    values: ClassVar[dict[str, str | float | Path]] = {}
 
-    def __init__(self) -> None:
-        """Instantiate the settings."""
-        super().__init__("jbosse3", "excel2moodle")
-        if excel2moodle.isMainState():
-            logger.info("Settings are stored under: %s", self.fileName())
-            if self.contains(Tags.SPREADSHEETPATH.full):
-                self.sheet = self.get(Tags.SPREADSHEETPATH)
-                if self.sheet.is_file():
-                    QTimer.singleShot(300, self._emitSpreadsheetChanged)
-
-    def _emitSpreadsheetChanged(self) -> None:
-        self.shPathChanged.emit(self.sheet)
+    @classmethod
+    def clear(cls) -> None:
+        cls.values.clear()
 
     @overload
+    @classmethod
     def get(
-        self,
+        cls,
         key: Literal[Tags.POINTS],
     ) -> float: ...
     @overload
+    @classmethod
     def get(
-        self,
+        cls,
         key: Literal[
             Tags.QUESTIONVARIANT,
             Tags.TOLERANCE,
@@ -133,10 +119,12 @@ class Settings(QSettings):
         ],
     ) -> int: ...
     @overload
-    def get(self, key: Literal[Tags.INCLUDEINCATS]) -> bool: ...
+    @classmethod
+    def get(cls, key: Literal[Tags.INCLUDEINCATS]) -> bool: ...
     @overload
+    @classmethod
     def get(
-        self,
+        cls,
         key: Literal[
             Tags.PICTURESUBFOLDER,
             Tags.LOGLEVEL,
@@ -146,26 +134,28 @@ class Settings(QSettings):
         ],
     ) -> str: ...
     @overload
+    @classmethod
     def get(
-        self,
+        cls,
         key: Literal[Tags.PICTUREFOLDER, Tags.SPREADSHEETPATH],
     ) -> Path: ...
 
-    def get(self, key: Tags):
+    @classmethod
+    def get(cls, key: Tags):
         """Get the typesafe settings value.
 
-        If local Settings are stored, they are returned.
         If no setting is made, the default value is returned.
         """
-        if key in type(self).localSettings:
-            val = key.typ()(type(self).localSettings[key])
-            logger.debug("Returning project setting: %s = %s", key, val)
-            return val
-        if not excel2moodle.isMainState():
-            logger.warning("No GUI: Returning default value.")
-            return key.default
+        try:
+            raw = cls.values[key]
+        except KeyError:
+            default = key.default
+            if default is None:
+                return None
+            logger.info("Returning the default value for %s", key)
+            return default
         if key.typ() is Path:
-            path: Path = self.value(key.full, defaultValue=key.default)
+            path: Path = Path(raw)
             try:
                 path.resolve(strict=True)
             except ValueError:
@@ -175,10 +165,7 @@ class Settings(QSettings):
                 return key.default
             logger.debug("Returning path setting: %s = %s", key, path)
             return path
-        raw = self.value(key.full, defaultValue=key.default, type=key.typ())
-        logger.debug("read a settings Value: %s of type: %s", key, key.typ())
         try:
-            logger.debug("Returning global setting: %s = %s", key, raw)
             return key.typ()(raw)
         except (ValueError, TypeError):
             logger.warning(
@@ -186,44 +173,25 @@ class Settings(QSettings):
             )
             return key.default
 
+    @classmethod
     def set(
-        self,
+        cls,
         key: Tags | str,
         value: float | bool | Path | str,
-        local: bool = False,
     ) -> None:
-        """Set the setting to value.
-
-        Parameters
-        ----------
-        local
-            True saves local project specific settings.
-            Defaults to False
-            The local settings are meant to be set in the first sheet `settings`
-
-        """
-        if not excel2moodle.isMainState():
-            local = True
-        if local:
-            if key in Tags:
-                type(self).localSettings[key] = value
-                logger.info("Saved the project setting %s = %s", key, value)
-            else:
-                logger.warning("got invalid local Setting %s = %s", key, value)
-            return
-        if not local and isinstance(key, Tags):
-            if not isinstance(value, key.typ()):
-                logger.error("trying to save setting with wrong type not possible")
+        """Set the setting to value."""
+        if key in Tags:
+            tag = Tags(key) if not isinstance(key, Tags) else key
+            try:
+                cls.values[tag] = tag.typ()(value)
+            except TypeError:
+                logger.exception(
+                    "trying to save %s = %s %s with wrong type not possible.",
+                    tag,
+                    value,
+                    type(value),
+                )
                 return
-            self.setValue(key.full, value)
-            logger.info("Saved the global setting %s = %s", key, value)
-
-    def setSpreadsheet(self, sheet: Path) -> None:
-        """Save spreadsheet path and emit the changed event."""
-        if isinstance(sheet, Path):
-            self.sheet = sheet.resolve(strict=True)
-            logpath = str(self.sheet.parent / "excel2moodleLogFile.log")
-            self.set(Tags.LOGFILE, logpath)
-            self.set(Tags.SPREADSHEETPATH, self.sheet)
-            self.shPathChanged.emit(sheet)
-            return
+            logger.info("Saved  %s = %s, type %s", key, value, tag.typ())
+        else:
+            logger.warning("got invalid local Setting %s = %s", key, value)

excel2moodle/core/validator.py

@@ -80,9 +80,9 @@ class Validator:
                 if key.startswith(tag) and not isinstance(self.qdata[key], list):
                     self.qdata[key] = stringHelpers.getListFromStr(self.qdata[key])
         tol = float(self.qdata.get(Tags.TOLERANCE, 0))
-        if tol <= 0 or tol > 99:
-            self.qdata[Tags.TOLERANCE] = settings.get(Tags.TOLERANCE)
-        else:
+        if tol < 0 or tol > 99:
+            tol = settings.get(Tags.TOLERANCE)
+        elif tol != 0:
             self.qdata[Tags.TOLERANCE] = tol if tol < 1 else tol / 100
 
         if self.qdata[Tags.TYPE] == "NFM":

excel2moodle/logger.py

@@ -6,10 +6,11 @@ This includes emitting the signals for the main Window, to fast forward all logs
 
 import logging
 
-from PySide6.QtCore import QObject, Signal
+from PySide6.QtCore import QObject, QSettings, Signal
 
 from excel2moodle.core.settings import Settings, Tags
 
+qSettings = QSettings("jbosse3", "excel2moodle")
 settings = Settings()
 
 loggerConfig = {
@@ -36,7 +37,9 @@ loggerConfig = {
             "formatter": "file",
             "class": "logging.FileHandler",
             # "class": "logging.handlers.TimedRotatingFileHandler",
-            "filename": settings.get(Tags.LOGFILE),
+            "filename": qSettings.value(
+                Tags.LOGFILE, defaultValue=Tags.LOGFILE.default
+            ),
             # "when": "M",
             # "interval": 1,
             # "backupCount": "3",

excel2moodle/question_types/cloze.py

@@ -32,7 +32,7 @@ class ClozeQuestion(ParametricQuestion):
 
     def _setAnswerElement(self, variant: int = 1) -> None:
         for part, ans in self.answerVariants.items():
-            result = ans[variant]
+            result = ans[variant - 1]
             if self.answerTypes.get(part, None) == "MC":
                 ansStr = ClozeQuestionParser.getMCAnsStr(answers)
             else:

excel2moodle/question_types/nfm.py

@@ -45,15 +45,15 @@ class NFMQuestionParser(QuestionParser):
         super().__init__()
         self.genFeedbacks = [XMLTags.GENFEEDB]
         self.question: NFMQuestion
-
-    def setup(self, question: NFMQuestion) -> None:
-        self.question: NFMQuestion = question
-        super().setup(question)
         module = self.settings.get(Tags.IMPORTMODULE)
         if module and not type(self).astEval.symtable.get(module):
             type(self).astEval(f"import {module}")
             self.logger.warning("Imported '%s' to Asteval symtable", module)
 
+    def setup(self, question: NFMQuestion) -> None:
+        self.question: NFMQuestion = question
+        super().setup(question)
+
     def _parseAnswers(self) -> None:
         equation = self.rawInput.get(Tags.EQUATION)
         bps = self.rawInput.get(Tags.BPOINTS)

excel2moodle/ui/appUi.py

@@ -8,7 +8,7 @@ import logging
 from pathlib import Path
 
 from PySide6 import QtCore, QtWidgets
-from PySide6.QtCore import QRunnable, Qt, QThreadPool
+from PySide6.QtCore import QRunnable, QSettings, Qt, QThreadPool
 
 from excel2moodle import mainLogger
 from excel2moodle.core.category import Category
@@ -33,6 +33,9 @@ class MainWindow(QtWidgets.QMainWindow):
     def __init__(self, settings: Settings, testDB: QuestionDB) -> None:
         super().__init__()
         self.settings = settings
+        self.qSettings = QSettings("jbosse3", "excel2moodle")
+        logger.info("Settings are stored under: %s", self.qSettings.fileName())
+
         self.excelPath: Path | None = None
         self.mainPath = self.excelPath.parent if self.excelPath is not None else None
         self.exportFile = Path()
@@ -43,16 +46,16 @@ class MainWindow(QtWidgets.QMainWindow):
         self.questionPreview = dialogs.QuestionPreview(self)
         self.eqChecker = EqCheckerWindow()
         self.connectEvents()
-        logger.info("Settings are stored under: %s", self.settings.fileName())
+        logger.info("Settings are stored under: %s", self.qSettings.fileName())
         self.ui.treeWidget.setSelectionMode(QtWidgets.QAbstractItemView.MultiSelection)
         self.ui.treeWidget.header().setSectionResizeMode(
             QtWidgets.QHeaderView.ResizeToContents,
         )
         self.exportDialog.ui.checkBoxIncludeCategories.setChecked(
-            self.settings.get(Tags.INCLUDEINCATS),
+            self.qSettings.value(Tags.INCLUDEINCATS, defaultValue=True, type=bool)
         )
         self.exportDialog.ui.spinBoxDefaultQVariant.setValue(
-            self.settings.get(Tags.QUESTIONVARIANT)
+            self.qSettings.value(Tags.QUESTIONVARIANT, defaultValue=1, type=int)
         )
         self.ui.pointCounter.setReadOnly(True)
         self.ui.questionCounter.setReadOnly(True)
@@ -60,11 +63,14 @@ class MainWindow(QtWidgets.QMainWindow):
             "Wählen Sie eine Excel Tabelle mit den Fragen aus",
         )
         try:
-            self.resize(self.settings.value("windowSize"))
-            self.move(self.settings.value("windowPosition"))
+            self.resize(self.qSettings.value("windowSize"))
+            self.move(self.qSettings.value("windowPosition"))
         except Exception:
             pass
         self.threadPool = QThreadPool()
+        if self.qSettings.contains(Tags.SPREADSHEETPATH.full):
+            sheet = self.qSettings.value(Tags.SPREADSHEETPATH.full)
+            self.setSheetPath(sheet)
 
     def connectEvents(self) -> None:
         self.ui.treeWidget.itemSelectionChanged.connect(self.onSelectionChanged)
@@ -85,7 +91,6 @@ class MainWindow(QtWidgets.QMainWindow):
         self.ui.treeWidget.itemClicked.connect(self.updateQuestionPreview)
         self.ui.actionAbout.triggered.connect(self.openAboutDlg)
         self.ui.actionDocumentation.triggered.connect(self.openDocumentation)
-        self.settings.shPathChanged.connect(self.onSheetPathChanged)
         self.exportDialog.ui.spinBoxDefaultQVariant.valueChanged.connect(
             self.setQVariantDefault
         )
@@ -103,19 +108,23 @@ class MainWindow(QtWidgets.QMainWindow):
         If successful it prints out a list of all exported Questions
         """
         self.ui.treeWidget.clear()
+        self.testDB.readCategoriesMetadata()
         process = ParseAllThread(self.testDB, self)
         self.threadPool.start(process)
 
-    @QtCore.Slot(Path)
-    def onSheetPathChanged(self, sheet: Path) -> None:
-        logger.debug("Slot, new Spreadsheet triggered")
-        self.spreadSheetPath = sheet
+    def setSheetPath(self, sheet: Path) -> None:
+        logger.debug("Received new spreadsheet.")
+        if not sheet.is_file():
+            logger.warning("Sheet is not a file")
+            self.setStatus("[ERROR] keine Tabelle angegeben")
+            return
+        self.excelPath = sheet
         self.mainPath = sheet.parent
-        svgFolder = self.mainPath / self.settings.get(Tags.PICTURESUBFOLDER)
-        svgFolder.resolve()
-        self.settings.set(Tags.PICTUREFOLDER, svgFolder)
         self.ui.buttonSpreadsheet.setText(f"../{sheet.name}")
+        self.testDB.spreadsheet = sheet
+        self.qSettings.setValue(Tags.SPREADSHEETPATH.full, sheet)
         self.parseSpreadsheetAll()
+        self.setStatus("[OK] Excel Tabelle wurde eingelesen")
 
     def updateLog(self, log) -> None:
         self.ui.loggerWindow.append(log)
@@ -127,8 +136,16 @@ class MainWindow(QtWidgets.QMainWindow):
             self.settings.set(Tags.INCLUDEINCATS, False)
 
     def closeEvent(self, event) -> None:
-        self.settings.setValue("windowSize", self.size())
-        self.settings.setValue("windowPosition", self.pos())
+        logger.info("Closing. Saving window stats.")
+        self.qSettings.setValue("windowSize", self.size())
+        self.qSettings.setValue("windowPosition", self.pos())
+        self.qSettings.setValue(
+            Tags.INCLUDEINCATS, self.settings.get(Tags.INCLUDEINCATS)
+        )
+        self.qSettings.setValue(
+            Tags.QUESTIONVARIANT,
+            self.settings.get(Tags.QUESTIONVARIANT),
+        )
 
     @QtCore.Slot()
     def onSelectionChanged(self, **args) -> None:
@@ -178,12 +195,7 @@ class MainWindow(QtWidgets.QMainWindow):
             selectedFilter=("*.ods"),
         )
         path = Path(file[0]).resolve(strict=True)
-        if path.is_file():
-            self.excelPath = path
-            self.settings.setSpreadsheet(self.excelPath)
-            self.setStatus("[OK] Excel Tabelle wurde eingelesen")
-        else:
-            self.setStatus("[ERROR] keine Tabelle angegeben")
+        self.setSheetPath(path)
 
     @QtCore.Slot(Category)
     def treeRefreshCategory(self, cat: Category) -> None:
@@ -247,7 +259,6 @@ class ParseAllThread(QRunnable):
 
     @QtCore.Slot()
     def run(self) -> None:
-        self.testDB.readCategoriesMetadata(self.mainApp.spreadSheetPath)
-        self.testDB.asyncInitAllCategories(self.mainApp.spreadSheetPath)
+        self.testDB.asyncInitAllCategories(self.mainApp.excelPath)
         self.mainApp.setStatus("[OK] Tabellen wurde eingelesen")
         self.testDB.parseAllQuestions()

{excel2moodle-0.4.2.dist-info → excel2moodle-0.4.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: excel2moodle
-Version: 0.4.2
+Version: 0.4.4
 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.4.2.dist-info → excel2moodle-0.4.4.dist-info}/RECORD

@@ -1,38 +1,38 @@
-excel2moodle/__init__.py,sha256=qdQJY0xbSiEhnmqbgJpqBe0kHec7yLOeAdcArScioE8,1925
+excel2moodle/__init__.py,sha256=mnb-RWgmWIPSBk4S65a_jP6rxntAkTeYxN0ObUJalbQ,1801
 excel2moodle/__main__.py,sha256=sG4ygwfVFskLQorBn-v98SvasNcPmwl_vLYpruT5Hk8,1175
-excel2moodle/logger.py,sha256=hX5ZD_vBi7_eFyA98zomEMtHCEMjPcQRUOhtcavY0Po,3065
+excel2moodle/logger.py,sha256=S9tvSwsOx2xta_AhGKHPNgi5FaiycyUDtkzHlIlNAX8,3193
 excel2moodle/core/__init__.py,sha256=87BwhtZse72Tk17Ib-V9X2k9wkhmtVnEj2ZmJ9JBAnI,63
 excel2moodle/core/category.py,sha256=TzntDhEURshxWuI6qc_K_t5bSTLXn6s0n_RA56Basg8,1885
-excel2moodle/core/dataStructure.py,sha256=MKT3udbfcP9QW_ZdiJyn3_GtfdpcgyOo9CGZ6pvSlRI,14374
+excel2moodle/core/dataStructure.py,sha256=lmquDdRyMqKxHjbcMOJ83BRs1otXqG9vhNFVfQsljwE,15578
 excel2moodle/core/etHelpers.py,sha256=G37qplp8tPJxqHNCBrf2Wo0jJZ0aDbxE9slQavqYqd8,2293
 excel2moodle/core/exceptions.py,sha256=9xfsaIcm6Yej6QAZga0d3DK3jLQejdfgJARuAaG-uZY,739
 excel2moodle/core/globals.py,sha256=Zm1wcrzQTRnhjrkwgBvo7VjKCFdPMjh-VLSSI5_QCO8,2837
 excel2moodle/core/numericMultiQ.py,sha256=vr-gYogu2sf2a_Bhvhnu1ZSZFZXM32MfhJesjTkoOQM,2618
 excel2moodle/core/parser.py,sha256=Ec8bQ0CiiZCIdzQovfH2rce406wmyRmvhpDrCPeQfGU,8112
-excel2moodle/core/question.py,sha256=u8hE5UpKO9AUvR3XRz9yohw1XhSyLEfTJENAN4w80-U,10747
-excel2moodle/core/settings.py,sha256=b7g7zSI7ACcOG_NI34Nc7uZIX_miL2tO1O6MOd8kJTE,7536
+excel2moodle/core/question.py,sha256=nJDs8SPDRYP6xG4rvo8Bbh1734eQ96DZxVXb7yrT8LM,10802
+excel2moodle/core/settings.py,sha256=JhcgZcOrgFC7P4h9fSXZAApEl_9dE643r5arFpU1HXQ,5808
 excel2moodle/core/stringHelpers.py,sha256=OzFZ6Eu3PeBLKb61K-aeVfUZmVuBerr9KfyOsuNRd7Y,2403
-excel2moodle/core/validator.py,sha256=RwDQ-9Fpc5i2Buy3oorWUAh5zsS5fCF-MjRT4CgcXhY,4698
+excel2moodle/core/validator.py,sha256=ssgkyUwrR-0AGPX1cUqvRwZsGja13J7HQ2W72ltqN-Y,4683
 excel2moodle/extra/__init__.py,sha256=PM-id60HD21A3IcGC_fCYFihS8osBGZMIJCcN-ZRsIM,293
 excel2moodle/extra/equationVerification.py,sha256=GLJl1r90d8AAiNy0H2hooZrg3D6aEwNfifYKAe3aGxM,3921
 excel2moodle/question_types/__init__.py,sha256=81mss0g7SVtnlb-WkydE28G_dEAAf6oT1uB8lpK2-II,1041
-excel2moodle/question_types/cloze.py,sha256=wTCaCXCxR_qg909w1jGiBP7-c7qmq7kmriGpAbDnBEA,7673
+excel2moodle/question_types/cloze.py,sha256=hgyv244PChnl7FbxcAMQiC4yzBhV6J3Bg4PHgZQyRmQ,7677
 excel2moodle/question_types/mc.py,sha256=rHKIKSNeHyto84bI9B3wMKzNJuluplsCmYM4k2HW3wQ,5213
 excel2moodle/question_types/nf.py,sha256=bMP4IXrhnXmAI0NmjEc7DtX4xGaUbxzLicE2LjeaUho,1150
-excel2moodle/question_types/nfm.py,sha256=41dY53vJcFZHoDvNq4Wo7oExHMd3jRF_8dqa2I_pyp0,4950
+excel2moodle/question_types/nfm.py,sha256=VYrQmCsEZqfn0x_coBsDw3XvrUA4sy_yj0WS7Nsffqw,4950
 excel2moodle/ui/UI_equationChecker.py,sha256=evQDlqCHeooJcAnYjhFCyjlPhfknr7ULGKQwMmqQeJ4,8947
 excel2moodle/ui/UI_exportSettingsDialog.py,sha256=71xxXEqtewN0ReMfJ5t4gbrX_Bf0VEuxJ_DIV7ZtH94,6045
 excel2moodle/ui/UI_mainWindow.py,sha256=asWUmKIYqufKUvRuCuA1JoMyv4qfRXyoR70F0331lww,19291
 excel2moodle/ui/UI_variantDialog.py,sha256=snVaF3_YAc7NWjMRg7NzbjL_PzNbOpt4eiqElkE46io,5414
 excel2moodle/ui/__init__.py,sha256=4EdGtpzwH3rgw4xW9E5x9kdPQYwKbo9rehHRZTNxCrQ,44
-excel2moodle/ui/appUi.py,sha256=xwooDG3A8Ro5mrg-pCvdSR6NCFZYT0dj6dKPRqQfrLo,10382
+excel2moodle/ui/appUi.py,sha256=NXlBcjxHBeUzpU8rvqwN3wxad8AUgpMjXidwwVdC9GM,10863
 excel2moodle/ui/dialogs.py,sha256=JbQ1y55wbzWVTY0nxdGrUm81AdOIY3PXKgET03Hc6Ys,6760
 excel2moodle/ui/equationChecker.py,sha256=ANpN7S0llkp6pGL1sKHII1Jc8YUvgDR458UnGVnZZOo,2702
 excel2moodle/ui/treewidget.py,sha256=az64swVj1yQUsioeaZys32AauvQDdC4EKcqdbbWgL6s,2489
 excel2moodle/ui/windowDoc.py,sha256=WvzHj6F4JvHP82WlTsyFeOXW024Xq3BUqtp--T4twuI,661
-excel2moodle-0.4.2.dist-info/licenses/LICENSE,sha256=ywQqe6Sitymkf2lV2NRcx_aGsaC-KbSl_EfEsRXmNRw,35135
-excel2moodle-0.4.2.dist-info/METADATA,sha256=k4bCqH4CxEiRrCUjAf8mCUPB8loLmTkVPfPohgmQqwQ,2951
-excel2moodle-0.4.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-excel2moodle-0.4.2.dist-info/entry_points.txt,sha256=myfMLDThuGgWHMJDPPfILiZqo_7D3fhmDdJGqWOAjPw,60
-excel2moodle-0.4.2.dist-info/top_level.txt,sha256=5V1xRUQ9o7UmOCmNoWCZPAuy5nXp3Qbzyqch8fUGT_c,13
-excel2moodle-0.4.2.dist-info/RECORD,,
+excel2moodle-0.4.4.dist-info/licenses/LICENSE,sha256=ywQqe6Sitymkf2lV2NRcx_aGsaC-KbSl_EfEsRXmNRw,35135
+excel2moodle-0.4.4.dist-info/METADATA,sha256=NnGjQn0V6gBHcWuIjnleEqTeeFK5zVS0bDpwB6240SE,2951
+excel2moodle-0.4.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+excel2moodle-0.4.4.dist-info/entry_points.txt,sha256=myfMLDThuGgWHMJDPPfILiZqo_7D3fhmDdJGqWOAjPw,60
+excel2moodle-0.4.4.dist-info/top_level.txt,sha256=5V1xRUQ9o7UmOCmNoWCZPAuy5nXp3Qbzyqch8fUGT_c,13
+excel2moodle-0.4.4.dist-info/RECORD,,