-
-
Notifications
You must be signed in to change notification settings - Fork 524
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #164 from maebert/1.8
Official support for python 3.4
- Loading branch information
Showing
9 changed files
with
164 additions
and
140 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,137 @@ | ||
| #!/usr/bin/env python | ||
| # encoding: utf-8 | ||
|
|
||
| from __future__ import absolute_import | ||
| from . import Entry | ||
| from . import Journal | ||
| import os | ||
| import re | ||
| from datetime import datetime | ||
| import time | ||
| import plistlib | ||
| import pytz | ||
| import uuid | ||
| import tzlocal | ||
| from xml.parsers.expat import ExpatError | ||
|
|
||
|
|
||
| class DayOne(Journal.Journal): | ||
| """A special Journal handling DayOne files""" | ||
|
|
||
| # InvalidFileException was added to plistlib in Python3.4 | ||
| PLIST_EXCEPTIONS = (ExpatError, plistlib.InvalidFileException) if hasattr(plistlib, "InvalidFileException") else ExpatError | ||
|
|
||
| def __init__(self, **kwargs): | ||
| self.entries = [] | ||
| self._deleted_entries = [] | ||
| super(DayOne, self).__init__(**kwargs) | ||
|
|
||
| def open(self): | ||
| filenames = [os.path.join(self.config['journal'], "entries", f) for f in os.listdir(os.path.join(self.config['journal'], "entries"))] | ||
| self.entries = [] | ||
| for filename in filenames: | ||
| with open(filename, 'rb') as plist_entry: | ||
| try: | ||
| dict_entry = plistlib.readPlist(plist_entry) | ||
| except self.PLIST_EXCEPTIONS: | ||
| pass | ||
| else: | ||
| try: | ||
| timezone = pytz.timezone(dict_entry['Time Zone']) | ||
| except (KeyError, pytz.exceptions.UnknownTimeZoneError): | ||
| timezone = tzlocal.get_localzone() | ||
| date = dict_entry['Creation Date'] | ||
| date = date + timezone.utcoffset(date, is_dst=False) | ||
| raw = dict_entry['Entry Text'] | ||
| sep = re.search("\n|[\?!.]+ +\n?", raw) | ||
| title, body = (raw[:sep.end()], raw[sep.end():]) if sep else (raw, "") | ||
| entry = Entry.Entry(self, date, title, body, starred=dict_entry["Starred"]) | ||
| entry.uuid = dict_entry["UUID"] | ||
| entry.tags = [self.config['tagsymbols'][0] + tag for tag in dict_entry.get("Tags", [])] | ||
| self.entries.append(entry) | ||
| self.sort() | ||
|
|
||
| def write(self): | ||
| """Writes only the entries that have been modified into plist files.""" | ||
| for entry in self.entries: | ||
| if entry.modified: | ||
| if not hasattr(entry, "uuid"): | ||
| entry.uuid = uuid.uuid1().hex | ||
| utc_time = datetime.utcfromtimestamp(time.mktime(entry.date.timetuple())) | ||
| filename = os.path.join(self.config['journal'], "entries", entry.uuid + ".doentry") | ||
| entry_plist = { | ||
| 'Creation Date': utc_time, | ||
| 'Starred': entry.starred if hasattr(entry, 'starred') else False, | ||
| 'Entry Text': entry.title + "\n" + entry.body, | ||
| 'Time Zone': str(tzlocal.get_localzone()), | ||
| 'UUID': entry.uuid, | ||
| 'Tags': [tag.strip(self.config['tagsymbols']) for tag in entry.tags] | ||
| } | ||
| plistlib.writePlist(entry_plist, filename) | ||
| for entry in self._deleted_entries: | ||
| filename = os.path.join(self.config['journal'], "entries", entry.uuid + ".doentry") | ||
| os.remove(filename) | ||
|
|
||
| def editable_str(self): | ||
| """Turns the journal into a string of entries that can be edited | ||
| manually and later be parsed with eslf.parse_editable_str.""" | ||
| return u"\n".join([u"# {0}\n{1}".format(e.uuid, e.__unicode__()) for e in self.entries]) | ||
|
|
||
| def parse_editable_str(self, edited): | ||
| """Parses the output of self.editable_str and updates it's entries.""" | ||
| # Method: create a new list of entries from the edited text, then match | ||
| # UUIDs of the new entries against self.entries, updating the entries | ||
| # if the edited entries differ, and deleting entries from self.entries | ||
| # if they don't show up in the edited entries anymore. | ||
| date_length = len(datetime.today().strftime(self.config['timeformat'])) | ||
|
|
||
| # Initialise our current entry | ||
| entries = [] | ||
| current_entry = None | ||
|
|
||
| for line in edited.splitlines(): | ||
| # try to parse line as UUID => new entry begins | ||
| line = line.rstrip() | ||
| m = re.match("# *([a-f0-9]+) *$", line.lower()) | ||
| if m: | ||
| if current_entry: | ||
| entries.append(current_entry) | ||
| current_entry = Entry.Entry(self) | ||
| current_entry.modified = False | ||
| current_entry.uuid = m.group(1).lower() | ||
| else: | ||
| try: | ||
| new_date = datetime.strptime(line[:date_length], self.config['timeformat']) | ||
| if line.endswith("*"): | ||
| current_entry.starred = True | ||
| line = line[:-1] | ||
| current_entry.title = line[date_length + 1:] | ||
| current_entry.date = new_date | ||
| except ValueError: | ||
| if current_entry: | ||
| current_entry.body += line + "\n" | ||
|
|
||
| # Append last entry | ||
| if current_entry: | ||
| entries.append(current_entry) | ||
|
|
||
| # Now, update our current entries if they changed | ||
| for entry in entries: | ||
| entry.parse_tags() | ||
| matched_entries = [e for e in self.entries if e.uuid.lower() == entry.uuid] | ||
| if matched_entries: | ||
| # This entry is an existing entry | ||
| match = matched_entries[0] | ||
| if match != entry: | ||
| self.entries.remove(match) | ||
| entry.modified = True | ||
| self.entries.append(entry) | ||
| else: | ||
| # This entry seems to be new... save it. | ||
| entry.modified = True | ||
| self.entries.append(entry) | ||
| # Remove deleted entries | ||
| edited_uuids = [e.uuid for e in entries] | ||
| self._deleted_entries = [e for e in self.entries if e.uuid not in edited_uuids] | ||
| self.entries[:] = [e for e in self.entries if e.uuid in edited_uuids] | ||
| return entries |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.