fz0x1/jrnl
1
0
Fork 0
mirror of https://github.com/jrnl-org/jrnl.git synced 2025-07-13 10:16:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Always expand all paths (journals, templates, etc) (#1468)

Browse source 
* Refactored path expansion calls into a new path.py file

This also fixed bugs with relative journal and template paths.

* Update tests for new path functions

Also, make the tests specific to Windows, Mac & Linux

Co-authored-by: Jonathan Wren <jonathan@nowandwren.com>
Co-authored-by: Micah Jerome Ellison <micah.jerome.ellison@gmail.com>
This commit is contained in:
Kevin 2022-05-21 14:06:07 -07:00 • committed by GitHub
parent 1ce7ce8bfc
commit ea6df4705c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 172 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

11
jrnl/upgrade.py
View file

@ -11,6 +11,7 @@ from .config import is_config_json
from .config import load_config
from .config import scope_config
from .prompt import yesno
from .path import expand_path
from jrnl.output import print_msg
@ -22,7 +23,7 @@ from jrnl.messages import MsgType
def backup(filename, binary=False):
print(f" Created a backup at {filename}.backup", file=sys.stderr)
filename = os.path.expanduser(os.path.expandvars(filename))
filename = expand_path(filename)
try:
with open(filename, "rb" if binary else "r") as original:
@ -72,15 +73,13 @@ older versions of jrnl anymore.
for journal_name, journal_conf in config["journals"].items():
if isinstance(journal_conf, dict):
path = journal_conf.get("journal")
path = expand_path(journal_conf.get("journal"))
encrypt = journal_conf.get("encrypt")
else:
encrypt = config.get("encrypt")
path = journal_conf
path = expand_path(journal_conf)
if os.path.exists(os.path.expanduser(path)):
path = os.path.expanduser(path)
else:
if not os.path.exists(path):
print(f"\nError: {path} does not exist.")
continue