AaronFiore/electrum
1
0
Fork 0
Code Activity

config: keep wallets directory stable, regardless of wallet opens in other directories

Browse Source
This commit is contained in:
Sander van Grieken
2023-10-13 13:10:56 +02:00
parent 05758432d6
commit 786979ec50
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
electrum/gui/qt/main_window.py
View File

@@ -669,7 +669,7 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, Logger, QtEventListener):
self.recently_visited_menu.setEnabled(bool(len(recent))) self.recently_visited_menu.setEnabled(bool(len(recent)))
def get_wallet_folder(self): def get_wallet_folder(self):
return os.path.dirname(os.path.abspath(self.wallet.storage.path)) return os.path.abspath(self.config.get_datadir_wallet_path())
def new_wallet(self): def new_wallet(self):
try: try:

9
electrum/simple_config.py
View File

@@ -445,6 +445,7 @@ class SimpleConfig(Logger):
new_path = self.get_fallback_wallet_path() new_path = self.get_fallback_wallet_path()
# TODO: this can be removed by now
# default path in pre 1.9 versions # default path in pre 1.9 versions
old_path = os.path.join(self.path, "electrum.dat") old_path = os.path.join(self.path, "electrum.dat")
if os.path.exists(old_path) and not os.path.exists(new_path): if os.path.exists(old_path) and not os.path.exists(new_path):
@@ -452,12 +453,14 @@ class SimpleConfig(Logger):
return new_path return new_path
def get_fallback_wallet_path(self): def get_datadir_wallet_path(self):
util.assert_datadir_available(self.path) util.assert_datadir_available(self.path)
dirpath = os.path.join(self.path, "wallets") dirpath = os.path.join(self.path, "wallets")
make_dir(dirpath, allow_symlink=False) make_dir(dirpath, allow_symlink=False)
path = os.path.join(self.path, "wallets", "default_wallet") return dirpath
return path
def get_fallback_wallet_path(self):
return os.path.join(self.get_datadir_wallet_path(), "default_wallet")
def remove_from_recently_open(self, filename): def remove_from_recently_open(self, filename):
recent = self.RECENTLY_OPEN_WALLET_FILES or [] recent = self.RECENTLY_OPEN_WALLET_FILES or []