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

code formatting

Browse source
This commit is contained in:
MinchinWeb 2015-05-04 12:08:05 -06:00
parent 0fcf078c1c
commit 7de37ffd25
2 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
jrnl/DayOneJournal.py
View file

@ -57,6 +57,7 @@ class DayOne(Journal.Journal):
entry = Entry.Entry(self, date, title, body, starred=dict_entry["Starred"]) entry = Entry.Entry(self, date, title, body, starred=dict_entry["Starred"])
entry.uuid = dict_entry["UUID"] entry.uuid = dict_entry["UUID"]
entry.tags = [self.config['tagsymbols'][0] + tag for tag in dict_entry.get("Tags", [])] entry.tags = [self.config['tagsymbols'][0] + tag for tag in dict_entry.get("Tags", [])]
"""Extended DayOne attributes""" """Extended DayOne attributes"""
try: try:
entry.creator_device_agent = dict_entry['Creator']['Device Agent'] entry.creator_device_agent = dict_entry['Creator']['Device Agent']
@ -87,7 +88,6 @@ class DayOne(Journal.Journal):
for entry in self.entries: for entry in self.entries:
if entry.modified: if entry.modified:
utc_time = datetime.utcfromtimestamp(time.mktime(entry.date.timetuple())) utc_time = datetime.utcfromtimestamp(time.mktime(entry.date.timetuple()))
filename = os.path.join(self.config['journal'], "entries", entry.uuid.upper() + ".doentry")
if not hasattr(entry, "uuid"): if not hasattr(entry, "uuid"):
entry.uuid = uuid.uuid1().hex entry.uuid = uuid.uuid1().hex
@ -98,9 +98,11 @@ class DayOne(Journal.Journal):
if not hasattr(entry, "creator_host_name"): if not hasattr(entry, "creator_host_name"):
entry.creator_host_name = socket.gethostname() entry.creator_host_name = socket.gethostname()
if not hasattr(entry, "creator_os_agent"): if not hasattr(entry, "creator_os_agent"):
entry.creator_os_agent = '{} {}'.format(platform.system(), platform.release()) entry.creator_os_agent = '{}/{}'.format(platform.system(), platform.release())
if not hasattr(entry, "creator_software_agent"): if not hasattr(entry, "creator_software_agent"):
entry.creator_software_agent = '{} {}'.format(__title__, __version__) entry.creator_software_agent = '{}/{}'.format(__title__, __version__)
filename = os.path.join(self.config['journal'], "entries", entry.uuid.upper() + ".doentry")
entry_plist = { entry_plist = {
'Creation Date': utc_time, 'Creation Date': utc_time,

10
jrnl/plugins/yaml_exporter.py
View file

@ -68,15 +68,15 @@ class YAMLExporter(TextExporter):
hasattr(entry, 'creator_software_agent'): hasattr(entry, 'creator_software_agent'):
dayone_attributes += 'creator:\n' dayone_attributes += 'creator:\n'
if hasattr(entry, 'creator_device_agent'): if hasattr(entry, 'creator_device_agent'):
dayone_attributes += ' device agent: ' + entry.creator_device_agent + '\n' dayone_attributes += ' device agent: {}\n'.format(entry.creator_device_agent)
if hasattr(entry, 'creator_generation_date'): if hasattr(entry, 'creator_generation_date'):
dayone_attributes += ' generation date: ' + str(entry.creator_generation_date) + '\n' dayone_attributes += ' generation date: {}\n'.format(str(entry.creator_generation_date))
if hasattr(entry, 'creator_host_name'): if hasattr(entry, 'creator_host_name'):
dayone_attributes += ' host name: ' + entry.creator_host_name + '\n' dayone_attributes += ' host name: {}\n'.format(entry.creator_host_name)
if hasattr(entry, 'creator_os_agent'): if hasattr(entry, 'creator_os_agent'):
dayone_attributes += ' os agent: ' + entry.creator_os_agent + '\n' dayone_attributes += ' os agent: {}\n'.format(entry.creator_os_agent)
if hasattr(entry, 'creator_software_agent'): if hasattr(entry, 'creator_software_agent'):
dayone_attributes += ' software agent: ' + entry.creator_software_agent + '\n' dayone_attributes += ' software agent: {}\n'.format(entry.creator_software_agent)
return "title: {title}\ndate: {date}\nstared: {stared}\ntags: {tags}\n{dayone} {body} {space}".format( return "title: {title}\ndate: {date}\nstared: {stared}\ntags: {tags}\n{dayone} {body} {space}".format(
date = date_str, date = date_str,