Changeset 1080:e65385c0e41f for src

Timestamp:

02/15/23 19:09:50 (14 months ago)

Author:

István Váradi <ivaradi@…>

Branch:

python3

Phase:

public

Message:

Removed the semi-automatic update URL updating

File:

• src/mlx/config.py (modified) (6 diffs)

src/mlx/config.py

@@ -211 +211 @@
 class Config(object):
     """Our configuration."""
-    DEFAULT_UPDATE_URL = "https://mlx.varadiistvan.hu/update/new"
+    DEFAULT_UPDATE_URL = "https://mlx.varadiistvan.hu/update"
 
     _messageTypesSection = "messageTypes"
@@ -256 +256 @@
         self._autoUpdate = True
         self._updateURL = Config.DEFAULT_UPDATE_URL
-        #if secondaryInstallation:
-        #    self._updateURL += "/exp"
-        self._updateURLUpdated = True
 
         self._xplaneRemote = False
@@ -718 +715 @@
     def load(self):
         """Load the configuration from its default location."""
-        self._updateURLUpdated = False
-
         try:
             config = configparser.RawConfigParser()
@@ -802 +797 @@
 
         self._autoUpdate = self._getBoolean(config, "update", "auto", True)
-        self._updateURLUpdated = self._getBoolean(config, "update",
-                                                  "urlUpdated", False)
-        if self._updateURLUpdated:
-            self._updateURL = self._get(config, "update", "url",
-                                        Config.DEFAULT_UPDATE_URL) # +
-                                        #("/exp" if secondaryInstallation else ""))
-
-        if self._updateURL.find("update/new")>0 or \
-           self._updateURL.find("update/py3")>0:
-            self._updateURL = "https://mlx.varadiistvan.hu/update"
-            self._updateURLUpdated = False
-        if self._updateURL.startswith("http://") and not self._updateURLUpdated:
-            self._updateURL = "https://" + self._updateURL[7:]
-            self._updateURLUpdated = True
+        self._updateURL = self._get(config, "update", "url",
+                                    Config.DEFAULT_UPDATE_URL)
 
         for aircraftType in const.aircraftTypes:
@@ -916 +899 @@
                    "yes" if self._autoUpdate else "no")
         config.set("update", "url", self._updateURL)
-        config.set("update", "urlUpdated", self._updateURLUpdated)
 
         config.add_section(Checklist.SECTION)
@@ -1054 +1036 @@
         print("  autoUpdate:", self._autoUpdate)
         print("  updateURL:", self._updateURL)
-        print("  updateURLUpdated:", self._updateURLUpdated)
 
         print("  messageTypeLevels:")