jrnl/jrnl
Ricardo Ruiz 8957ceb74d
Fix -contains to allow multiple terms with "OR" logic unless -and is added (#1890)
* Store multiple -contains arguments (OR default).

Allow multiple occurrences of the -contains argument
to be stored in a list. Previously, only the last occurrence was
considered. Additionally, the behavior has been modified to default to
OR logic, meaning that if multiple -contains arguments are provided,
entries matching any of them will be included in the results.

* Solved issue #1877 "-and" flag with multiple instances of the -contains option.

* Run poe format

* Fix unit test for contains to allow list instead of single value

* Add BDD tests for multiple contains with and without -and

* Black version updated.

* Revert pyproject.toml to appease poetry

---------

Co-authored-by: Micah Jerome Ellison <micah.jerome.ellison@gmail.com>
2024-05-20 21:16:33 -07:00
..
encryption Add more type hints (#1642) 2023-01-14 13:22:31 -08:00
journals Fix -contains to allow multiple terms with "OR" logic unless -and is added (#1890) 2024-05-20 21:16:33 -07:00
messages Replace flake8 and isort with ruff linter and add black --check to linting step (#1763) 2023-07-15 12:35:10 -07:00
plugins Replace flake8 and isort with ruff linter and add black --check to linting step (#1763) 2023-07-15 12:35:10 -07:00
templates Template exporting FTW 2016-08-19 23:20:31 +00:00
__init__.py Update copyright notices for 2023 (#1660) 2023-01-07 13:39:07 -08:00
__main__.py Refactor flow for easier access to some files (avoid things like jrnl.Journal.Journal and jrnl.jrnl co-existing) (#1662) 2023-01-14 14:42:29 -08:00
__version__.py Increment version to v4.1 2023-11-04 19:35:55 +00:00
args.py Fix -contains to allow multiple terms with "OR" logic unless -and is added (#1890) 2024-05-20 21:16:33 -07:00
color.py Refactor flow for easier access to some files (avoid things like jrnl.Journal.Journal and jrnl.jrnl co-existing) (#1662) 2023-01-14 14:42:29 -08:00
commands.py Replace flake8 and isort with ruff linter and add black --check to linting step (#1763) 2023-07-15 12:35:10 -07:00
config.py Update dependency ruff to v0.0.287 (#1778) 2023-09-09 15:44:46 -07:00
controller.py Replace flake8 and isort with ruff linter and add black --check to linting step (#1763) 2023-07-15 12:35:10 -07:00
editor.py Update dependency black to v24 (#1849) 2024-02-01 20:05:39 -08:00
exception.py Allow combinations of --change-time, --delete, and --edit while correctly counting the number of entries affected (#1669) 2023-03-25 12:32:25 -07:00
install.py Replace flake8 and isort with ruff linter and add black --check to linting step (#1763) 2023-07-15 12:35:10 -07:00
keyring.py Add more type hints (#1642) 2023-01-14 13:22:31 -08:00
main.py Refactor flow for easier access to some files (avoid things like jrnl.Journal.Journal and jrnl.jrnl co-existing) (#1662) 2023-01-14 14:42:29 -08:00
os_compat.py Update copyright notices for 2023 (#1660) 2023-01-07 13:39:07 -08:00
output.py Force rich to use color codes when pretty printing (#1821) 2023-10-30 18:25:49 -07:00
override.py Replace flake8 and isort with ruff linter and add black --check to linting step (#1763) 2023-07-15 12:35:10 -07:00
path.py Refactor --template code (#1711) 2023-05-20 16:13:24 -07:00
prompt.py Update copyright notices for 2023 (#1660) 2023-01-07 13:39:07 -08:00
time.py Resolve parsedatetime "flag style" DeprecationWarning (#1818) 2023-10-29 13:27:53 -07:00
upgrade.py Refactor flow for easier access to some files (avoid things like jrnl.Journal.Journal and jrnl.jrnl co-existing) (#1662) 2023-01-14 14:42:29 -08:00