fz0x1/jrnl
1
0
Fork 0
mirror of https://github.com/jrnl-org/jrnl.git synced 2025-05-20 21:18:32 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

add tags

Browse source
This commit is contained in:
dbxnr 2020-02-11 23:49:24 +00:00
parent 16a4e60582
commit 8268404bb2
3 changed files with 19 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
features/data/journals/dayone2.json
View file

@ -5,7 +5,7 @@
"creationDate": "2020-01-10T12:22:12Z", "creationDate": "2020-01-10T12:22:12Z",
"photos": [], "photos": [],
"starred": false, "starred": false,
"tags": [], "tags": ["awesome", "great"],
"text": "Entry Number One.", "text": "Entry Number One.",
"timeZone": "Europe/London", "timeZone": "Europe/London",
"uuid": "EBB5A5F4057F461E8F176E18AB7E0493" "uuid": "EBB5A5F4057F461E8F176E18AB7E0493"
@ -15,7 +15,7 @@
"creationDate": "2020-01-10T12:21:48Z", "creationDate": "2020-01-10T12:21:48Z",
"photos": [], "photos": [],
"starred": true, "starred": true,
"tags": [], "tags": ["great"],
"text": "Entry Number Two.\n\nWith some body.", "text": "Entry Number Two.\n\nWith some body.",
"timeZone": "Europe/London", "timeZone": "Europe/London",
"uuid": "EC61E5D4E66C44E6AC796E863E8BF7E7" "uuid": "EC61E5D4E66C44E6AC796E863E8BF7E7"

19
features/dayone2.feature
View file

@ -23,11 +23,18 @@ Feature: Day One 2.0 implementation details.
Scenario: Converted journal is validated Scenario: Converted journal is validated
Given we use the config "basic.yaml" Given we use the config "basic.yaml"
When we run "jrnl --import dayone2 features/data/journals/dayone2.json" When we run "jrnl --import dayone2 features/data/journals/dayone2.json"
When we run "jrnl dayone2 -n 10" Then we should get no error
Then the output should contain When we run "jrnl dayone2 -n 2"
""" Then we should get no error
10-01-2020 12:21 Entry Number Two. and the output should contain "10-01-2020 12:21 Entry Number Two."
| With some body.
10-01-2020 12:22 Entry Number One. Scenario: Check tags are handled correctly
Given we use the config "basic.yaml"
When we run "jrnl --import dayone2 features/data/journals/dayone2.json"
When we run "jrnl dayone2 --tags"
Then we should get no error
and the output should contain
"""
@great : 2
@awesome : 1
""" """

7
jrnl/plugins/dayone2_importer.py
View file

@ -26,7 +26,7 @@ class DayOne2Importer(JSONImporter):
self.convert_journal() self.convert_journal()
def convert_journal(self): def convert_journal(self):
print(self._convert()) self._convert()
def validate_schema(self): def validate_schema(self):
try: try:
@ -42,13 +42,14 @@ class DayOne2Importer(JSONImporter):
def parse_json(self): def parse_json(self):
entries = [] entries = []
print(self.json)
for entry in self.json["entries"]: for entry in self.json["entries"]:
tags = " ".join(["@" + t for t in entry["tags"]])
entries.append( entries.append(
Entry( Entry(
self, self,
date=datetime.strptime(entry["creationDate"], "%Y-%m-%dT%H:%M:%SZ"), date=datetime.strptime(entry["creationDate"], "%Y-%m-%dT%H:%M:%SZ"),
text=entry["text"], text=f"{entry['text']} {tags}",
starred=entry["starred"], starred=entry["starred"],
) )
) )