cadey
/
h
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Moved youtube search method inside youtube.py

This commit is contained in:
melonhead 2010-03-01 01:08:54 +00:00
parent 08dfdb746d
commit 51e5744d26
2 changed files with 22 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
plugins/youtube.py
View File

@ -5,12 +5,17 @@ import time
import urllib2 import urllib2
from util import hook from util import hook
from urllib import quote_plus
locale.setlocale(locale.LC_ALL, '') locale.setlocale(locale.LC_ALL, '')
youtube_re = re.compile(r'youtube.*?v=([-_a-z0-9]+)', flags=re.I) youtube_re = re.compile(r'youtube.*?v=([-_a-z0-9]+)', flags=re.I)
url = 'http://gdata.youtube.com/feeds/api/videos/%s?v=2&alt=jsonc' url = 'http://gdata.youtube.com/feeds/api/videos/%s?v=2&alt=jsonc'
search_api_url = "http://gdata.youtube.com/feeds/api/videos?q=%s&max-results=1&alt=json"
video_url = "http://youtube.com/watch?v=%s"
def get_video_description(vid): def get_video_description(vid):
print vid print vid
j = json.load(urllib2.urlopen(url % vid)) j = json.load(urllib2.urlopen(url % vid))
@ -54,3 +59,20 @@ def youtube(inp):
m = youtube_re.search(inp) m = youtube_re.search(inp)
if m: if m:
return get_video_description(m.group(1)) return get_video_description(m.group(1))
@hook.command
@hook.command('y')
def youtube(inp):
'.youtube <query> -- returns the first YouTube search result for <query>'
inp = quote_plus(inp)
j = json.load(urllib2.urlopen(search_api_url % (inp)))
if j.get('error'):
return
try:
vid = j['feed']['entry'][0]['id']['$t']
#youtube returns a gdata url for this some reason. The videoid has to be stripped out
vid = vid[vid.rfind('/')+1:]
return get_video_description(vid) + " " + video_url%vid
except:
return

31
plugins/youtubesearch.py
View File

@ -1,31 +0,0 @@
import json
import locale
import re
import time
import urllib2
from urllib import quote_plus
from util import hook
from youtube import get_video_description
locale.setlocale(locale.LC_ALL, '')
url = "http://gdata.youtube.com/feeds/api/videos?q=%s&max-results=1&alt=json"
video_url = "http://youtube.com/watch?v=%s"
@hook.command
@hook.command('y')
def youtube(inp):
'.youtube <query> -- returns the first YouTube search result for <query>'
inp = quote_plus(inp)
j = json.load(urllib2.urlopen(url % (inp)))
if j.get('error'):
return
try:
vid = j['feed']['entry'][0]['id']['$t']
#youtube returns a gdata url for this some reason. The videoid has to be stripped out
vid = vid[vid.rfind('/')+1:]
return get_video_description(vid) + " " + video_url%vid
except:
return