fz0x1/jrnl
1
0
Fork 0
mirror of https://github.com/jrnl-org/jrnl.git synced 2025-05-10 16:48:31 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1 from micahellison/eigenric/develop

Browse source 
Eigenric/develop
This commit is contained in:
Ricardo Ruiz 2024-05-11 12:46:18 +02:00 • committed by GitHub
commit f17a8571d1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 34 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
jrnl/journals/Journal.py
View file

@ -300,15 +300,15 @@ class Journal:
or ( or (
strict strict
and all( and all(
substring in entry.title.casefold() substring in entry.title.casefold()
or substring in entry.body.casefold() or substring in entry.body.casefold()
for substring in contains_lower for substring in contains_lower
) )
) )
or ( or (
not strict not strict
and any( and any(
substring in entry.title.casefold() substring in entry.title.casefold()
or substring in entry.body.casefold() or substring in entry.body.casefold()
for substring in contains_lower for substring in contains_lower
) )

30
tests/bdd/features/search.feature
View file

@ -86,6 +86,36 @@ Feature: Searching in a journal
| basic_folder.yaml | | basic_folder.yaml |
| basic_dayone.yaml | | basic_dayone.yaml |
Scenario Outline: Multiple -contains returns entries that match any
Given we use the config "<config_file>"
When we run "jrnl -contains emojis -contains lorem --short"
Then we should get no error
And the output should contain "3 entries found"
And the output should be
2020-08-29 11:11 Entry the first.
2020-08-31 14:32 A second entry in what I hope to be a long series.
2020-09-24 09:14 The third entry finally after weeks without writing.
Examples: configs
| config_file |
| basic_onefile.yaml |
| basic_folder.yaml |
| basic_dayone.yaml |
Scenario Outline: Multiple -contains with -and returns only entries that match all
Given we use the config "<config_file>"
When we run "jrnl -contains emojis -contains nulla -and --short"
Then we should get no error
And the output should contain "1 entry found"
And the output should be
2020-09-24 09:14 The third entry finally after weeks without writing.
Examples: configs
| config_file |
| basic_onefile.yaml |
| basic_folder.yaml |
| basic_dayone.yaml |
Scenario Outline: Searching for a string within tag results Scenario Outline: Searching for a string within tag results
Given we use the config "<config_file>" Given we use the config "<config_file>"
When we run "jrnl @tagone -contains maybe" When we run "jrnl @tagone -contains maybe"

2
tests/unit/test_parse_args.py
View file

@ -55,7 +55,7 @@ def test_empty():
def test_contains_alone(): def test_contains_alone():
assert cli_as_dict("-contains whatever") == expected_args(contains="whatever") assert cli_as_dict("-contains whatever") == expected_args(contains=["whatever"])
def test_debug_alone(): def test_debug_alone():