Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2024-10-04 18:38:39 +02:00
Code Issues Projects Releases Wiki Activity

ShrinkUrl: Use tinyurl's api-create page to avoid screen-scraping.

Browse Source 
Set snarfThrottle to 0 while testing since we know there's nothing other than
the test input that could be causing us to snarf.  Fixes some intermittent
test failures due to fast snarf responses.

Signed-off-by: James Vega <jamessan@users.sourceforge.net>
This commit is contained in:
James Vega 2009-11-04 22:37:53 -05:00
parent eda8ce3aa0
commit a453f56284
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
plugins/ShrinkUrl/plugin.py
View File

@ -166,18 +166,15 @@ class ShrinkUrl(callbacks.PluginRegexp):
irc.error(str(e)) irc.error(str(e))
ln = thread(wrap(ln, ['url'])) ln = thread(wrap(ln, ['url']))
_tinyRe = re.compile(r'<blockquote><b>(http://tinyurl\.com/\w+)</b>')
def _getTinyUrl(self, url): def _getTinyUrl(self, url):
try: try:
return self.db.get('tiny', url) return self.db.get('tiny', url)
except KeyError: except KeyError:
s = utils.web.getUrl('http://tinyurl.com/create.php?url=' + url) text = utils.web.getUrl('http://tinyurl.com/api-create.php?url=' + url)
m = self._tinyRe.search(s) if text.startswith('Error'):
if m is None: raise ShrinkError, text[5:]
raise ShrinkError, 'Could not parse the TinyURL.com results.' self.db.set('tiny', url, text)
tinyurl = m.group(1) return text
self.db.set('tiny', url, tinyurl)
return tinyurl
def tiny(self, irc, msg, args, url): def tiny(self, irc, msg, args, url):
"""<url> """<url>

2
plugins/ShrinkUrl/test.py
View File

@ -32,7 +32,7 @@ from supybot.test import *
class ShrinkUrlTestCase(ChannelPluginTestCase): class ShrinkUrlTestCase(ChannelPluginTestCase):
plugins = ('ShrinkUrl',) plugins = ('ShrinkUrl',)
config = {'supybot.snarfThrottle': .5} config = {'supybot.snarfThrottle': 0}
sfUrl ='http://sourceforge.net/tracker/?func=add&group_id=58965&atid=48947' sfUrl ='http://sourceforge.net/tracker/?func=add&group_id=58965&atid=48947'
udUrl = 'http://www.urbandictionary.com/define.php?' \ udUrl = 'http://www.urbandictionary.com/define.php?' \