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

reorganize code, move around lots of functions

Browse source
This commit is contained in:
Jonathan Wren 2020-08-15 18:43:54 -07:00
parent 38b78b1d1f
commit 73a348b033
No known key found for this signature in database
GPG key ID: 43D5FF8722E7F68A
23 changed files with 462 additions and 470 deletions
Download patch file Download diff file Expand all files Collapse all files

18
features/steps/core.py
View file

@ -4,7 +4,6 @@ import os
from pathlib import Path
import re
import shlex
import sys
import time
from unittest.mock import patch
@ -13,7 +12,14 @@ import toml
import yaml
from behave import given, then, when
from jrnl import Journal, __version__, cli, install, plugins, util
from jrnl import Journal
from jrnl import __version__
from jrnl import cli
from jrnl import install
from jrnl import plugins
from jrnl.config import load_config
from jrnl.os_compat import on_windows
try:
import parsedatetime.parsedatetime_consts as pdt
@ -62,18 +68,18 @@ keyring.set_keyring(TestKeyring())
def ushlex(command):
return shlex.split(command, posix="win32" not in sys.platform)
return shlex.split(command, posix=on_windows)
def read_journal(journal_name="default"):
config = util.load_config(install.CONFIG_FILE_PATH)
config = load_config(install.CONFIG_FILE_PATH)
with open(config["journals"][journal_name]) as journal_file:
journal = journal_file.read()
return journal
def open_journal(journal_name="default"):
config = util.load_config(install.CONFIG_FILE_PATH)
config = load_config(install.CONFIG_FILE_PATH)
journal_conf = config["journals"][journal_name]
# We can override the default config on a by-journal basis
@ -364,7 +370,7 @@ def config_var(context, key, value, journal=None):
# Handle value being a dictionary
value = ast.literal_eval(value)
config = util.load_config(install.CONFIG_FILE_PATH)
config = load_config(install.CONFIG_FILE_PATH)
if journal:
config = config["journals"][journal]
assert key in config