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

Workaround for get_localzone on OS X

Browse source
This commit is contained in:
Manuel Ebert 2013-07-15 13:32:23 +02:00
parent ed20660815
commit 6fbd4e7d7e
2 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
jrnl/Journal.py
View file

@ -3,6 +3,7 @@
try: from . import Entry try: from . import Entry
except (SystemError, ValueError): import Entry except (SystemError, ValueError): import Entry
from util import get_local_timezone
import codecs import codecs
import os import os
try: import parsedatetime.parsedatetime_consts as pdt try: import parsedatetime.parsedatetime_consts as pdt
@ -10,8 +11,6 @@ except ImportError: import parsedatetime.parsedatetime as pdt
import re import re
from datetime import datetime from datetime import datetime
import time import time
import pytz
from tzlocal import get_localzone
try: import simplejson as json try: import simplejson as json
except ImportError: import json except ImportError: import json
import sys import sys
@ -32,6 +31,7 @@ try:
except ImportError: except ImportError:
colorama = None colorama = None
import plistlib import plistlib
import pytz
import uuid import uuid
@ -329,7 +329,6 @@ class DayOne(Journal):
# that have a uuid will be old ones, and only the one that doesn't will # that have a uuid will be old ones, and only the one that doesn't will
# have a new one! # have a new one!
if not hasattr(entry, "uuid"): if not hasattr(entry, "uuid"):
timezone = str(get_localzone())
utc_time = datetime.utcfromtimestamp(time.mktime(entry.date.timetuple())) utc_time = datetime.utcfromtimestamp(time.mktime(entry.date.timetuple()))
new_uuid = uuid.uuid1().hex new_uuid = uuid.uuid1().hex
filename = os.path.join(self.config['journal'], "entries", new_uuid+".doentry") filename = os.path.join(self.config['journal'], "entries", new_uuid+".doentry")
@ -337,7 +336,7 @@ class DayOne(Journal):
'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,
'Entry Text': entry.title+"\n"+entry.body, 'Entry Text': entry.title+"\n"+entry.body,
'Time Zone': timezone, 'Time Zone': get_local_timezone(),
'UUID': new_uuid 'UUID': new_uuid
} }
plistlib.writePlist(entry_plist, filename) plistlib.writePlist(entry_plist, filename)

11
jrnl/util.py
View file

@ -1,6 +1,8 @@
#!/usr/bin/env python #!/usr/bin/env python
# encoding: utf-8 # encoding: utf-8
import sys import sys
import os
from tzlocal import get_localzone
def py23_input(msg): def py23_input(msg):
if sys.version_info[0] == 3: if sys.version_info[0] == 3:
@ -8,3 +10,12 @@ def py23_input(msg):
except SyntaxError: return "" except SyntaxError: return ""
else: else:
return raw_input(msg) return raw_input(msg)
def get_local_timezone():
"""Returns the Olson identifier of the local timezone.
In a happy world, tzlocal.get_localzone would do this, but there's a bug on OS X
that prevents that right now: https://github.com/regebro/tzlocal/issues/6"""
if "darwin" in sys.platform:
return os.popen("systemsetup -gettimezone").read().replace("Time Zone: ", "").strip()
else:
return str(get_localzone())