Commit graph

68 commits

Author SHA1 Message Date
Micah Jerome Ellison
8272a43ba7 Fix crash when no editor configured 2020-12-26 12:57:35 -08:00
Micah Jerome Ellison
9fe56b9e10
Comply with GPL by acknowledging all authors and including license info in each source file (#1121)
* Update authors to "jrnl contributors" to comply with GPL3
* Include jrnl email address with contributors
* Include GPL notice in jrnl --version
* Apply consistent copyright and license to all Python files
* Add copyright and license to documentation
* Add copyright and license to docs theme
* Wiping poetry cache to try to resolve a test issue
* Testing with Python 3.9.0 in attempt to bypass GitHub Actions failure in 3.9.1
* make format
* Exclude Windows Python 3.9 build which is failing due to a GitHub Actions problem
* Modify testing to get around this 3.9 issue...
* Fix exclude
2020-12-19 22:28:22 -08:00
Jonathan Wren
cfdd05358a
Add ability to put --edit partly through a cli entry to move it to the editor (#1091)
also add some functionality to test suite to see what the editor file contents were and make assertions about it
2020-11-21 15:20:21 -08:00
Micah Jerome Ellison
c38c39efee
Update dependencies - pyxdg, pytest, black (#1076)
* Update version pin on pyxdg and run poetry update
* Update pytest pin and rerun poetry update
* Update black pin to latest version, poetry update, and make format
2020-11-14 12:42:34 -08:00
joaquin garmendia
8c2de0e6d7
Add display format option to config file. (#1050)
* Add display format option to config file.
* Add tests.
* Fix `black` error.
* Change nested if to top level.
2020-10-17 18:53:34 -07:00
Jonathan Wren
631e08a557
Clean up help screen, get rid of util.py (#1027)
* More refactoring of cli.py

break up code from cli.py (now in jrnl.py) up into smaller functions
get rid of export mode
move --encrypt and --decrypt to commands.py
clean up the help screen even more
update flag name for import

* reorganize code, move around lots of functions

* clean up import statements

* move run function out of cli and into jrnl

* rename confusingly named function

* move editor function into editor file

* rename parse_args.py to args.py to make room for more args functions

* Fix error in test suite for windows

I accidentally flipped the conditional, so this fixes it.

Co-authored-by: Micah Jerome Ellison <micah.jerome.ellison@gmail.com>

* Update app description on help screen

Co-authored-by: Micah Jerome Ellison <micah.jerome.ellison@gmail.com>
2020-08-22 11:40:39 -07:00
Manuel Ebert
f22ddd706b jrnl.py:cli -> cli.py:run 2013-11-29 10:23:09 -08:00
William Minchin
e176e1145b Change break msg for Windows
for multiline input on Windows, you need Ctrl+Z to exit
2013-11-27 10:07:06 -07:00
Manuel Ebert
e801c62cef Piping data into jrnl and multiline composing 2013-11-24 11:29:45 -08:00
Manuel Ebert
1e9fe2cf1e -short becomes --short 2013-11-04 00:36:10 -08:00
Manuel Ebert
8c31796aa4 Deprecates -date and -star arguments 2013-11-03 20:02:28 -08:00
Manuel Ebert
82336ffe75 Starring entries and looking at the stars 2013-11-03 20:02:18 -08:00
Manuel Ebert
6a81b18544 Attempts to fix common errors in jrnl_config automatically 2013-11-03 14:38:32 -10:00
Manuel Ebert
ab12294777 Only updates config locally on encrypting and decrypting 2013-10-17 16:04:34 -07:00
Manuel Ebert
a96435b6dc Disambiguates jrnl.update_config and install.update_config 2013-10-17 16:00:27 -07:00
Manuel Ebert
34b730a5c9 Saves password to keyring
Closes #96 and deprecates password field in config
2013-10-17 14:55:59 -07:00
Manuel Ebert
de0f3771f3 Fixes #91 2013-09-23 17:24:23 -07:00
Manuel Ebert
4e36d7baf0 Python 2.6 compatibility 2013-08-28 13:48:18 -07:00
Manuel Ebert
2f8d063b5d Failures return exit code 1 2013-08-28 12:29:34 -07:00
Manuel Ebert
c849b03c5c Detectsa DayOne journals that are stored in the Mobile Documents folder 2013-08-28 12:18:39 -07:00
Manuel Ebert
28a5c66193 Soft-deprecates -to and introduces -until 2013-08-14 14:06:39 -07:00
Manuel Ebert
598c0e97ce Prevents journal from printing when composing an entry
This fixes #87
2013-08-14 14:00:32 -07:00
Manuel Ebert
e5ee4e3f97 Filters before exporting 2013-08-06 17:57:21 -07:00
Manuel Ebert
d3edbfd53b Uses stderr for prompts instead stdout 2013-07-22 12:04:01 +02:00
Manuel Ebert
f9bdc13210 Python 3 improvements 2013-07-19 13:24:18 +02:00
Manuel Ebert
13f8e668dc Mock stdin 2013-07-19 12:44:39 +02:00
Manuel Ebert
cb9beac711 Emoji support 2013-07-19 11:46:02 +02:00
Manuel Ebert
b2b842711d Ability to parse in args manually 2013-07-18 22:48:46 +02:00
Manuel Ebert
b0c79d4b3b Simplified exporting logic 2013-07-17 18:19:14 +02:00
Aniket Pant
55fc36a0d2 Improve export functionality
Signed-off-by: Aniket Pant <me@aniketpant.com>
2013-06-26 13:05:13 +05:30
Aniket Pant
a38d9df473 Add new export option
Support for json and md retained
All export types moved to --export except tags

Signed-off-by: Aniket Pant <me@aniketpant.com>
2013-06-21 19:22:02 +05:30
Manuel Ebert
9852f227b7 Better Unicode support
Closes #72
2013-06-09 15:55:03 -07:00
Manuel Ebert
73b09085ee Moves tag export to exporters 2013-06-09 15:07:27 -07:00
Manuel Ebert
90863ecee1 Nicer error message when there is a syntactical error in your config file. 2013-06-09 14:49:02 -07:00
Manuel Ebert
ac7a882142 JSON exports tags
Closes #78. This changes the export format to

{
tags: {tag: count},
entries: [{…}, {…}, …]
}
2013-06-09 14:48:56 -07:00
Manuel Ebert
884881546d Better utf8 support 2013-04-19 17:32:32 +02:00
Manuel Ebert
8842b8589f Updated readme and changelog and changed config path according to discussion 2013-04-19 16:58:19 +02:00
Manuel Ebert
02da463f10 Merge branch 'patch-1' of git://github.com/evaryont/jrnl into evaryont-patch-1 2013-04-19 16:50:27 +02:00
Manuel Ebert
634d84c77e Fixes for Python 3 Support 2013-04-19 15:19:21 +02:00
Manuel Ebert
3052e0cce7 Python 3 compatibility 2013-04-19 14:46:05 +02:00
Manuel Ebert
5b4b1e71d6 Python 2.6 compatibility
Closes #67
2013-04-18 11:51:42 +02:00
Manuel Ebert
c92339e4e2 Merge pull request #61 from alapolloni/master
Update jrnl.py so that a trailing / for a DayOne journal config is seen as a DayOne journal.
2013-04-17 01:32:56 -07:00
Manuel Ebert
dfba03d127 Fixes bug when showing tags when no tags are defined.
Closes #63
2013-04-17 10:27:17 +02:00
Alex Apolloni
06e664d78a allow trailing \ for DayOne journals
https://github.com/maebert/jrnl#dayone-integration
sort of infers that it in the .jrnl_config it should end in a /

but prior to this, if there was a trailing / then jrnl thought it was
looking at a text type journal.
2013-04-15 14:05:04 +02:00
No GUI
b66480ff1d Support a custom location for the config
Export $JRNL_CONFIG to override the location instead of using $HOME. Too many dotfiles are literring it, ya' know?

Linux desktop users, you might like if you follow the XDG standards:

    export JRNL_CONFIG=$XDG_CONFIG_HOME/jrnl/config
2013-04-14 13:19:03 -07:00
Manuel Ebert
61835d88ec Merge pull request #51 from maebert/dayone
Dayone support
2013-03-04 14:57:10 -08:00
Manuel Ebert
e748dbacf3 Cleaner syntax and messages 2013-03-04 14:54:29 -08:00
Stephan Gabler
fb0dbbcf65 remove tags that were used only once.
I sometimes look at the overview of tags with `jrnl --tags` and there
I found it annoying to see all the tags that appeared only once. Those
are now filtered out and I print a comment saying that they were filtered out

Also changed the order (sorted by counts) in which the tags are printed. For
a CLI application I think it is nicer to see the more important version at the end
2013-03-04 14:53:46 -08:00
Manuel Ebert
07bf1da31c Experimental DayOne Support
Just point your jrnl file to a folder ending with `.dayone` and magic.
Supports both reading and creation (and hence all other export magic,
although this is untested).
2012-08-09 18:33:00 +02:00
Manuel Ebert
691c67b13b Removed unnecessary print statement 2012-07-25 17:59:59 +02:00