GitHub/Anki
1
0
Fork 0
mirror of https://github.com/ankitects/anki.git synced 2025-09-20 06:52:21 -04:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions

strip implicit webkit html on drop or paste

Browse source
This commit is contained in:
Damien Elmes 2012-03-24 23:17:05 +09:00
parent 487550ecb0
commit 092eba2691
1 changed files with 28 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
aqt/editor.py
View file

@ -13,6 +13,7 @@ from aqt.utils import shortcut, showInfo, showWarning, getBase, getFile, \
openHelp openHelp
import aqt import aqt
import anki.js import anki.js
from BeautifulSoup import BeautifulSoup
# fixme: when tab order returns to the webview, the previously focused field # fixme: when tab order returns to the webview, the previously focused field
# is focused, which is not good when the user is tabbing through the dialog # is focused, which is not good when the user is tabbing through the dialog
@ -414,9 +415,6 @@ class Editor(object):
def mungeHTML(self, txt): def mungeHTML(self, txt):
if txt == "<br>": if txt == "<br>":
txt = "" txt = ""
fa = re.findall('(<font class="Apple-style-span" size="\d+"><span class="Apple-style-span" style="font-size: \d+px;">(.*)</span></font>)', txt)
if fa:
txt = txt.replace(fa[0][0], fa[0][1])
return txt return txt
# Setting/unsetting the current note # Setting/unsetting the current note
@ -885,8 +883,7 @@ class EditorWebView(AnkiWebView):
if evt.source(): if evt.source():
assert oldmime.hasHtml() assert oldmime.hasHtml()
mime = QMimeData() mime = QMimeData()
# fix img src links mime.setHtml(self._filteredHTML(oldmime.html()))
mime.setHtml(self._relativeFiles(oldmime.html()))
else: else:
mime = self._processMime(oldmime) mime = self._processMime(oldmime)
# create a new event with the new mime data # create a new event with the new mime data
@ -902,7 +899,7 @@ class EditorWebView(AnkiWebView):
if keep: if keep:
new = QMimeData() new = QMimeData()
if mime.hasHtml(): if mime.hasHtml():
new.setHtml(mime.html()) new.setHtml(self._filteredHTML(mime.html()))
else: else:
new.setText(mime.text()) new.setText(mime.text())
mime = new mime = new
@ -950,7 +947,14 @@ class EditorWebView(AnkiWebView):
def _processUrls(self, mime): def _processUrls(self, mime):
url = mime.urls()[0].toString() url = mime.urls()[0].toString()
link = self._retrieveURL(url) link = None
for suffix in pics+audio:
if url.lower().endswith(suffix):
link = self._retrieveURL(url)
break
if not link:
# not a supported media type; include link verbatim
link = url
mime = QMimeData() mime = QMimeData()
mime.setHtml(link) mime.setHtml(link)
return mime return mime
@ -974,6 +978,8 @@ class EditorWebView(AnkiWebView):
html = mime.html() html = mime.html()
if self.strip: if self.strip:
html = stripHTML(html) html = stripHTML(html)
else:
html = self._filteredHTML(html)
mime = QMimeData() mime = QMimeData()
mime.setHtml(html) mime.setHtml(html)
return mime return mime
@ -1009,9 +1015,18 @@ class EditorWebView(AnkiWebView):
file.close() file.close()
return self.editor._addMedia(path) return self.editor._addMedia(path)
def _relativeFiles(self, html): def _filteredHTML(self, html):
# when an image is dragged, the relative img src= links end up as a doc = BeautifulSoup(html)
# full local path. we want to strip that back to a relative path # filter out implicit formatting from webkit
def repl(match): for tag in doc("span", "Apple-style-span"):
return '<img src="%s">' % os.path.basename(match.group(2)) tag.replaceWithChildren()
return re.sub(self.editor.mw.col.media.regexps[1], repl, html) # turn file:/// links into relative ones
for tag in doc("img"):
if tag['src'].lower().startswith("file://"):
tag['src'] = os.path.basename(tag['src'])
# strip superfluous elements
for elem in "html", "head", "body", "meta":
for tag in doc(elem):
tag.replaceWithChildren()
html = unicode(doc)
return html