ED/EDMarketConnector
1
0
Fork 0
mirror of https://github.com/EDCD/EDMarketConnector.git synced 2025-04-13 07:47:14 +03:00
Code Issues Projects Releases Wiki Activity

Empty journal dir workaround

Browse Source
This commit is contained in:
A_D 2020-12-24 15:15:05 +02:00 committed by Athanasius
parent e3def21683
commit 1e56f0046e
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/eddn.py
View File

@ -728,8 +728,12 @@ def journal_entry( # noqa: C901
this.commodities = this.outfitting = this.shipyard = None
this.marketId = entry['MarketID']
path = pathlib.Path(config.get_str('journaldir', default=str(
config.default_journal_dir))) / f'{entry["event"]}.json'
journaldir = config.get_str('journaldir')
if journaldir is None or journaldir == '':
journaldir = str(config.default_journal_dir)
path = pathlib.Path(journaldir) / f'{entry["event"]}.json'
with path.open('rb') as f:
entry = json.load(f)
if entry['event'] == 'Market':

6
prefs.py
View File

@ -409,7 +409,11 @@ class PreferencesDialog(tk.Toplevel):
self.logdir = tk.StringVar()
default = str(config.default_journal_dir) if config.default_journal_dir is not None else ''
self.logdir.set(str(config.get_str('journaldir', default=default)))
logdir = config.get_str('journaldir')
if logdir is None or logdir == '':
logdir = default
self.logdir.set(logdir)
self.logdir_entry = nb.Entry(config_frame, takefocus=False)
# Location of the new Journal file in E:D 2.2