Commit graph

545 commits

Author SHA1 Message Date
Greg Bodnar
623fa6c307 Create encrypted journal
Add failing test for configuring an encrypted journal
Overload open for EncryptedJournal

This avoids the execution path that calls EncryptedJournal._create()
without a password parameter. It results in duplication of code that
requests and stores a password, which should be factored out in a
subsequent change.

Modify test to test for returned strings

The entered string for the password is not being used by the test and I
don't understand why.

Use util wrapper for getpass

This allows for tests to run without prompting for user input.
2020-04-10 11:51:55 -07:00
Jonathan Wren
b260ff35b9 #631 Escape data in square brackets 2020-04-10 11:51:55 -07:00
Jonathan Wren
b84f862253 fix a few linting errors 2020-04-10 11:51:55 -07:00
Micah Jerome Ellison
3a72313d06 Updating Python version and jrnl version for v2.0-rc3 2020-04-10 11:51:55 -07:00
Micah Jerome Ellison
f37f82f782 [GH-614] resolving issues around unreadable dates and unparsed dates 2020-04-10 11:51:55 -07:00
Micah Jerome Ellison
ccf0b7e039 #6 allowing template interpreter to interpret common Python commands 2020-04-10 11:51:55 -07:00
Jonathan Wren
13631b9a68 Fix issue #584 YAMLLoadWarning (#585) 2020-04-10 11:51:55 -07:00
hoclun-rigsep
6826f07b6e Use shlex to parse editor commandline as per 2.0-rc1 (#556) 2018-08-16 15:16:29 -07:00
Radomír Bosák
8fe8e00e1b Catch keyboard interrupt when opening journal (#476)
If the journal is encrypted, jrnl asks for a password using the
getpass.getpass function. If user presses the keyboard interrupt (e.g.
ctrl+c) during the password prompt, jrnl crashes and prints a stack
trace. This however is not very user friendly.

This commit adds a check for KeyboardInterrupt Exception and prints a
message whenever this exception occurs and exits. Stack is no longer
printed.

Fixes #450
2017-03-10 08:54:02 -08:00
Radomír Bosák
ca2d9f072f Fix python2 error in template_explorer.py (#471)
If template_explorer.py was imported in python2, it would fail because
it uses unicode_literals which would ultimately cause passing an unicode
string as the first argument to the 'type' built-in function.

This commit fixes this by converting the unicode to string before it is
passed to the 'type' function.

Fixes #456
2017-03-09 11:59:03 -08:00
Manuel Ebert
60a955de20 Template exporting FTW 2016-08-19 23:20:31 +00:00
Manuel Ebert
f4dfecb62f Fix JSON export 2016-08-19 21:44:12 +00:00
Manuel Ebert
6a53da5efd Indent character optional 2016-08-19 21:44:01 +00:00
Manuel Ebert
bdc9dc598d Fix Keyring tests 2016-08-19 21:43:27 +00:00
Manuel Ebert
69fc08f6f3 Upgrade to cryptography 1.4 2016-08-17 13:41:54 +00:00
Manuel Ebert
85934c1980 Exports 2016-07-17 13:35:35 -07:00
Philip Douglass
ba05411a80 User defined indent character (#419)
Make indent character configurable.
2016-04-15 23:00:49 -07:00
Manuel Ebert
dbf912c661 Merge pull request #417 from philipsd6/2.0-strip_entry_body
Fully strip title and body after SENTENCE_SPLITTER search
2016-04-07 13:15:12 -07:00
Philip Douglass
b2147d53c5 Fully strip title and body after SENTENCE_SPLITTER search 2016-04-07 14:31:16 -04:00
Philip Douglass
eec009fd18 Clean up text wrapping once and for all 2016-04-07 14:29:28 -04:00
Philip Douglass
04082d36c9 Open config_path as utf-8 2016-01-24 21:16:50 -05:00
Philip Douglass
9f7d71aa8f Expand vars and user tilde for upgrade backup 2016-01-24 21:09:17 -05:00
Manuel Ebert
44e243a629 Byte encoding for getpass
Fixes #392 and #393
2016-01-11 12:08:05 -08:00
Manuel Ebert
87aeb17b2c Unicode literals in util 2015-12-28 22:07:26 -08:00
Manuel Ebert
c2ca11caa7 Drop whitespace in print
Fixes #222 and #376
2015-12-28 21:53:23 -08:00
flight16
28d87861cc Merged PR 2015-12-28 21:36:17 -08:00
Manuel Ebert
95d399d5c3 Seperation of title and entry is now purely virtual.
Fixes #360
2015-12-28 21:24:39 -08:00
Manuel Ebert
849dc89557 --export text doesn't indent
Fixes #373
2015-12-28 13:06:26 -08:00
Manuel Ebert
b2542db5e5 Fix XML export 2015-12-28 13:01:33 -08:00
Manuel Ebert
7c6b2e4bce Support for templates 2015-07-01 22:23:13 -07:00
MinchinWeb
a4496518de [CLI] display instructions to enter an entry on the command line when no editor is set 2015-05-05 15:30:18 -06:00
MinchinWeb
1a220243bc Colorize error and warning messages 2015-05-05 15:12:02 -06:00
MinchinWeb
00c836032d [Dayone] clean up date code 2015-05-05 14:25:53 -06:00
MinchinWeb
b8dbf84753 [Dayone] cut extended attributes for now 2015-05-05 13:54:38 -06:00
MinchinWeb
eed1bd3cb3 [Dayone] allow variable length dates on edited Dayone entries 2015-05-05 13:21:46 -06:00
MinchinWeb
a329fe4874 [Dayone] fix reading dates off edited dayone entries 2015-05-05 13:07:25 -06:00
MinchinWeb
e0177f4f0b Fixes #348
Also fixes #322 on windows.
2015-05-05 11:58:15 -06:00
MinchinWeb
7de37ffd25 code formatting 2015-05-04 12:08:05 -06:00
MinchinWeb
0fcf078c1c [Dayone] Add Creator section to dayone import and YAML export 2015-05-04 00:21:33 -06:00
MinchinWeb
91368c7b63 [Util] delete old, unused code 2015-05-03 22:12:10 -06:00
MinchinWeb
cf7b5d95eb [CLI] colour code 'no editor' error message 2015-05-03 21:59:20 -06:00
MinchinWeb
db4a5a4665 [YAML export] remove lines that simply list tags 2015-05-03 21:36:16 -06:00
MinchinWeb
327fde5c0f [YAML export] only increase headings by one level 2015-05-03 19:56:16 -06:00
Manuel Ebert
bf2cdc4995 Fix for #332 2015-04-21 15:57:44 +02:00
Manuel Ebert
07fbf73dee Fix for #322 2015-04-21 15:49:27 +02:00
Manuel Ebert
ca76077e09 Merge branch 'pr/326' into 2.0-rc1 2015-04-20 14:59:47 +02:00
Gregory Crosswhite
60194c7043 Now the list of import types in --help is generated from the plugins. 2015-04-20 14:57:33 +02:00
Josh Davis
47aa63c64a Allow editor config value to be either list or str 2015-04-20 14:45:15 +02:00
Manuel Ebert
4f23169d4e Merge pull request #346 from ametheus/patch-2
Fix improper charset handling in PY2 path of u(x)
2015-04-20 14:42:41 +02:00
Manuel Ebert
19247a4f62 Remove ; 2015-04-20 14:36:53 +02:00