+
+
+
+ 404
+ +Page not found
+ + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Encryption
+Encrypting and decrypting
+If you don't choose to encrypt your file when you run
+jrnl for the first time, you can encrypt
+your existing journal file or change its password using
jrnl --encrypt
+If it is already encrypted, you will first be asked for the current +password. You can then enter a new password and your plain journal will +replaced by the encrypted file. Conversely,
+jrnl --decrypt
+will replace your encrypted journal file by a Journal in plain text. You
+can also specify a filename, ie. jrnl --decrypt plain_text_copy.txt,
+to leave your original file untouched.
Storing passwords in your keychain
+Whenever you encrypt your journal, you are asked whether you want to +store the encryption password in your keychain. If you do this, you +won't have to enter your password every time you want to write or read +your journal.
+If you don't initially store the password in the keychain but decide to
+do so at a later point -- or maybe want to store it on one computer but
+not on another -- you can simply run jrnl --encrypt on an encrypted
+journal and use the same password again.
A note on security
+While jrnl follows best practises, true security is an illusion.
+Specifically, jrnl will leave traces in your memory and your shell
+history -- it's meant to keep journals secure in transit, for example
+when storing it on an
+untrusted
+services such as Dropbox. If you're concerned about security, disable
+history logging for journal in your .bashrc
HISTIGNORE="$HISTIGNORE:jrnl *"
+If you are using zsh instead of bash, you can get the same behaviour
+adding this to your zshrc
setopt HIST_IGNORE_SPACE
+alias jrnl=" jrnl"
+Manual decryption
+Should you ever want to decrypt your journal manually, you can do so +with any program that supports the AES algorithm in CBC. The key used +for encryption is the SHA-256-hash of your password, the IV +(initialisation vector) is stored in the first 16 bytes of the encrypted +file. The plain text is encoded in UTF-8 and padded according to PKCS#7 +before being encrypted. Here's a Python script that you can use to +decrypt your journal
+#!/usr/bin/env python3
+
+import argparse
+from Crypto.Cipher import AES
+import getpass
+import hashlib
+import sys
+
+parser = argparse.ArgumentParser()
+parser.add_argument("filepath", help="journal file to decrypt")
+args = parser.parse_args()
+
+pwd = getpass.getpass()
+key = hashlib.sha256(pwd.encode('utf-8')).digest()
+
+with open(args.filepath, 'rb') as f:
+ ciphertext = f.read()
+
+crypto = AES.new(key, AES.MODE_CBC, ciphertext[:16])
+plain = crypto.decrypt(ciphertext[16:])
+plain = plain.strip(plain[-1:])
+plain = plain.decode("utf-8")
+print(plain)
+
+
+
+ GitHub
+
+
+ « Previous
+
+
+ Next »
+
+
+
+
+
+
+
+
+
diff --git a/export/index.html b/export/index.html
new file mode 100755
index 00000000..cc3b2d0f
--- /dev/null
+++ b/export/index.html
@@ -0,0 +1,246 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Import and Export
+Tag export
+With
+jrnl --tags
+you'll get a list of all tags you used in your journal, sorted by most +frequent. Tags occurring several times in the same entry are only +counted as one.
+List of all entries
+jrnl --short
+Will only display the date and title of each entry.
+JSON export
+Can do
+jrnl --export json
+Why not create a beautiful timeline of +your journal?
+Markdown export
+Use
+jrnl --export markdown
+Markdown is a simple markup language that is human readable and can be +used to be rendered to other formats (html, pdf). This README for +example is formatted in markdown and github makes it look nice.
+Text export
+jrnl --export text
+Pretty-prints your entire journal.
+Export to files
+You can specify the output file of your exported journal using the
+-o argument
jrnl --export md -o journal.md
+The above command will generate a file named journal.md. If the-o argument is a directory, jrnl will export each entry into an individual file
jrnl --export json -o my_entries/
+The contents of my\_entries/ will then look like this:
my_entries/
+|- 2013_06_03_a-beautiful-day.json
+|- 2013_06_07_dinner-with-gabriel.json
+|- ...
+
+
+
+ GitHub
+
+
+ « Previous
+
+
+ Next »
+
+
+
+
+
+
+
+
+
diff --git a/features/core.feature b/features/core.feature
deleted file mode 100644
index ab86da42..00000000
--- a/features/core.feature
+++ /dev/null
@@ -1,60 +0,0 @@
-Feature: Basic reading and writing to a journal
-
- Scenario: Loading a sample journal
- Given we use the config "basic.yaml"
- When we run "jrnl -n 2"
- Then we should get no error
- and the output should be
- """
- 2013-06-09 15:39 My first entry.
- | Everything is alright
-
- 2013-06-10 15:40 Life is good.
- | But I'm better.
- """
-
- Scenario: Writing an entry from command line
- Given we use the config "basic.yaml"
- When we run "jrnl 23 july 2013: A cold and stormy day. I ate crisps on the sofa."
- Then we should see the message "Entry added"
- When we run "jrnl -n 1"
- Then the output should contain "2013-07-23 09:00 A cold and stormy day."
-
- Scenario: Filtering for dates
- Given we use the config "basic.yaml"
- When we run "jrnl -on 2013-06-10 --short"
- Then the output should be "2013-06-10 15:40 Life is good."
- When we run "jrnl -on 'june 6 2013' --short"
- Then the output should be "2013-06-10 15:40 Life is good."
-
- Scenario: Emoji support
- Given we use the config "basic.yaml"
- When we run "jrnl 23 july 2013: 🌞 sunny day. Saw an 🐘"
- Then we should see the message "Entry added"
- When we run "jrnl -n 1"
- Then the output should contain "🌞"
- and the output should contain "🐘"
-
- Scenario: Writing an entry at the prompt
- Given we use the config "basic.yaml"
- When we run "jrnl" and enter "25 jul 2013: I saw Elvis. He's alive."
- Then we should get no error
- and the journal should contain "[2013-07-25 09:00] I saw Elvis."
- and the journal should contain "He's alive."
-
- Scenario: Displaying the version number
- Given we use the config "basic.yaml"
- When we run "jrnl -v"
- Then we should get no error
- Then the output should contain "version"
-
- Scenario: --short displays the short version of entries (only the title)
- Given we use the config "basic.yaml"
- When we run "jrnl -on 2013-06-10 --short"
- Then the output should be "2013-06-10 15:40 Life is good."
-
- Scenario: -s displays the short version of entries (only the title)
- Given we use the config "basic.yaml"
- When we run "jrnl -on 2013-06-10 -s"
- Then the output should be "2013-06-10 15:40 Life is good."
-
diff --git a/features/data/configs/basic.yaml b/features/data/configs/basic.yaml
deleted file mode 100644
index 9111b561..00000000
--- a/features/data/configs/basic.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-default_hour: 9
-default_minute: 0
-editor: ""
-encrypt: false
-highlight: true
-journals:
- default: features/journals/simple.journal
-linewrap: 80
-tagsymbols: "@"
-template: false
-timeformat: "%Y-%m-%d %H:%M"
-indent_character: "|"
diff --git a/features/data/configs/brackets.yaml b/features/data/configs/brackets.yaml
deleted file mode 100644
index e658947c..00000000
--- a/features/data/configs/brackets.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-default_hour: 9
-default_minute: 0
-editor: ""
-encrypt: false
-highlight: true
-journals:
- default: features/journals/brackets.journal
-linewrap: 80
-tagsymbols: "@"
-template: false
-timeformat: "%Y-%m-%d %H:%M"
-indent_character: "|"
diff --git a/features/data/configs/bug153.yaml b/features/data/configs/bug153.yaml
deleted file mode 100644
index 765185c3..00000000
--- a/features/data/configs/bug153.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-default_hour: 9
-default_minute: 0
-editor: ''
-encrypt: false
-highlight: true
-journals:
- default: features/journals/bug153.dayone
-linewrap: 80
-password: ''
-tagsymbols: '@'
-template: false
-timeformat: '%Y-%m-%d %H:%M'
-indent_character: "|"
diff --git a/features/data/configs/bug343.yaml b/features/data/configs/bug343.yaml
deleted file mode 100644
index a4e25d8a..00000000
--- a/features/data/configs/bug343.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-default_hour: 9
-default_minute: 0
-editor: ''
-template: false
-encrypt: false
-highlight: true
-journals:
- simple: features/journals/simple.journal
- work: features/journals/work.journal
-linewrap: 80
-tagsymbols: '@'
-timeformat: '%Y-%m-%d %H:%M'
-indent_character: "|"
diff --git a/features/data/configs/dayone.yaml b/features/data/configs/dayone.yaml
deleted file mode 100644
index e7331733..00000000
--- a/features/data/configs/dayone.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-default_hour: 9
-default_minute: 0
-editor: ''
-template: false
-encrypt: false
-highlight: true
-journals:
- default: features/journals/dayone.dayone
-linewrap: 80
-password: ''
-tagsymbols: '@'
-timeformat: '%Y-%m-%d %H:%M'
-indent_character: "|"
diff --git a/features/data/configs/empty_folder.yaml b/features/data/configs/empty_folder.yaml
deleted file mode 100644
index ee401ada..00000000
--- a/features/data/configs/empty_folder.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-default_hour: 9
-default_minute: 0
-editor: ''
-template: false
-encrypt: false
-highlight: true
-journals:
- default: features/journals/empty_folder
-linewrap: 80
-password: ''
-tagsymbols: '@'
-timeformat: '%Y-%m-%d %H:%M'
-indent_character: "|"
diff --git a/features/data/configs/encrypted.yaml b/features/data/configs/encrypted.yaml
deleted file mode 100644
index 254b81d9..00000000
--- a/features/data/configs/encrypted.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-default_hour: 9
-default_minute: 0
-editor: ''
-encrypt: true
-template: false
-highlight: true
-journals:
- default: features/journals/encrypted.journal
-linewrap: 80
-password: ''
-tagsymbols: '@'
-timeformat: '%Y-%m-%d %H:%M'
-indent_character: "|"
diff --git a/features/data/configs/encrypted_old.json b/features/data/configs/encrypted_old.json
deleted file mode 100644
index e69d9b79..00000000
--- a/features/data/configs/encrypted_old.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
- "default_hour": 9,
- "default_minute": 0,
- "editor": "",
- "encrypt": true,
- "highlight": true,
- "journals": {
- "default": "features/journals/encrypted_jrnl-1-9-5.journal"
- },
- "linewrap": 80,
- "tagsymbols": "@",
- "timeformat": "%Y-%m-%d %H:%M"
-}
diff --git a/features/data/configs/encrypted_old.yaml b/features/data/configs/encrypted_old.yaml
deleted file mode 100644
index bc7b1440..00000000
--- a/features/data/configs/encrypted_old.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-default_hour: 9
-default_minute: 0
-editor: ''
-encrypt: true
-highlight: true
-journals:
- default: features/journals/encrypted_jrnl1-9-5.journal
-linewrap: 80
-tagsymbols: '@'
-timeformat: '%Y-%m-%d %H:%M'
-indent_character: "|"
diff --git a/features/data/configs/markdown-headings-335.yaml b/features/data/configs/markdown-headings-335.yaml
deleted file mode 100644
index dafed64b..00000000
--- a/features/data/configs/markdown-headings-335.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-default_hour: 9
-default_minute: 0
-editor: ''
-encrypt: false
-highlight: true
-template: false
-journals:
- default: features/journals/markdown-headings-335.journal
-linewrap: 80
-password: ''
-tagsymbols: '@'
-timeformat: '%Y-%m-%d %H:%M'
-indent_character: "|"
diff --git a/features/data/configs/mostlyreadabledates.yaml b/features/data/configs/mostlyreadabledates.yaml
deleted file mode 100644
index 5e3e1a15..00000000
--- a/features/data/configs/mostlyreadabledates.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-default_hour: 9
-default_minute: 0
-editor: ""
-encrypt: false
-highlight: true
-journals:
- default: features/journals/mostlyreadabledates.journal
-linewrap: 80
-tagsymbols: "@"
-template: false
-timeformat: "%Y-%m-%d %H:%M"
-indent_character: "|"
diff --git a/features/data/configs/multiple.yaml b/features/data/configs/multiple.yaml
deleted file mode 100644
index 2e282232..00000000
--- a/features/data/configs/multiple.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-default_hour: 9
-default_minute: 0
-editor: ''
-encrypt: false
-highlight: true
-template: false
-journals:
- default: features/journals/simple.journal
- ideas: features/journals/nothing.journal
- simple: features/journals/simple.journal
- work: features/journals/work.journal
- new_encrypted:
- encrypt: true
- journal: features/journals/new_encrypted.journal
-linewrap: 80
-password: ''
-tagsymbols: '@'
-timeformat: '%Y-%m-%d %H:%M'
-indent_character: "|"
diff --git a/features/data/configs/tags-216.yaml b/features/data/configs/tags-216.yaml
deleted file mode 100644
index 73523c50..00000000
--- a/features/data/configs/tags-216.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-default_hour: 9
-default_minute: 0
-editor: ''
-encrypt: false
-highlight: true
-template: false
-journals:
- default: features/journals/tags-216.journal
-linewrap: 80
-password: ''
-tagsymbols: '@'
-timeformat: '%Y-%m-%d %H:%M'
-indent_character: "|"
diff --git a/features/data/configs/tags-237.yaml b/features/data/configs/tags-237.yaml
deleted file mode 100644
index 2b360f6f..00000000
--- a/features/data/configs/tags-237.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-default_hour: 9
-default_minute: 0
-editor: ''
-encrypt: false
-highlight: true
-template: false
-journals:
- default: features/journals/tags-237.journal
-linewrap: 80
-password: ''
-tagsymbols: '@'
-timeformat: '%Y-%m-%d %H:%M'
-indent_character: "|"
diff --git a/features/data/configs/tags.yaml b/features/data/configs/tags.yaml
deleted file mode 100644
index 51a2b8b2..00000000
--- a/features/data/configs/tags.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-default_hour: 9
-default_minute: 0
-editor: ''
-encrypt: false
-highlight: true
-template: false
-journals:
- default: features/journals/tags.journal
-linewrap: 80
-password: ''
-tagsymbols: '@'
-timeformat: '%Y-%m-%d %H:%M'
-indent_character: "|"
diff --git a/features/data/configs/unreadabledates.yaml b/features/data/configs/unreadabledates.yaml
deleted file mode 100644
index 474e7aae..00000000
--- a/features/data/configs/unreadabledates.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-default_hour: 9
-default_minute: 0
-editor: ""
-encrypt: false
-highlight: true
-journals:
- default: features/journals/unreadabledates.journal
-linewrap: 80
-tagsymbols: "@"
-template: false
-timeformat: "%Y-%m-%d %H:%M"
-indent_character: "|"
diff --git a/features/data/configs/upgrade_from_195.json b/features/data/configs/upgrade_from_195.json
deleted file mode 100644
index ec380372..00000000
--- a/features/data/configs/upgrade_from_195.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-"default_hour": 9,
-"timeformat": "%Y-%m-%d %H:%M",
-"linewrap": 80,
-"encrypt": false,
-"editor": "",
-"default_minute": 0,
-"highlight": true,
-"journals": {"default": "features/journals/simple_jrnl-1-9-5.journal"},
-"tagsymbols": "@"
-}
diff --git a/features/data/journals/brackets.journal b/features/data/journals/brackets.journal
deleted file mode 100644
index 4649ea3e..00000000
--- a/features/data/journals/brackets.journal
+++ /dev/null
@@ -1,2 +0,0 @@
-[2019-07-08 05:42] Entry subject
-[1] line starting with 1
diff --git a/features/data/journals/bug153.dayone/entries/B40EE704E15846DE8D45C44118A4D511.doentry b/features/data/journals/bug153.dayone/entries/B40EE704E15846DE8D45C44118A4D511.doentry
deleted file mode 100644
index 066821bb..00000000
--- a/features/data/journals/bug153.dayone/entries/B40EE704E15846DE8D45C44118A4D511.doentry
+++ /dev/null
@@ -1,56 +0,0 @@
-
-
-
+ 
+ Collect your thoughts and notes
+
+
+ Collect your thoughts and notes
without leaving the command line.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Human friendly.
+jrnl has a natural-language interface so you don't have to remember cryptic shortcuts when you're writing down your thoughts.
+Future-proof.
+Your journals are stored in plain-text files that will still be readable in 50 years when all your fancy iPad apps will have gone the way of the Dodo.
+Secure.
+Encrypt your journals with the industry-strength AES encryption. The NSA won't be able to read your dirty secrets.
+Accessible anywhere.
+Sync your journals with Dropbox and capture your thoughts where ever you are
+DayOne compatible.
+Read, write and search your DayOne journal from the command line.
+Free & Open Source.
+jrnl is made by a bunch of really friendly and remarkably attractive people. Maybe even you?
+For work and play.
+Effortlessly access several journals for all parts of your life.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Getting started
+Installation
+On OS X, the easiest way to install jrnl is using +Homebrew
+brew install jrnl
+On other platforms, install jrnl using pip
+pip install jrnl
+Or, if you want the option to encrypt your journal,
+pip install jrnl[encrypted]
+to install the dependencies for encrypting journals as well.
+
+
+Note
+Installing the encryption library, pycrypto, requires a gcc compiler. For this reason, jrnl will
+not install pycrypto unless explicitly told so like this. You can install PyCrypto manually
+first or install it with pip install pycrypto if you have a gcc compiler.
+Also note that when using zsh, the correct syntax is pip install "jrnl[encrypted]" (note the quotes).
The first time you run jrnl you will be asked where your journal file
+should be created and whether you wish to encrypt it.
Quickstart
+to make a new entry, just type
+jrnl yesterday: Called in sick. Used the time to clean the house and spent 4h on writing my book.
+and hit return. yesterday: will be interpreted as a time stamp.
+Everything until the first sentence mark (.?!:) will be interpreted as
+the title, the rest as the body. In your journal file, the result will
+look like this:
2012-03-29 09:00 Called in sick.
+Used the time to clean the house and spent 4h on writing my book.
+If you just call jrnl, you will be prompted to compose your entry -
+but you can also configure jrnl to use your external editor.
+
+
+ GitHub
+
+
+ « Previous
+
+
+ Next »
+
+
+
+
+
+
+
+
+
diff --git a/jrnl/DayOneJournal.py b/jrnl/DayOneJournal.py
deleted file mode 100644
index 9e988f78..00000000
--- a/jrnl/DayOneJournal.py
+++ /dev/null
@@ -1,146 +0,0 @@
-#!/usr/bin/env python
-# encoding: utf-8
-
-from __future__ import absolute_import, unicode_literals
-from . import Entry
-from . import Journal
-from . import time as jrnl_time
-import os
-import re
-from datetime import datetime
-import time
-import fnmatch
-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"))]
- filenames = []
- for root, dirnames, f in os.walk(self.config['journal']):
- for filename in fnmatch.filter(f, '*.doentry'):
- filenames.append(os.path.join(root, filename))
- 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)
- entry = Entry.Entry(self, date, text=dict_entry['Entry Text'], starred=dict_entry["Starred"])
- entry.uuid = dict_entry["UUID"]
- entry._tags = [self.config['tagsymbols'][0] + tag.lower() for tag in dict_entry.get("Tags", [])]
-
- self.entries.append(entry)
- self.sort()
- return self
-
- def write(self):
- """Writes only the entries that have been modified into plist files."""
- for entry in self.entries:
- if entry.modified:
- utc_time = datetime.utcfromtimestamp(time.mktime(entry.date.timetuple()))
-
- if not hasattr(entry, "uuid"):
- entry.uuid = uuid.uuid1().hex
-
- filename = os.path.join(self.config['journal'], "entries", entry.uuid.upper() + ".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.upper(),
- 'Tags': [tag.strip(self.config['tagsymbols']).replace("_", " ") 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 "\n".join(["# {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 its 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.
-
- # 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:
- date_blob_re = re.compile("^\[[^\\]]+\] ")
- date_blob = date_blob_re.findall(line)
- if date_blob:
- date_blob = date_blob[0]
- new_date = jrnl_time.parse(date_blob.strip(" []"))
- if line.endswith("*"):
- current_entry.starred = True
- line = line[:-1]
- current_entry.title = line[len(date_blob) - 1:]
- current_entry.date = new_date
- elif 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_text()
- 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
diff --git a/jrnl/EncryptedJournal.py b/jrnl/EncryptedJournal.py
deleted file mode 100644
index a83651e4..00000000
--- a/jrnl/EncryptedJournal.py
+++ /dev/null
@@ -1,127 +0,0 @@
-from . import Journal, util
-from cryptography.fernet import Fernet, InvalidToken
-from cryptography.hazmat.primitives import hashes, padding
-from cryptography.hazmat.primitives.ciphers import Cipher, algorithms, modes
-import hashlib
-from cryptography.hazmat.primitives.kdf.pbkdf2 import PBKDF2HMAC
-from cryptography.hazmat.backends import default_backend
-import sys
-import os
-import base64
-import getpass
-import logging
-
-log = logging.getLogger()
-
-
-def make_key(password):
- password = util.bytes(password)
- kdf = PBKDF2HMAC(
- algorithm=hashes.SHA256(),
- length=32,
- # Salt is hard-coded
- salt=b'\xf2\xd5q\x0e\xc1\x8d.\xde\xdc\x8e6t\x89\x04\xce\xf8',
- iterations=100000,
- backend=default_backend()
- )
- key = kdf.derive(password)
- return base64.urlsafe_b64encode(key)
-
-
-class EncryptedJournal(Journal.Journal):
- def __init__(self, name='default', **kwargs):
- super(EncryptedJournal, self).__init__(name, **kwargs)
- self.config['encrypt'] = True
-
- def open(self, filename=None):
- """Opens the journal file defined in the config and parses it into a list of Entries.
- Entries have the form (date, title, body)."""
- filename = filename or self.config['journal']
-
- if not os.path.exists(filename):
- password = util.getpass("Enter password for new journal: ")
- if password:
- if util.yesno("Do you want to store the password in your keychain?", default=True):
- util.set_keychain(self.name, password)
- else:
- util.set_keychain(self.name, None)
- self.config['password'] = password
- text = ""
- self._store(filename, text)
- util.prompt("[Journal '{0}' created at {1}]".format(self.name, filename))
- else:
- util.prompt("No password supplied for encrypted journal")
- sys.exit(1)
- else:
- text = self._load(filename)
- self.entries = self._parse(text)
- self.sort()
- log.debug("opened %s with %d entries", self.__class__.__name__, len(self))
- return self
-
-
- def _load(self, filename, password=None):
- """Loads an encrypted journal from a file and tries to decrypt it.
- If password is not provided, will look for password in the keychain
- and otherwise ask the user to enter a password up to three times.
- If the password is provided but wrong (or corrupt), this will simply
- return None."""
- with open(filename, 'rb') as f:
- journal_encrypted = f.read()
-
- def validate_password(password):
- key = make_key(password)
- try:
- plain = Fernet(key).decrypt(journal_encrypted).decode('utf-8')
- self.config['password'] = password
- return plain
- except (InvalidToken, IndexError):
- return None
- if password:
- return validate_password(password)
- return util.get_password(keychain=self.name, validator=validate_password)
-
- def _store(self, filename, text):
- key = make_key(self.config['password'])
- journal = Fernet(key).encrypt(text.encode('utf-8'))
- with open(filename, 'wb') as f:
- f.write(journal)
-
- @classmethod
- def _create(cls, filename, password):
- key = make_key(password)
- dummy = Fernet(key).encrypt(b"")
- with open(filename, 'wb') as f:
- f.write(dummy)
-
-
-class LegacyEncryptedJournal(Journal.LegacyJournal):
- """Legacy class to support opening journals encrypted with the jrnl 1.x
- standard. You'll not be able to save these journals anymore."""
- def __init__(self, name='default', **kwargs):
- super(LegacyEncryptedJournal, self).__init__(name, **kwargs)
- self.config['encrypt'] = True
-
- def _load(self, filename, password=None):
- with open(filename, 'rb') as f:
- journal_encrypted = f.read()
- iv, cipher = journal_encrypted[:16], journal_encrypted[16:]
-
- def validate_password(password):
- decryption_key = hashlib.sha256(password.encode('utf-8')).digest()
- decryptor = Cipher(algorithms.AES(decryption_key), modes.CBC(iv), default_backend()).decryptor()
- try:
- plain_padded = decryptor.update(cipher) + decryptor.finalize()
- self.config['password'] = password
- if plain_padded[-1] in (" ", 32):
- # Ancient versions of jrnl. Do not judge me.
- return plain_padded.decode('utf-8').rstrip(" ")
- else:
- unpadder = padding.PKCS7(algorithms.AES.block_size).unpadder()
- plain = unpadder.update(plain_padded) + unpadder.finalize()
- return plain.decode('utf-8')
- except ValueError:
- return None
- if password:
- return validate_password(password)
- return util.get_password(keychain=self.name, validator=validate_password)
diff --git a/jrnl/Entry.py b/jrnl/Entry.py
deleted file mode 100755
index 1306cef5..00000000
--- a/jrnl/Entry.py
+++ /dev/null
@@ -1,124 +0,0 @@
-#!/usr/bin/env python
-# encoding: utf-8
-
-from __future__ import unicode_literals
-import re
-import textwrap
-from datetime import datetime
-from .util import split_title
-
-
-class Entry:
- def __init__(self, journal, date=None, text="", starred=False):
- self.journal = journal # Reference to journal mainly to access its config
- self.date = date or datetime.now()
- self.text = text
- self._title = self._body = self._tags = None
- self.starred = starred
- self.modified = False
-
- @property
- def fulltext(self):
- return self.title + " " + self.body
-
- def _parse_text(self):
- raw_text = self.text
- lines = raw_text.splitlines()
- if lines[0].strip().endswith("*"):
- self.starred = True
- raw_text = lines[0].strip("\n *") + "\n" + "\n".join(lines[1:])
- self._title, self._body = split_title(raw_text)
- if self._tags is None:
- self._tags = list(self._parse_tags())
-
- @property
- def title(self):
- if self._title is None:
- self._parse_text()
- return self._title
-
- @property
- def body(self):
- if self._body is None:
- self._parse_text()
- return self._body
-
- @property
- def tags(self):
- if self._tags is None:
- self._parse_text()
- return self._tags
-
- @staticmethod
- def tag_regex(tagsymbols):
- pattern = r'(?u)(?:^|\s)([{tags}][-+*#/\w]+)'.format(tags=tagsymbols)
- return re.compile(pattern, re.UNICODE)
-
- def _parse_tags(self):
- tagsymbols = self.journal.config['tagsymbols']
- return set(tag.lower() for tag in re.findall(Entry.tag_regex(tagsymbols), self.text))
-
- def __unicode__(self):
- """Returns a string representation of the entry to be written into a journal file."""
- date_str = self.date.strftime(self.journal.config['timeformat'])
- title = "[{}] {}".format(date_str, self.title.rstrip("\n "))
- if self.starred:
- title += " *"
- return "{title}{sep}{body}\n".format(
- title=title,
- sep="\n" if self.body.rstrip("\n ") else "",
- body=self.body.rstrip("\n ")
- )
-
- def pprint(self, short=False):
- """Returns a pretty-printed version of the entry.
- If short is true, only print the title."""
- date_str = self.date.strftime(self.journal.config['timeformat'])
- if self.journal.config['indent_character']:
- indent = self.journal.config['indent_character'].rstrip() + " "
- else:
- indent = ""
- if not short and self.journal.config['linewrap']:
- title = textwrap.fill(date_str + " " + self.title, self.journal.config['linewrap'])
- body = "\n".join([
- textwrap.fill(
- line,
- self.journal.config['linewrap'],
- initial_indent=indent,
- subsequent_indent=indent,
- drop_whitespace=True) or indent
- for line in self.body.rstrip(" \n").splitlines()
- ])
- else:
- title = date_str + " " + self.title.rstrip("\n ")
- body = self.body.rstrip("\n ")
-
- # Suppress bodies that are just blanks and new lines.
- has_body = len(self.body) > 20 or not all(char in (" ", "\n") for char in self.body)
-
- if short:
- return title
- else:
- return "{title}{sep}{body}\n".format(
- title=title,
- sep="\n" if has_body else "",
- body=body if has_body else "",
- )
-
- def __repr__(self):
- return "
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Overview
+What is jrnl?
+jrnl is a simple journal application for
+your command line. Journals are stored as human readable plain text
+files - you can put them into a Dropbox folder for instant syncing and
+you can be assured that your journal will still be readable in 2050,
+when all your fancy iPad journal applications will long be forgotten.
jrnl also plays nice with the fabulous
+DayOne and can read and write directly from and
+to DayOne Journals.
Optionally, your journal can be encrypted using the 256-bit +AES.
+Why keep a journal?
+Journals aren't just for people who have too much +time on their summer vacation. A journal helps you to keep track of the +things you get done and how you did them. Your imagination may be +limitless, but your memory isn't.
+For personal use, make it a good habit to write at least 20 words a day. +Just to reflect what made this day special, why you haven't wasted it.
+For professional use, consider a text-based journal to be the perfect +complement to your GTD todo list - a documentation of what and how +you've done it. Or use it as a quick way to keep a change log. Or use it +to keep a lab book.
+ +