fz0x1/jrnl
1
0
Fork 0
mirror of https://github.com/jrnl-org/jrnl.git synced 2025-07-07 00:36:13 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into black

Browse source
This commit is contained in:
Jonathan Wren 2019-12-21 12:11:05 -08:00 • committed by GitHub
commit e984a9a015
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 33 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

22
jrnl/Journal.py
View file

@ -231,18 +231,16 @@ class Journal:
result = [
entry
for entry in self.entries
if (
(not tags or tagged(entry.tags))
and (not starred or entry.starred)
and (not start_date or entry.date >= start_date)
and (not end_date or entry.date <= end_date)
and (not exclude or not excluded(entry.tags))
and (
not contains
or (
contains_lower in entry.title.casefold()
or contains_lower in entry.body.casefold()
)
if (not tags or tagged(entry.tags))
and (not starred or entry.starred)
and (not start_date or entry.date >= start_date)
and (not end_date or entry.date <= end_date)
and (not exclude or not excluded(entry.tags))
and (
not contains
or (
contains_lower in entry.title.casefold()
or contains_lower in entry.body.casefold()
)
)
]