Browse Source

normalize wallet file paths

fix #4020
fix #4126
master
SomberNight 7 years ago
parent
commit
eccb8ec2d6
No known key found for this signature in database
GPG Key ID: B33B5F232C6271E9
  1. 1
      electrum/gui/qt/main_window.py
  2. 6
      electrum/storage.py

1
electrum/gui/qt/main_window.py

@ -452,6 +452,7 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, PrintError):
if filename in recent: if filename in recent:
recent.remove(filename) recent.remove(filename)
recent.insert(0, filename) recent.insert(0, filename)
recent = [path for path in recent if os.path.exists(path)]
recent = recent[:5] recent = recent[:5]
self.config.set_key('recently_open', recent) self.config.set_key('recently_open', recent)
self.recently_visited_menu.clear() self.recently_visited_menu.clear()

6
electrum/storage.py

@ -29,7 +29,7 @@ import json
import copy import copy
import re import re
import stat import stat
import hmac, hashlib import hashlib
import base64 import base64
import zlib import zlib
from collections import defaultdict from collections import defaultdict
@ -73,7 +73,7 @@ class JsonDB(PrintError):
def __init__(self, path): def __init__(self, path):
self.db_lock = threading.RLock() self.db_lock = threading.RLock()
self.data = {} self.data = {}
self.path = path self.path = os.path.normcase(os.path.abspath(path))
self.modified = False self.modified = False
def get(self, key, default=None): def get(self, key, default=None):
@ -142,8 +142,8 @@ class JsonDB(PrintError):
class WalletStorage(JsonDB): class WalletStorage(JsonDB):
def __init__(self, path, manual_upgrades=False): def __init__(self, path, manual_upgrades=False):
self.print_error("wallet path", path)
JsonDB.__init__(self, path) JsonDB.__init__(self, path)
self.print_error("wallet path", path)
self.manual_upgrades = manual_upgrades self.manual_upgrades = manual_upgrades
self.pubkey = None self.pubkey = None
if self.file_exists(): if self.file_exists():

Loading…
Cancel
Save