From 94ea8a8e929c01f18d62d503aaa14cb1ffba1f47 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Sun, 1 Mar 2009 18:31:27 +0100 Subject: misc: remove unexpanded tags. --- nephilim/misc.py | 14 +++++--------- nephilim/plugins/Notify.py | 4 ++-- 2 files changed, 7 insertions(+), 11 deletions(-) (limited to 'nephilim') diff --git a/nephilim/misc.py b/nephilim/misc.py index b1b1de5..ba177df 100644 --- a/nephilim/misc.py +++ b/nephilim/misc.py @@ -1,10 +1,5 @@ from PyQt4 import QtCore, QtGui -from htmlentitydefs import name2codepoint as n2cp -import re -import urllib2, cookielib import socket -import unicodedata - import logging socket.setdefaulttimeout(8) @@ -51,9 +46,10 @@ class Button(QtGui.QPushButton): self.setIcon(icon) def expand_tags(str, expanders): - ret = str - + #ensure that str is QString + str = QtCore.QString(str) for expander in expanders: - ret = expander.expand_tags(ret) + str = expander.expand_tags(str) - return ret + #remove unexpanded tags + return str.replace(QtCore.QRegExp('\\$\\w+'), '') diff --git a/nephilim/plugins/Notify.py b/nephilim/plugins/Notify.py index ccfc393..b784534 100644 --- a/nephilim/plugins/Notify.py +++ b/nephilim/plugins/Notify.py @@ -2,7 +2,7 @@ from PyQt4 import QtGui, QtCore from PyQt4.QtCore import QVariant from traceback import print_exc -from ..misc import sec2min, ORGNAME, APPNAME +from ..misc import sec2min, ORGNAME, APPNAME, expand_tags from ..clPlugin import Plugin from .. import plugins @@ -102,7 +102,7 @@ class Notify(Plugin): if not song: return self.settings.beginGroup(self.name) - self.o.show(song.expand_tags(self.settings.value('songformat').toString()), self.settings.value('timer').toInt()[0], + self.o.show(expand_tags(self.settings.value('songformat').toString(), (song,)), self.settings.value('timer').toInt()[0], NOTIFY_PRIORITY_SONG) self.settings.endGroup() -- cgit v1.2.3