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

More options for preserving links/smileys (regexp, gradient quirk)

Browse source
This commit is contained in:
Dpeta 2022-06-21 21:50:48 +02:00
parent 473810d130
commit 0a6669d555
4 changed files with 100 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

90
dataobjs.py
View file

@ -14,18 +14,20 @@ from parsetools import (timeDifference,
convertTags,
lexMessage,
parseRegexpFunctions,
smiledict,
smilelist)
smiledict)
from mispeller import mispeller
_urlre = re.compile(r"(?i)(?:^|(?<=\s))(?:(?:https?|ftp)://|magnet:)[^\s]+")
_url2re = re.compile(r"(?i)(?<!//)\bwww\.[^\s]+?\.")
#_url2re = re.compile(r"(?i)(?<!//)\bwww\.[^\s]+?\.")
_groupre = re.compile(r"\\([0-9]+)")
_upperre = re.compile(r"upper\(([\w<>\\]+)\)")
_lowerre = re.compile(r"lower\(([\w<>\\]+)\)")
_scramblere = re.compile(r"scramble\(([\w<>\\]+)\)")
_reversere = re.compile(r"reverse\(([\w<>\\]+)\)")
_ctagre = re.compile("(</?c=?.*?>)", re.I)
_smilere = re.compile("|".join(list(smiledict.keys())))
_memore = re.compile(r"(\s|^)(#[A-Za-z0-9_]+)")
_handlere = re.compile(r"(\s|^)(@[A-Za-z0-9_]+)")
class pesterQuirk(object):
def __init__(self, quirk):
@ -39,24 +41,33 @@ class pesterQuirk(object):
if "group" not in self.quirk:
self.quirk["group"] = "Miscellaneous"
self.group = self.quirk["group"]
def apply(self, string, first=False, last=False):
try:
self.checkstate = self.quirk["checkstate"]
except KeyError:
pass
def apply(self, string, first=False, last=False, checkstate=0):
# This function applies the quirks :3
print("checkstate: " + str(checkstate))
# Try to get a list of links and smilies in the message.
# Try to get a list of breakable links, smilies,
# @handle, #memo, in the message.
try:
# Check for links, store list of links.
links = list()
match = re.findall(_urlre, string)
match2 = re.findall(_url2re, string)
for x in match2:
links.append(x)
for x in match:
links.append(x)
for match in re.findall(_urlre, string):
links.append(match)
# Check for smilies, store list of smilies.
smilies = list()
for x in smilelist:
if x in string:
smilies.append(x)
for match in re.findall(_smilere, string):
smilies.append(match)
# Check for @handles, store list of @handles.
handles = list()
for match in re.findall(_handlere, string):
smilies.append(match)
# Check for #memos, store list of #memos.
memos = list()
for match in re.findall(_memore, string):
smilies.append(match)
except Exception as e:
PchumLog.warning("Quirk issue: " + str(e))
@ -76,6 +87,12 @@ class pesterQuirk(object):
# Try to revert smilies based on list.
for smiley in smilies:
output = output.replace(smiley.replace(self.quirk["from"], self.quirk["to"]), smiley)
# Try to revert @handles based on list.
for handle in handles:
output = output.replace(handle.replace(self.quirk["from"], self.quirk["to"]), handle)
# Try to revert #memos based on list.
for memo in memos:
output = output.replace(memo.replace(self.quirk["from"], self.quirk["to"]), memo)
return output
except Exception as e:
PchumLog.warning("Replace issue: " + str(e))
@ -88,11 +105,21 @@ class pesterQuirk(object):
return string
to = self.quirk["to"]
pt = parseRegexpFunctions(to)
return re.sub(fr, pt.expand, string)
output = re.sub(fr, pt.expand, string)
# Reverse sub for links/smilies if enabled.
if checkstate == 2:
for smiley in smilies:
output = output.replace(re.sub(fr, pt.expand, smiley), smiley)
for link in links:
output = output.replace(re.sub(fr, pt.expand, link), link)
for handle in handles:
output = output.replace(re.sub(fr, pt.expand, handle), handle)
for memo in memos:
output = output.replace(re.sub(fr, pt.expand, memo), memo)
return output
elif self.type == "random":
if len(self.quirk["randomlist"]) == 0:
return string
fr = self.quirk["from"]
if not first and len(fr) > 0 and fr[0] == "^":
return string
if not last and len(fr) > 0 and fr[len(fr)-1] == "$":
@ -101,7 +128,7 @@ class pesterQuirk(object):
choice = random.choice(self.quirk["randomlist"])
pt = parseRegexpFunctions(choice)
return pt.expand(mo)
return re.sub(self.quirk["from"], randomrep, string)
return self.quirk["from"]
elif self.type == "spelling":
percentage = self.quirk["percentage"]/100.0
words = string.split(" ")
@ -110,20 +137,16 @@ class pesterQuirk(object):
# Main /word loop
for w in words:
# Check if word contains smiley
smiling = False
for smiley in smilies:
if smiley in w:
# Smiley is in word
smiling = True
if re.match(_url2re, w):
if re.match(_urlre, w):
# Word is an url, don't break.
newl.append(w)
elif re.match(_urlre, w):
# Word is an url, don't break.
elif re.match(_memore, w):
# Word is an @memo, don't break.
newl.append(w)
elif smiling:
elif re.match(_handlere, w):
# Word is an @handle, don't break.
newl.append(w)
elif re.match(_smilere, w):
# Word contains a smiley
# Split by ':' and only skip the smiley,
# this part is very messy and optional really.
@ -196,7 +219,7 @@ class pesterQuirks(object):
self.quirklist.append(q)
def apply(self, lexed, first=False, last=False):
prefix = [q for q in self.quirklist if q.type=='prefix']
#suffix = [q for q in self.quirklist if q.type=='suffix'] # <-- Seems unused
suffix = [q for q in self.quirklist if q.type=='suffix']
newlist = []
for (i, o) in enumerate(lexed):
@ -211,9 +234,16 @@ class pesterQuirks(object):
lastStr = (i == len(lexed)-1)
string = o
for q in self.quirklist:
try:
checkstate = int(q.checkstate)
except Exception:
checkstate = 0
if q.type != 'prefix' and q.type != 'suffix':
if q.type == 'regexp' or q.type == 'random':
string = q.apply(string, first=(i==0), last=lastStr)
string = q.apply(string,
first=(i==0),
last=lastStr,
checkstate=checkstate)
else:
string = q.apply(string)
elif q.type == 'prefix' and i == 0:

23
menus.py
View file

@ -406,6 +406,12 @@ class PesterQuirkTypes(QtWidgets.QDialog):
layout_3.addWidget(QtWidgets.QLabel("Replace With:"))
layout_3.addWidget(QtWidgets.QLineEdit())
layout_regexp.addLayout(layout_3)
layout_3 = QtWidgets.QHBoxLayout()
excludeCheckbox = QtWidgets.QCheckBox("Fix links and smilies")
excludeCheckbox.setToolTip("Tries to revert changes to links, smilies, @handles, and #memos."
+ "\nMay behave weirdly with more complex patterns and functions.")
layout_3.addWidget(excludeCheckbox)
layout_regexp.addLayout(layout_3)
layout_all.addLayout(layout_f)
layout_all.addWidget(vr)
layout_all.addLayout(layout_regexp)
@ -444,6 +450,13 @@ class PesterQuirkTypes(QtWidgets.QDialog):
layout_6.addLayout(layout_7)
layout_random.addLayout(layout_6)
#layout_9 = QtWidgets.QHBoxLayout()
#excludeCheckbox = QtWidgets.QCheckBox("Fix links and smilies")
#excludeCheckbox.setToolTip("Tries to revert changes to links, smilies, @handles, and #memos."
# + "\nMay behave weirdly with more complex patterns and functions.")
#layout_9.addWidget(excludeCheckbox)
#layout_random.addLayout(layout_9)
# Misspeller
widget = QtWidgets.QWidget()
self.pages.addWidget(widget)
@ -486,10 +499,18 @@ class PesterQuirkTypes(QtWidgets.QDialog):
elif q["type"] == "regexp":
page.itemAt(2).layout().itemAt(1).layout().itemAt(1).widget().setText(q["from"])
page.itemAt(2).layout().itemAt(2).layout().itemAt(1).widget().setText(q["to"])
try:
page.itemAt(2).layout().itemAt(3).layout().itemAt(0).widget().setCheckState(int(q["checkstate"]))
except KeyError as e:
print("KeyError: %s" % str(e))
elif q["type"] == "random":
self.regexp.setText(q["from"])
for v in q["randomlist"]:
item = QtWidgets.QListWidgetItem(v, self.replacelist)
#try:
# page.itemAt(2).layout().itemAt(2).layout().itemAt(0).widget().setCheckState(int(q["checkstate"]))
#except KeyError as e:
# print("KeyError: %s" % str(e))
elif q["type"] == "spelling":
self.slider.setValue(q["percentage"])
@ -675,8 +696,10 @@ class PesterChooseQuirks(QtWidgets.QDialog):
elif vdict["type"] == "regexp":
vdict["from"] = str(page.itemAt(2).layout().itemAt(1).layout().itemAt(1).widget().text())
vdict["to"] = str(page.itemAt(2).layout().itemAt(2).layout().itemAt(1).widget().text())
vdict["checkstate"] = str(page.itemAt(2).layout().itemAt(3).layout().itemAt(0).widget().checkState())
elif vdict["type"] == "random":
vdict["from"] = str(self.quirkadd.regexp.text())
#vdict["checkstate"] = str(page.itemAt(2).layout().itemAt(2).layout().itemAt(0).widget().checkState())
randomlist = [str(self.quirkadd.replacelist.item(i).text())
for i in range(0,self.quirkadd.replacelist.count())]
vdict["randomlist"] = randomlist

8
parsetools.py
View file

@ -29,7 +29,7 @@ _gtag_begin = re.compile(r'(?i)<g[a-f]>')
_ctag_end = re.compile(r'(?i)</c>')
_ctag_rgb = re.compile(r'\d+,\d+,\d+')
_urlre = re.compile(r"(?i)(?:^|(?<=\s))(?:(?:https?|ftp)://|magnet:)[^\s]+")
_url2re = re.compile(r"(?i)(?<!//)\bwww\.[^\s]+?\.")
#_url2re = re.compile(r"(?i)(?<!//)\bwww\.[^\s]+?\.")
_memore = re.compile(r"(\s|^)(#[A-Za-z0-9_]+)")
_handlere = re.compile(r"(\s|^)(@[A-Za-z0-9_]+)")
_imgre = re.compile(r"""(?i)<img src=['"](\S+)['"]\s*/>""")
@ -160,6 +160,8 @@ class hyperlink(lexercon.Chunk):
return self.string
class hyperlink_lazy(hyperlink):
"""Depreciated since it doesn't seem to turn the full url into a link,
probably not required anyway, best to require a protocol prefix."""
def __init__(self, string):
self.string = "http://" + string
@ -251,7 +253,7 @@ def lexMessage(string):
# When I change out parsers, I might add it back in.
##(formatBegin, _format_begin), (formatEnd, _format_end),
(imagelink, _imgre),
(hyperlink, _urlre), (hyperlink_lazy, _url2re),
(hyperlink, _urlre),
(memolex, _memore),
(chumhandlelex, _handlere),
(smiley, _smilere),
@ -1002,8 +1004,6 @@ smiledict = {
":honk:": "honk.png",
}
smilelist = list(smiledict.keys())
reverse_smiley = dict((v,k) for k, v in smiledict.items())
_smilere = re.compile("|".join(list(smiledict.keys())))

16
quirks/gradient.py
View file

@ -2,7 +2,8 @@ import re
def rainbow(text):
"""Example implementation of a gradient function,
distributes colors over text, accounting for links and smilies.
distributes colors over text, accounting for links,
#memos, @handles, smilies.
Add it as:
Regexp Replace
@ -49,12 +50,17 @@ def rainbow(text):
if ((cp[1] >= match.start()) # cp[1] is pos
and (cp[1] <= match.end())):
cp[1] = match.end() + 1 # Move to 1 character after link.
for match in re.finditer(_url2re, text):
for match in re.finditer(_smilere, text):
for cp in color_and_position:
if ((cp[1] >= match.start())
and (cp[1] <= match.end())):
cp[1] = match.end() + 1
for match in re.finditer(_smilere, text):
for match in re.finditer(_memore, text):
for cp in color_and_position:
if ((cp[1] >= match.start())
and (cp[1] <= match.end())):
cp[1] = match.end() + 1
for match in re.finditer(_handlere, text):
for cp in color_and_position:
if ((cp[1] >= match.start())
and (cp[1] <= match.end())):
@ -150,4 +156,6 @@ smiledict = {
# Regular expression templates for detecting links/smilies.
_smilere = re.compile("|".join(list(smiledict.keys())))
_urlre = re.compile(r"(?i)(?:^|(?<=\s))(?:(?:https?|ftp)://|magnet:)[^\s]+")
_url2re = re.compile(r"(?i)(?<!//)\bwww\.[^\s]+?\.")
#_url2re = re.compile(r"(?i)(?<!//)\bwww\.[^\s]+?\.")
_memore = re.compile(r"(\s|^)(#[A-Za-z0-9_]+)")
_handlere = re.compile(r"(\s|^)(@[A-Za-z0-9_]+)")