Merge branch 'develop'

jcwinkler · jcwinkler · commit 20675a1dd8d9 · 2022-02-23T19:19:22.000+01:00
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -1,3 +1,9 @@
+Version 1.8.1 (2022-02-23)
+~~~~~~~~~~~~~~~~~~~~~~~~~~
+- Fixed: When re-installing TexText with diffent paths to latex excutables
+  compared to the original setup these new paths are not recognized when
+  invoking TexText from Inkscape (:issue_num:`345`).
+
 Version 1.8.0 (2022-02-03)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~
 - New: It is now possible to use the ``\documentclass`` statement in the
diff --git a/README.rst b/README.rst
@@ -1,6 +1,4 @@
-.. image:: https://github.com/textext/textext/actions/workflows/ci.yaml/badge.svg?branch=master
-    :target: https://github.com/textext/textext/actions/workflows/ci.yaml
-    :alt: Status of continuous integration tests
+|status-ci| |status-downloads|
 
 TexText - A TeX extension for Inkscape
 ======================================
@@ -58,3 +56,10 @@ plugin InkLaTeX written by Toru Araki.
 .. _usage-colorization:    https://textext.github.io/textext/usage/gui.html#usage-colorization
 .. _usage-alignment:       https://textext.github.io/textext/usage/gui.html#usage-alignment
 .. _usage-preview:         https://textext.github.io/textext/usage/gui.html#preview-button
+
+.. |status-ci| image:: https://github.com/textext/textext/actions/workflows/ci.yaml/badge.svg?branch=master
+    :target: https://github.com/textext/textext/actions/workflows/ci.yaml
+    :alt: Status of continuous integration tests
+.. |status-downloads| image:: https://img.shields.io/github/downloads/textext/textext/total   
+    :alt: GitHub all releases    
+
diff --git a/setup.py b/setup.py
@@ -27,7 +27,7 @@
     LoggingColors, \
     SUCCESS
 
-from textext.utility import Settings
+from textext.utility import Settings, Cache
 
 
 # Hotfix for Inkscape 1.0.1 on Windows: HarfBuzz-0.0.typelib is missing
@@ -350,6 +350,9 @@ def remove_previous_installation(extension_dir):
     else:
         settings = Settings(directory=defaults.textext_config_path)
 
+    CachedSettings = Cache(directory=settings.directory)
+    CachedSettings.delete_file()
+
     checker = TexTextRequirementsChecker(logger, settings)
 
     for executable_name in [
@@ -365,6 +368,8 @@ def remove_previous_installation(extension_dir):
                 exit(EXIT_BAD_COMMAND_LINE_ARGUMENT_VALUE)
 
             settings["%s-executable" % executable_name] = executable_path
+        else:
+            settings["%s-executable" % executable_name] = None
 
     if not args.skip_requirements_check:
 
diff --git a/textext/VERSION b/textext/VERSION
@@ -1 +1 @@
-1.8.0
+1.8.1
diff --git a/textext/utility.py b/textext/utility.py
@@ -168,6 +168,7 @@ def __init__(self, basename="config.json", directory=None):
             if not os.path.exists(directory):
                 os.makedirs(directory, exist_ok=True)
         self.values = {}
+        self.directory = directory
         self.config_path = os.path.join(directory, basename)
         try:
             self.load()
@@ -189,11 +190,22 @@ def get(self, key, default=None):
             return default
         return result
 
+    def delete_file(self):
+        if os.path.exists(self.config_path):
+            try:
+                os.remove(self.config_path)
+            except OSError as err:
+                TexTextFatalError("Config `%s` could not be deleted. Error message: %s" % (
+                                  self.config_path, str(err)))
+
     def __getitem__(self, key):
         return self.values.get(key)
 
     def __setitem__(self, key, value):
-        self.values[key] = value
+        if value is not None:
+            self.values[key] = value
+        else:
+            self.values.pop(key, None)
 
 
 class Cache(Settings):
