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

Merge pull request #325 from nikvdp/master

Browse source 
Correct issue #259, also fix issue with specifying DayOne journals in install
This commit is contained in:
Manuel Ebert 2015-01-11 08:50:24 -08:00
commit 7c1d552a35
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
jrnl/DayOneJournal.py
View file

@ -58,7 +58,10 @@ class DayOne(Journal.Journal):
if not hasattr(entry, "uuid"): if not hasattr(entry, "uuid"):
entry.uuid = uuid.uuid1().hex entry.uuid = uuid.uuid1().hex
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 + ".doentry") # make sure to upper() the uuid since uuid.uuid1 returns a lowercase string by default
# while dayone uses uppercase by default. On fully case preserving filesystems (e.g.
# linux) this results in duplicated entries when we save the file
filename = os.path.join(self.config['journal'], "entries", entry.uuid.upper() + ".doentry")
entry_plist = { entry_plist = {
'Creation Date': utc_time, 'Creation Date': utc_time,
'Starred': entry.starred if hasattr(entry, 'starred') else False, 'Starred': entry.starred if hasattr(entry, 'starred') else False,

3
jrnl/install.py
View file

@ -87,7 +87,8 @@ def install_jrnl(config_path='~/.jrnl_config'):
except OSError: except OSError:
pass pass
open(default_config['journals']['default'], 'a').close() # Touch to make sure it's there if not os.path.isdir(path): # if it's a directory and exists (e.g. a DayOne journal, let it be)
open(default_config['journals']['default'], 'a').close() # Touch to make sure it's there
# Write config to ~/.jrnl_conf # Write config to ~/.jrnl_conf
with open(config_path, 'w') as f: with open(config_path, 'w') as f: