X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=data%2Frbot%2Fplugins%2Fyoutube.rb;h=40922b7d39f5ddb3ec3d83cefd5bbadff6e33cf7;hb=16336b4a240a4265d1f2df1e30d7b68d3a924287;hp=f82d99851ead79089faa00aa0b4781510380baf1;hpb=f26ef621fc9ef9dbde57b4a6794338cafdd18ce0;p=user%2Fhenk%2Fcode%2Fruby%2Frbot.git diff --git a/data/rbot/plugins/youtube.rb b/data/rbot/plugins/youtube.rb index f82d9985..40922b7d 100644 --- a/data/rbot/plugins/youtube.rb +++ b/data/rbot/plugins/youtube.rb @@ -10,6 +10,9 @@ class YouTubePlugin < Plugin YOUTUBE_SEARCH = "http://gdata.youtube.com/feeds/api/videos?vq=%{words}&orderby=relevance" + YOUTUBE_VIDEO = "http://gdata.youtube.com/feeds/api/videos/%{id}" + + YOUTUBE_VIDEO_URLS = %r{youtube.com/(?:watch\?v=|v/)(.*?)(&.*)?$} Config.register Config::IntegerValue.new('youtube.hits', :default => 3, @@ -17,13 +20,18 @@ class YouTubePlugin < Plugin Config.register Config::IntegerValue.new('youtube.descs', :default => 3, :desc => "When set to n > 0, the bot will return the description of the first n videos found") + Config.register Config::BooleanValue.new('youtube.formats', + :default => true, + :desc => "Should the bot display alternative URLs (swf, rstp) for YouTube videos?") def youtube_filter(s) loc = Utils.check_location(s, /youtube\.com/) return nil unless loc - if s[:text].include? '
' - video_info = @bot.filter(:"youtube.video", s) - return nil # TODO + if s[:text].include? '
' + vid = @bot.filter(:"youtube.video", s) + return nil unless vid + content = _("Category: %{cat}. Rating: %{rating}. Author: %{author}. Duration: %{duration}. %{views} views, faved %{faves} times. %{desc}") % vid + return vid.merge(:content => content) elsif s[:text].include? '' vids = @bot.filter(:"youtube.search", s)[:videos] if !vids.empty? @@ -32,13 +40,78 @@ class YouTubePlugin < Plugin end # otherwise, just grab the proper div if defined? Hpricot - content = (Hpricot(s[:text])/"#mainContent").to_html.ircify_html + content = (Hpricot(s[:text])/".watch-video-desc").to_html.ircify_html end # suboptimal, but still better than the default HTML info extractor - content ||= /
]*>/.match(s[:text]).post_match.ircify_html + dm = /]*>/.match(s[:text]) + content ||= dm ? dm.post_match.ircify_html : '(no description found)' return {:title => s[:text].ircify_html_title, :content => content} end + def youtube_apivideo_filter(s) + # This filter can be used either + e = s[:rexml] || REXML::Document.new(s[:text]).elements["entry"] + # TODO precomputing mg doesn't work on my REXML, despite what the doc + # says? + # mg = e.elements["media:group"] + # :title => mg["media:title"].text + # fails because "media:title" is not an Integer. Bah + vid = { + :formats => [], + :author => (e.elements["author/name"].text rescue nil), + :title => (e.elements["media:group/media:title"].text rescue nil), + :desc => (e.elements["media:group/media:description"].text rescue nil), + :cat => (e.elements["media:group/media:category"].text rescue nil), + :seconds => (e.elements["media:group/yt:duration/@seconds"].value.to_i rescue nil), + :url => (e.elements["media:group/media:player/@url"].value rescue nil), + :rating => (("%s/%s" % [e.elements["gd:rating/@average"].value, e.elements["gd:rating/@max"].value]) rescue nil), + :views => (e.elements["yt:statistics/@viewCount"].value rescue nil), + :faves => (e.elements["yt:statistics/@favoriteCount"].value rescue nil) + } + if vid[:desc] + vid[:desc].gsub!(/\s+/m, " ") + end + if secs = vid[:seconds] + vid[:duration] = Utils.secs_to_short(secs) + else + vid[:duration] = _("unknown duration") + end + e.elements.each("media:group/media:content") { |c| + if url = (c.elements["@url"].value rescue nil) + type = c.elements["@type"].value rescue nil + medium = c.elements["@medium"].value rescue nil + expression = c.elements["@expression"].value rescue nil + seconds = c.elements["@duration"].value.to_i rescue nil + fmt = case num_fmt = (c.elements["@yt:format"].value rescue nil) + when "1" + "h263+amr" + when "5" + "swf" + when "6" + "mp4+aac" + when nil + nil + else + num_fmt + end + vid[:formats] << { + :url => url, :type => type, + :medium => medium, :expression => expression, + :seconds => seconds, + :numeric_format => num_fmt, + :format => fmt + }.delete_if { |k, v| v.nil? } + if seconds + vid[:formats].last[:duration] = Utils.secs_to_short(seconds) + else + vid[:formats].last[:duration] = _("unknown duration") + end + end + } + debug vid + return vid + end + def youtube_apisearch_filter(s) vids = [] title = nil @@ -46,39 +119,7 @@ class YouTubePlugin < Plugin doc = REXML::Document.new(s[:text]) title = doc.elements["feed/title"].text doc.elements.each("*/entry") { |e| - # TODO precomputing mg doesn't work on my REXML, despite what the doc - # says - # mg = e.elements["media:group"] - # :title => mg["media:title"].text - # fails because "media:title" is not an Integer. Bah - vid = { - :author => (e.elements["author/name"].text rescue nil), - :title => (e.elements["media:group/media:title"].text rescue nil), - :desc => (e.elements["media:group/media:description"].text rescue nil), - :cat => (e.elements["media:group/media:category"].text rescue nil), - :seconds => (e.elements["media:group/yt:duration/@seconds"].value.to_i rescue nil), - :url => (e.elements["media:group/media:player/@url"].value rescue nil), - :rating => (("%s/%s" % [e.elements["media:group/gd:rating/@average"].value, e.elements["media:group/gd:rating/@max"].value]) rescue nil), - :views => (e.elements["media:group/yt:statistics/@viewCount"].value rescue nil), - :faves => (e.elements["media:group/yt:statistics/@favoriteCount"].value rescue nil) - } - if vid[:desc] - vid[:desc].gsub!(/\s+/m, " ") - end - if secs = vid[:seconds] - mins, secs = secs.divmod 60 - hours, mins = mins.divmod 60 - if hours > 0 - vid[:duration] = "%s:%s:%s" % [hours, mins, secs] - elsif mins > 0 - vid[:duration] = "%s'%s\"" % [mins, secs] - else - vid[:duration] = "%ss" % [secs] - end - else - vid[:duration] = _("unknown duration") - end - vids << vid + vids << @bot.filter(:"youtube.apivideo", :rexml => e) } debug vids rescue => e @@ -94,19 +135,66 @@ class YouTubePlugin < Plugin return [] end + # Filter a YouTube video URL def youtube_video_filter(s) - # TODO + id = s[:youtube_video_id] + if not id + url = s.key?(:headers) ? s[:headers]['x-rbot-location'].first : s[:url] + debug url + id = YOUTUBE_VIDEO_URLS.match(url).captures.first rescue nil + end + return nil unless id + + debug id + + url = YOUTUBE_VIDEO % {:id => id} + resp, xml = @bot.httputil.get_response(url) + unless Net::HTTPSuccess === resp + debug("error looking for movie %{id} on youtube: %{e}" % {:id => id, :e => xml}) + return nil + end + debug xml + begin + return @bot.filter(:"youtube.apivideo", DataStream.new(xml, s)) + rescue => e + debug e + return nil + end end def initialize super @bot.register_filter(:youtube, :htmlinfo) { |s| youtube_filter(s) } @bot.register_filter(:apisearch, :youtube) { |s| youtube_apisearch_filter(s) } + @bot.register_filter(:apivideo, :youtube) { |s| youtube_apivideo_filter(s) } @bot.register_filter(:search, :youtube) { |s| youtube_search_filter(s) } @bot.register_filter(:video, :youtube) { |s| youtube_video_filter(s) } end - def youtube(m, params) + def info(m, params) + movie = params[:movie] + id = nil + if movie =~ /^[A-Za-z0-9]+$/ + id = movie.dup + end + + vid = @bot.filter(:"youtube.video", :url => movie, :youtube_video_id => id) + if vid + str = _("%{bold}%{title}%{bold} [%{cat}] %{rating} @ %{url} by %{author} (%{duration}). %{views} views, faved %{faves} times. %{desc}") % + {:bold => Bold}.merge(vid) + if @bot.config['youtube.formats'] and not vid[:formats].empty? + str << _("\n -- also available at: ") + str << vid[:formats].inject([]) { |list, fmt| + list << ("%{url} %{type} %{format} (%{duration} %{expression} %{medium})" % fmt) + }.join(', ') + end + m.reply str + else + m.reply(_("couldn't retrieve video info") % {:id => id}) + end + end + + def search(m, params) what = params[:words].to_s searchfor = CGI.escape what url = YOUTUBE_SEARCH % {:words => searchfor} @@ -145,4 +233,5 @@ end plugin = YouTubePlugin.new -plugin.map "youtube *words", :action => 'youtube', :threaded => true +plugin.map "youtube info :movie", :action => 'info', :threaded => true +plugin.map "youtube [search] *words", :action => 'search', :threaded => true