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 #261 from kneufeld/master

Browse source 
using a common tag regex for searching and highlighting
This commit is contained in:
Manuel Ebert 2014-09-02 13:07:33 -07:00
commit 53958cf328
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
jrnl/Entry.py
View file

@ -16,9 +16,15 @@ class Entry:
self.starred = starred self.starred = starred
self.modified = False self.modified = False
@staticmethod
def tag_regex(tagsymbols):
pattern = r'(?u)\s([{tags}][-+*#/\w]+)'.format(tags=tagsymbols)
return re.compile( pattern, re.UNICODE )
def parse_tags(self): def parse_tags(self):
fulltext = " " + " ".join([self.title, self.body]).lower() fulltext = " " + " ".join([self.title, self.body]).lower()
tags = re.findall(r'(?u)\s([{tags}][-+*#/\w]+)'.format(tags=self.journal.config['tagsymbols']), fulltext, re.UNICODE) tagsymbols = self.journal.config['tagsymbols']
tags = re.findall( Entry.tag_regex(tagsymbols), fulltext )
self.tags = tags self.tags = tags
return set(tags) return set(tags)

6
jrnl/Journal.py
View file

@ -165,9 +165,9 @@ class Journal(object):
lambda match: util.colorize(match.group(0)), lambda match: util.colorize(match.group(0)),
pp, re.UNICODE) pp, re.UNICODE)
else: else:
pp = re.sub(r"(?u)([{tags}]\w+)".format(tags=self.config['tagsymbols']), pp = re.sub( Entry.Entry.tag_regex(self.config['tagsymbols']),
lambda match: util.colorize(match.group(0)), lambda match: util.colorize(match.group(0)),
pp) pp)
return pp return pp
def __repr__(self): def __repr__(self):