rms/gns3-gui
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-gui.git synced 2026-05-17 00:46:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix XDG Config Home support.Fixes #3770

Browse Source
This commit is contained in:
grossmj
2026-01-17 18:35:53 +08:00
parent ce4b74e4ea
commit ec5800d7fc
2 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
gns3/dialogs/profile_select.py
View File

@@ -53,12 +53,15 @@ class ProfileSelectDialog(QtWidgets.QDialog, Ui_ProfileSelectDialog):
if sys.platform.startswith("win"): if sys.platform.startswith("win"):
appdata = os.path.expandvars("%APPDATA%") appdata = os.path.expandvars("%APPDATA%")
path = os.path.join(appdata, "GNS3", version) path = os.path.join(appdata, "GNS3", version)
elif os.path.expandvars("$XDG_CONFIG_HOME"):
xdg_config = os.path.expandvars("$XDG_CONFIG_HOME")
path = os.path.join(xdg_config, "GNS3", version)
else: else:
home = os.path.expanduser("~") xgd_config_var = "$XDG_CONFIG_HOME"
path = os.path.join(home, ".config", "GNS3", version) xdg_config_res = os.path.expandvars(xgd_config_var)
if xdg_config_res != xgd_config_var:
path = os.path.join(xdg_config_res, "GNS3", version)
else:
home = os.path.expanduser("~")
path = os.path.join(home, ".config", "GNS3", version)
self.profiles_path = os.path.join(path, "profiles") self.profiles_path = os.path.join(path, "profiles")
self.uiShowAtStartupCheckBox.setChecked(LocalConfig.instance().multiProfiles()) self.uiShowAtStartupCheckBox.setChecked(LocalConfig.instance().multiProfiles())

22
gns3/local_config.py
View File

@@ -92,11 +92,13 @@ class LocalConfig(QtCore.QObject):
if sys.platform.startswith("win"): if sys.platform.startswith("win"):
old_config_path = os.path.join(os.path.expandvars("%APPDATA%"), "GNS3", filename) old_config_path = os.path.join(os.path.expandvars("%APPDATA%"), "GNS3", filename)
elif os.path.expandvars("$XDG_CONFIG_HOME"):
xdg_config = os.path.expandvars("$XDG_CONFIG_HOME")
old_config_path = os.path.join(xdg_config, "GNS3", filename)
else: else:
old_config_path = os.path.join(os.path.expanduser("~"), ".config", "GNS3", filename) xgd_config_var = "$XDG_CONFIG_HOME"
xdg_config_res = os.path.expandvars(xgd_config_var)
if xdg_config_res != xgd_config_var:
old_config_path = os.path.join(xdg_config_res, "GNS3", filename)
else:
old_config_path = os.path.join(os.path.expanduser("~"), ".config", "GNS3", filename)
# TODO: migrate versioned config file from a previous version of GNS3 (for instance 2.2 -> 2.3) + support profiles # TODO: migrate versioned config file from a previous version of GNS3 (for instance 2.2 -> 2.3) + support profiles
if os.path.exists(old_config_path): if os.path.exists(old_config_path):
@@ -145,12 +147,14 @@ class LocalConfig(QtCore.QObject):
if sys.platform.startswith("win"): if sys.platform.startswith("win"):
appdata = os.path.expandvars("%APPDATA%") appdata = os.path.expandvars("%APPDATA%")
path = os.path.join(appdata, "GNS3", version) path = os.path.join(appdata, "GNS3", version)
elif os.path.expandvars("$XDG_CONFIG_HOME"):
xdg_config = os.path.expandvars("$XDG_CONFIG_HOME")
path = os.path.join(xdg_config, "GNS3", version)
else: else:
home = os.path.expanduser("~") xgd_config_var = "$XDG_CONFIG_HOME"
path = os.path.join(home, ".config", "GNS3", version) xdg_config_res = os.path.expandvars(xgd_config_var)
if xdg_config_res != xgd_config_var:
path = os.path.join(xdg_config_res, "GNS3", version)
else:
home = os.path.expanduser("~")
path = os.path.join(home, ".config", "GNS3", version)
if self._profile is not None: if self._profile is not None:
path = os.path.join(path, "profiles", self._profile) path = os.path.join(path, "profiles", self._profile)