tnormalize wallet file paths - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit eccb8ec2d6644a5e52dd85c4925e29402046ad4c
DIR parent 61b5ce04512257fd18a0204fdb4d0ad4868a32e9
HTML Author: SomberNight <somber.night@protonmail.com>
Date: Thu, 20 Sep 2018 01:21:42 +0200
normalize wallet file paths
fix #4020
fix #4126
Diffstat:
M electrum/gui/qt/main_window.py | 1 +
M electrum/storage.py | 6 +++---
2 files changed, 4 insertions(+), 3 deletions(-)
---
DIR diff --git a/electrum/gui/qt/main_window.py b/electrum/gui/qt/main_window.py
t@@ -452,6 +452,7 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, PrintError):
if filename in recent:
recent.remove(filename)
recent.insert(0, filename)
+ recent = [path for path in recent if os.path.exists(path)]
recent = recent[:5]
self.config.set_key('recently_open', recent)
self.recently_visited_menu.clear()
DIR diff --git a/electrum/storage.py b/electrum/storage.py
t@@ -29,7 +29,7 @@ import json
import copy
import re
import stat
-import hmac, hashlib
+import hashlib
import base64
import zlib
from collections import defaultdict
t@@ -73,7 +73,7 @@ class JsonDB(PrintError):
def __init__(self, path):
self.db_lock = threading.RLock()
self.data = {}
- self.path = path
+ self.path = os.path.normcase(os.path.abspath(path))
self.modified = False
def get(self, key, default=None):
t@@ -142,8 +142,8 @@ class JsonDB(PrintError):
class WalletStorage(JsonDB):
def __init__(self, path, manual_upgrades=False):
- self.print_error("wallet path", path)
JsonDB.__init__(self, path)
+ self.print_error("wallet path", path)
self.manual_upgrades = manual_upgrades
self.pubkey = None
if self.file_exists():