mbk/pesterchum
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Chain iterators and extend when excluding links from quirks

Browse source
This commit is contained in:
Dpeta 2023-02-23 01:25:13 +01:00
parent d3c9b8eedf
commit 8e3f5410b7
No known key found for this signature in database
GPG key ID: 51227517CEA0030C
1 changed files with 14 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
dataobjs.py
View file

@ -1,4 +1,8 @@
import re
import random
import itertools
import logging
from datetime import datetime
PchumLog = logging.getLogger("pchumLogger")
try:
@ -6,9 +10,6 @@ try:
except ImportError:
print("PyQt5 fallback (dataobjs.py)")
from PyQt5 import QtGui
from datetime import datetime
import re
import random
from mood import Mood
from parsetools import (
@ -167,20 +168,17 @@ class pesterQuirks:
if checkstate == 2:
# Check for substring that should be excluded.
excludes = []
# Check for links, store in list.
for match in re.finditer(_urlre, string):
excludes.append(match)
# Check for smilies, store in list.
for match in re.finditer(_smilere, string):
excludes.append(match)
# Check for @handles, store in list.
for match in re.finditer(_handlere, string):
excludes.append(match)
# Check for #memos, store in list.
for match in re.finditer(_memore, string):
excludes.append(match)
# Return matches for links, smilies, handles, memos.
# Chain the iterators and add to excludes list.
matches = itertools.chain(
re.finditer(_urlre, string),
re.finditer(_smilere, string),
re.finditer(_handlere, string),
re.finditer(_memore, string),
)
excludes.extend(matches)
if len(excludes) >= 1:
if excludes:
# SORT !!!
excludes.sort(key=lambda exclude: exclude.start())
# Recursion check.