Commit graph

50 commits

Author SHA1 Message Date
dbxnr
65eb1bb51b upgrade_config checks for nested changes 2020-01-10 03:55:10 +00:00
MinchinWeb
e7cbbecaef [Black] sync to develop branch and apply black
# Conflicts:
#	jrnl/EncryptedJournal.py
#	jrnl/Journal.py
#	jrnl/__init__.py
#	jrnl/cli.py
#	jrnl/install.py
2019-12-14 13:48:17 -07:00
MinchinWeb
d8f422151d Apply black formatter to code 2019-12-07 12:32:55 -07:00
Peter Schmidbauer
444d6de9e4 Move all password handling to EncryptedJournal
This commit should greatly simplify all password handling logic. No passwords are stored in the config dict anymore. Only the Encrypted Journals have any password related logic. I also had to remove some password fields from the test files, which shows how dangerous the previous approach was. A slight code change could've leaked passwords to the config file. However, I had to change the install progress a little bit to make this work. It will now not ask you for a password right away but rather if you want to encrypt or not. Only if you reply 'y' will it ask you for the password later on.
2019-11-29 17:07:35 +01:00
Micah Ellison
3aae43e138 [GH-738] preventing readline usage on Windows - removes autocomplete on the install step for Windows users 2019-11-18 20:32:40 -08:00
Peter Schmidbauer
30caf9cae2 Run pyupgrade 2019-11-01 11:16:12 +01:00
Peter Schmidbauer
34f8f858f1 remove py2 remnants and use mocks in tests 2019-10-31 21:16:19 +01:00
Jonathan Wren
ee5d450cbe remove faulty conditional 2019-10-05 16:27:18 -07:00
Jonathan Wren
20916eab54
Merge pull request #550 from silenc3r/master
Handle KeyboardInterrupt when installing journal
2019-09-21 12:36:49 -07:00
Micah Jerome Ellison
be35904912 [GH-632] adding call to action to report issue when upgrade fails 2019-08-24 15:47:13 -07:00
Micah Jerome Ellison
4d0640e613 [GH-632] removing unnecessary whitespace 2019-08-24 15:14:15 -07:00
Micah Jerome Ellison
a4e881942a [GH-632] raising exception in upgrade.py on fail
Handling it in install.py to prevent config from being overwritten when upgrade fails
2019-08-24 15:01:23 -07:00
Dawid Zych
960573c103 Handle KeyboardInterrupt when installing journal 2019-08-07 19:17:02 +02:00
Philip Douglass
3580154f7d User defined indent character (#419)
Make indent character configurable.
2016-04-15 23:00:49 -07:00
Manuel Ebert
dc39a25d5c Support for templates 2015-07-01 22:23:13 -07: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
4955902702 Return config after install
Fixes #297
2015-04-04 18:47:09 +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
359eabd56d Work on cryptography 2014-09-27 13:15:46 -07:00
Manuel Ebert
79f87abd76 Use 'version' in configs 2014-09-12 15:27:48 -07:00
Manuel Ebert
4ea5ae80b5 Upgrade scaffolding 2014-09-12 14:28:03 -07:00
Manuel Ebert
37ebc473c8 Fix config writing for python 3 2014-09-12 14:22:45 -07:00
Manuel Ebert
9c16ad4577 YAML configs
See #184, #230, #197
2014-09-12 14:22:30 -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
Matthias Vogelgesang
562f700615 Try $VISUAL and $EDITOR for config['editor']
On UNIX derivates they expand to the default or preferred editor and avoid
unnecessary first time edits of the config file.
2014-06-24 22:52:04 +02: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
052f571e0b Create path to journal during installation
Fixes #152
2014-04-10 15:57:24 -04:00
Manuel Ebert
ab9a3b5192 Cleaned up imports to work with Python2.6 and Python 3.3 2014-01-23 14:33:14 +01:00
Manuel Ebert
fcd8c4d214 Gets rid of colorama 2014-01-02 23:41:53 +01:00
William Minchin
b49e868f93 Set default linewrap to 79 globally 2013-11-27 12:52:56 -07:00
William Minchin
fd1fc05bd0 Windows: wraps lines at 79 chars by default
trying to wrap lines at 80 char in Windows' CMD results in blank lines
following lines that are exactly 80 char long
2013-11-27 10:25:17 -07:00
Manuel Ebert
37fad66942 ixed a bug that caused creating encrypted journals to fail 2013-11-20 16:55:41 -08:00
Manuel Ebert
7e3faeef45 Disambiguates jrnl.update_config and install.update_config 2013-10-17 16:00:27 -07:00
Manuel Ebert
be2c511ea4 Saves password to keyring
Closes #96 and deprecates password field in config
2013-10-17 14:55:59 -07:00
Aniket Pant
bce370174b Update installation after removal of default folder config
Signed-off-by: Aniket Pant <me@aniketpant.com>
2013-06-26 13:09:22 +05:30
Aniket Pant
a959ed49fd Add default export folder config
Signed-off-by: Aniket Pant <me@aniketpant.com>
2013-06-21 19:20:57 +05:30
Manuel Ebert
9f33c9c9c4 Fixes for Python 3 Support 2013-04-19 15:19:21 +02:00
Manuel Ebert
8200ebb6fe Python 3 compatibility 2013-04-19 14:46:05 +02:00
Manuel Ebert
41706c3cb5 Fixes install routine 2013-04-17 12:02:26 +02:00
Manuel Ebert
fe521147c0 Uses colorama instead of clint 2013-04-17 10:19:02 +02:00
Manuel Ebert
cb6ee5889e Better support for individual configs 2012-07-23 13:09:45 +02:00
Manuel Ebert
c1bfd8b451 Refactored install.py 2012-07-23 13:09:45 +02:00
Manuel Ebert
9439c294da Installation modifies journals.default, not journal 2012-06-11 16:08:38 +02:00
Manuel Ebert
482e579242 Adds support for multiple journals 2012-06-11 15:58:25 +02:00
Manuel Ebert
f7eee0fa76 Adds word wrap support. 2012-05-30 17:43:55 +02:00
Manuel Ebert
19ed9a6cf8 Experimental new directory structure 2012-05-24 13:23:46 +02:00