mirror of
https://github.com/jrnl-org/jrnl.git
synced 2025-05-10 08:38:32 +02:00
Allow emoji in config file in Windows by always opening it as unicode (#1313)
* Open config file as utf-8 always * Add test for journal with emoji name
This commit is contained in:
parent
7109374d42
commit
050c17ee06
3 changed files with 15 additions and 3 deletions
|
@ -20,6 +20,7 @@ DEFAULT_JOURNAL_NAME = "journal.txt"
|
||||||
DEFAULT_JOURNAL_KEY = "default"
|
DEFAULT_JOURNAL_KEY = "default"
|
||||||
|
|
||||||
YAML_SEPARATOR = ": "
|
YAML_SEPARATOR = ": "
|
||||||
|
YAML_FILE_ENCODING = "utf-8"
|
||||||
|
|
||||||
|
|
||||||
def make_yaml_valid_dict(input: list) -> dict:
|
def make_yaml_valid_dict(input: list) -> dict:
|
||||||
|
@ -48,9 +49,13 @@ def make_yaml_valid_dict(input: list) -> dict:
|
||||||
|
|
||||||
def save_config(config):
|
def save_config(config):
|
||||||
config["version"] = __version__
|
config["version"] = __version__
|
||||||
with open(get_config_path(), "w") as f:
|
with open(get_config_path(), "w", encoding=YAML_FILE_ENCODING) as f:
|
||||||
yaml.safe_dump(
|
yaml.safe_dump(
|
||||||
config, f, encoding="utf-8", allow_unicode=True, default_flow_style=False
|
config,
|
||||||
|
f,
|
||||||
|
encoding=YAML_FILE_ENCODING,
|
||||||
|
allow_unicode=True,
|
||||||
|
default_flow_style=False,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
@ -139,7 +144,7 @@ def verify_config_colors(config):
|
||||||
|
|
||||||
def load_config(config_path):
|
def load_config(config_path):
|
||||||
"""Tries to load a config file from YAML."""
|
"""Tries to load a config file from YAML."""
|
||||||
with open(config_path) as f:
|
with open(config_path, encoding=YAML_FILE_ENCODING) as f:
|
||||||
return yaml.load(f, Loader=yaml.SafeLoader)
|
return yaml.load(f, Loader=yaml.SafeLoader)
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -88,3 +88,9 @@ Feature: Multiple journals
|
||||||
these three eyes
|
these three eyes
|
||||||
n
|
n
|
||||||
Then the output should contain "Encrypted journal 'new_encrypted' created"
|
Then the output should contain "Encrypted journal 'new_encrypted' created"
|
||||||
|
|
||||||
|
Scenario: Read and write to journal with emoji name
|
||||||
|
Given we use the config "multiple.yaml"
|
||||||
|
When we run "jrnl ✨ Adding entry to sparkly journal"
|
||||||
|
When we run "jrnl ✨ -1"
|
||||||
|
Then the output should contain "Adding entry to sparkly journal"
|
||||||
|
|
|
@ -12,6 +12,7 @@ journals:
|
||||||
new_encrypted:
|
new_encrypted:
|
||||||
encrypt: true
|
encrypt: true
|
||||||
journal: features/journals/new_encrypted.journal
|
journal: features/journals/new_encrypted.journal
|
||||||
|
✨: features/journals/simple.journal
|
||||||
linewrap: 80
|
linewrap: 80
|
||||||
tagsymbols: '@'
|
tagsymbols: '@'
|
||||||
timeformat: '%Y-%m-%d %H:%M'
|
timeformat: '%Y-%m-%d %H:%M'
|
||||||
|
|
Loading…
Add table
Reference in a new issue