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 #20 from dedan/tag_search

Browse source 
highlight only the tags someone searched for in the tag search #16
This commit is contained in:
Manuel Ebert 2012-05-03 02:30:51 -07:00
commit 46a7bea4b4
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
jrnl.py
View file

@ -197,9 +197,13 @@ class Journal:
sep = "-"*60+"\n" sep = "-"*60+"\n"
pp = sep.join([str(e) for e in self.entries]) pp = sep.join([str(e) for e in self.entries])
if self.config['highlight']: # highlight tags if self.config['highlight']: # highlight tags
pp = re.sub(r"([%s]\w+)" % self.config['tagsymbols'], if hasattr(self, 'search_tags'):
lambda match: self._colorize(match.group(0), 'cyan'), for tag in self.search_tags:
pp) pp = pp.replace(tag, self._colorize(tag))
else:
pp = re.sub(r"([%s]\w+)" % self.config['tagsymbols'],
lambda match: self._colorize(match.group(0), 'cyan'),
pp)
return pp return pp
def to_json(self): def to_json(self):
@ -253,11 +257,11 @@ class Journal:
If strict is True, all tags must be present in an entry. If false, the If strict is True, all tags must be present in an entry. If false, the
entry is kept if any tag is present.""" entry is kept if any tag is present."""
search_tags = set([tag.lower() for tag in tags]) self.search_tags = set([tag.lower() for tag in tags])
end_date = self.parse_date(end_date) end_date = self.parse_date(end_date)
start_date = self.parse_date(start_date) start_date = self.parse_date(start_date)
# If strict mode is on, all tags have to be present in entry # If strict mode is on, all tags have to be present in entry
tagged = search_tags.issubset if strict else search_tags.intersection tagged = self.search_tags.issubset if strict else self.search_tags.intersection
result = [ result = [
entry for entry in self.entries entry for entry in self.entries
if (not tags or tagged(entry.tags)) if (not tags or tagged(entry.tags))