Commit graph

60 commits

Author SHA1 Message Date
Jonathan Wren
b8a2c2df9d
Merge pull request #637 from jprof/add-not-flag
Add '-not' flag for excluding tags from filter
2019-09-21 12:37:34 -07:00
Dawid Zych
960573c103 Handle KeyboardInterrupt when installing journal 2019-08-07 19:17:02 +02:00
Justin Proffitt
0a1966e3b3 Add '-not' flag for excluding tags from filter 2019-07-28 22:21:02 -04:00
Radomír Bosák
a95859a292 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
Manuel Ebert
4b3dc38e05 Template exporting FTW 2016-08-19 23:20:31 +00:00
Manuel Ebert
b3f5c092de Fix Keyring tests 2016-08-19 21:43:27 +00:00
Manuel Ebert
8b64cc95d9 Exports 2016-07-17 13:35:35 -07:00
Manuel Ebert
dc39a25d5c Support for templates 2015-07-01 22:23:13 -07:00
MinchinWeb
78bae0476c Colorize error and warning messages 2015-05-05 15:12:02 -06:00
MinchinWeb
2141bcacd4 [CLI] colour code 'no editor' error message 2015-05-03 21:59:20 -06:00
Manuel Ebert
924037e2b0 Merge branch 'pr/326' into 2.0-rc1 2015-04-20 14:59:47 +02:00
Gregory Crosswhite
70c1f8c2ed Now the list of import types in --help is generated from the plugins. 2015-04-20 14:57:33 +02:00
Manuel Ebert
94d6ebeb2d Merge pull request #347 from MinchinWeb/2.0-rc1-markdown-export-fix
2.0 rc1 markdown export fix
2015-04-20 14:29:17 +02:00
Manuel Ebert
4b70709248 Warn user if attempting to write to default journal but not configured
Fixes #343
2015-04-20 14:25:44 +02:00
MinchinWeb
3b85121f51 Unable to run cli.py as a standalone script due to relative imports 2015-04-14 11:07:56 -06:00
flight16
b2a7d1f30e Add single letter alias -s for option --short
--short was being used in a test for date logic, but I added a second
test for explicitness.
2015-04-13 09:08:43 +09:00
Manuel Ebert
94964dc31c Python 3 fixes :) 2015-04-05 06:05:46 +04:00
Manuel Ebert
4010d38af2 Fix creating non-existent journals 2015-04-05 03:25:17 +04:00
Manuel Ebert
7dc2ccbd3a Cleanup and more logging 2015-04-05 02:28:04 +04:00
Manuel Ebert
c31e62d9d6 Introduce legacy classes 2015-04-05 07:25:22 +10:00
Manuel Ebert
75ecc0dbbd Properly initialise journal files after creating them 2015-04-04 18:58:33 +11:00
Manuel Ebert
b90a4b16bb Make backup of config when upgrading
Fixes #307
2015-04-04 18:36:34 +11:00
Manuel Ebert
dd79639095 Hardcoded salt to fix crypto 2015-04-04 17:50:44 +11:00
Pablo Carranza
cc22fd8e60 Added basic logging feature to understand how is configuration loaded
Conflicts:

	jrnl/cli.py
	jrnl/util.py
2014-11-09 15:55:52 -05:00
Manuel Ebert
6b8cbe52b5 Merge pull request #300 from gcgoogle/add-import-plugin-support
Added support for importing entries for 2.0rc1.
2014-10-30 15:03:47 +01:00
Gregory Crosswhite
584f0a969e Added support for importing entries. 2014-10-24 15:21:10 -07:00
Gregory Crosswhite
9e766d7ad0 Now the list of export types in --help is generated from the plugins. 2014-10-24 14:56:24 -07:00
Manuel Ebert
5e68b97e59 Plugin architecture 2014-09-27 15:07:22 -07:00
Manuel Ebert
359eabd56d Work on cryptography 2014-09-27 13:15:46 -07:00
Manuel Ebert
4ea5ae80b5 Upgrade scaffolding 2014-09-12 14:28:03 -07:00
Manuel Ebert
9651adcdd0 Deprecate config.password 2014-09-12 14:28:03 -07:00
Matthias Vogelgesang
044accff6d Fix failing behave tests 2014-09-12 14:27:34 -07:00
Matthias Vogelgesang
953c18dff2 Make Journal a general interface
This change moves the loading and saving mechanisms into its own
Plain- and EncryptedJournal subclasses for easier maintenance and lazy loading
of all the crypto modules.
2014-09-12 14:26:22 -07:00
Matthias Vogelgesang
b77a579ab5 Use PyXDG to save config and journal in XDG dirs
This change also hides the CONFIG_PATH state information entirely within
the install module. Therefore, the cli module does not have to care about
checking existence of files and paths.
2014-09-12 14:20:05 -07:00
Matthias Vogelgesang
f5a44487c1 Require config arguments 2014-09-12 14:18:52 -07:00
Manuel Ebert
182e51b92d Use unicode literals
Fixes #273
2014-09-02 13:26:50 -07:00
Manuel Ebert
4390e1f10c Sort journal entries after editing
Fixes #269
2014-08-12 10:10:15 +02:00
Manuel Ebert
2d46b0250b Introduces -on option
Fixes #246
2014-07-21 13:30:25 +09:00
Manuel Ebert
3f5b5ff3c3 Restrict --export argument
Fixes #187
2014-06-28 17:55:10 +02:00
Jonathon Scanes
3f4b873ec9 Printed message aborted on ctrl+c. 2014-06-27 14:01:16 +02:00
Chris Sexton
9276a92a0b Allow parallel edits
* Wait to open the journal until after getting text
* Use mktemp so that editors like vim get separate files for editing
2014-06-26 08:29:42 -04:00
Phil Tysoe
9878b6e350 Add export options to help message 2014-06-25 10:24:39 +01:00
Patrice Peterson
3639e00183 Allow use of environment variables in config paths
This patch simply adds several calls to `os.expandvars` to functions
that parse paths in the config file.
2014-06-23 16:12:41 +02:00
Manuel Ebert
db99510720 Split DayOne into separate file 2014-05-22 12:17:54 -07:00
Manuel Ebert
db4d2ddc54 Warns if using --edit without editor
Closes #151
2014-04-16 13:14:16 -04:00
Manuel Ebert
e9e9b1611b Don't decode unicode 2014-03-28 14:40:58 -07:00
Manuel Ebert
9d4c1a23b1 Even more unicode fixes 2014-03-28 13:43:58 -07:00
Manuel Ebert
599c5a9ea1 More unicode fixes for #119 2014-03-27 16:12:03 -07:00
Josh Tan
36601cba39 Simplified syntax for joining journal names with new lines. 2014-02-23 22:46:28 -06:00
Josh Tan
f1ea01ff9a Added ability to list accessible journals.
Previously, if a user forgot the exact name of a journal, they could check the configuration file to retrieve this information. This patch adds support for performing this task using the jrnl interface.

The newly added '-ls' option retrieves the available journals from the jrnl configuration files and displays each journal name on a separate line.

This patch also updates the jrnl help display and the usage documentation to reflect these changes.
2014-02-23 22:21:54 -06:00