From 29bbbe0416926ea224323c22ee654e639d1e219e Mon Sep 17 00:00:00 2001 From: Damien Elmes Date: Sat, 25 Apr 2009 02:17:00 +0900 Subject: [PATCH] use instead of munging image urls --- ankiqt/ui/utils.py | 16 ---------------- ankiqt/ui/view.py | 13 +++++++++++++ 2 files changed, 13 insertions(+), 16 deletions(-) diff --git a/ankiqt/ui/utils.py b/ankiqt/ui/utils.py index dd258fa6b..91e80837f 100644 --- a/ankiqt/ui/utils.py +++ b/ankiqt/ui/utils.py @@ -185,24 +185,8 @@ def restoreHeader(widget, key): widget.restoreState(ankiqt.mw.config[key]) def mungeQA(deck, txt): - def quote(match): - match = unicode(match.group(1)) - if match.lower().startswith("http"): - src = match - else: - if sys.platform.startswith("win32"): - prefix = u"file:///" - else: - prefix = u"file://" - src = prefix + unicode( - urllib.quote(os.path.join(deck.mediaDir( - create=True), match).encode("utf-8")), "utf-8") - return src - def quoteImg(match): - return 'img src="%s"' % quote(match) txt = renderLatex(deck, txt) txt = stripSounds(txt) - txt = re.sub('img src="(.*?)"', quoteImg, txt) return txt class ProgressWin(object): diff --git a/ankiqt/ui/view.py b/ankiqt/ui/view.py index 497e102d4..ae58ebf53 100644 --- a/ankiqt/ui/view.py +++ b/ankiqt/ui/view.py @@ -106,6 +106,19 @@ class View(object): self.buffer = self.addStyles() + self.buffer # hook for user css runHook("preFlushHook") + if self.main.deck.mediaDir(): + if sys.platform.startswith("win32"): + prefix = u"file:///" + else: + prefix = u"file://" + base = prefix + unicode( + urllib.quote(self.main.deck.mediaDir().encode("utf-8")), + "utf-8") + base = '' % base + else: + base = "" + self.buffer = '''%s%s''' % ( + base, self.buffer) #print self.buffer.encode("utf-8") self.body.setHtml(self.buffer)