getvideo 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a05caec5a828055c6ed17d483e8323240803f4f5
-  data.tar.gz: 883ed8d880add6c2247534fd8a9e6db91a368c59
+  metadata.gz: 966b2b18dc31ed75dc68aa6be526dd4a007ccba9
+  data.tar.gz: 5d7a0212afab5c185fc3785009efa84cceca5ecf
 SHA512:
-  metadata.gz: 23eba5aff34a41371bb27c58bd619ba5c1709f4f1936ca36d868b02b82d3074d31d7d47bea6c0fccb31c095908bfcc1f6f5d8753d3662ae15000b83239792de1
-  data.tar.gz: d139dbbc2ebfe31e629fdbf10a4d30547734b2f1591d8a115941876326cd8f23e5a01625cdc5951eefd23b3cdf639e0874c825e0a608166e580c85e6de34c710
+  metadata.gz: cec3ea5db8dd89ad25834ec2288513f460d10ca327b884be0fdc8d9726e42d6f9f39d45f7b77d82d34849146a72e0f98fd98d09eae1e3b969d2be15a31dd493b
+  data.tar.gz: 8661946a3c84fe918f9643b2e84ef79042030ec7fc1df9024f247dbf6bb6f27c7e61418d44489ffda6ceb6f5311d74de50ebee2eb5e5d641ff06f99412538b96

data/README.md

@@ -34,15 +34,16 @@ check faraday, multi_json, nokogiri gems installed
 	require 'getvideo'
 	
 	video = Getvideo.parse "http://videourl.com/info"
-	video.cover 
-	video.id
-	video.html_url
-	video.title
-	video.media #get all video url like {"mp4" => "http://mp4 play url", "hlv" => "http://hlv"}
-	video.flash
-	video.play_media  # get mp4 video
-	video.json
-````
+	video.cover # 视频网站提供的截图或封面
+	video.id #视频的ID，用来在视频网站查询视频
+	video.html_url #视频的源url
+	video.title #视频的标题
+	video.media #获取视频内容 {"mp4" => "http://mp4 play url", "hlv" => "http://hlv"}
+	video.flash #视频flash格式
+	video.play_media  #已获取视频内容，选取一条作为播放内容
+	video.json #以json格式显示
+```
+
 ## Contributing
 
 1. Fork it
@@ -53,4 +54,4 @@ check faraday, multi_json, nokogiri gems installed
 
 ## Thanks
 
-get more video you can access [you-get](https://github.com/soimort/you-get)
+get more video you can access [you-get](https://github.com/soimort/you-get)

data/lib/getvideo.rb

@@ -32,8 +32,10 @@ module Getvideo
       Ku6.new(url)
     elsif url =~ /youtube/
       Youtube.new(url)
-    else url =~ /(iask|sina)/
+    elsif url =~ /(iask|sina)/
       Sina.new(url)
+    else
+      return false
     end
   end
 end

data/lib/getvideo/sina.rb

@@ -1,180 +1,94 @@
 #coding:utf-8
+require 'digest/md5'
 
 module Getvideo
   class Sina < Video
-    set_api_uri { "http://v.iask.com/v_play.php?vid=#{id}" }
+    set_api_uri do
+      rand = "0.#{rand(10000..10000000)}#{rand(10000..10000000)}"
+      "http://v.iask.com/v_play.php?vid=#{id}&ran=#{rand}&p=i&k=#{get_k(id, rand)}" 
+    end
+
+    def ipad_response
+      @ipad_response ||= ipad_connection
+    end
 
     def initialize(url)
-      @url = url
-      set_id
+      super
+      parse_page if !(is_flash_url? || is_subject_url?)
     end
 
-    def ipad_response
-      @ipad_response ||= ipad_connect
+    def id
+      return url.match(/vid=(\d+)/).to_a[1] if is_flash_url?
+      return url.match(/#(\d+)/).to_a[1] if is_subject_url?
+      page.match(/vid[\s]*:[\s]*["|']?[\s]*(\d+)[\s]*["|']?/).to_a[1]
     end
 
-    def info_response
-      @info_response ||= Nokogiri::HTML(parse_html).css("head script").text.gsub(" ", "")
+    def cover
+      return "" if is_flash_url? || is_subject_url?
+      page.match(/pic[\s]*:[\s]*["|']?[\s]*([^'|"]+)?/).to_a[1]
     end
 
     def html_url
-      if has_html?
-        if url =~ /\.html$/
-          url
-        else
-          "http://video.sina.com.cn/v/b/#{@id}-#{@uid}.html"
-        end
-      else
-        ""
-      end
+      return "" if is_flash_url?
+      url
     end
 
     def title
-      if has_html?
-        info_response.scan(/title:'([^']+)'/)[0][0]
-      else
-        response["vname"]
-      end
-    end
-
-    def cover
-      if has_html?
-        pic = info_response.scan(/pic:'([^']+)'/)
-        pic.empty? ? "" : pic[0][0]
-      else
-        ""
-      end
+      response["video"]["vname"]
     end
 
     def flash
-      if url =~ /\.swf/
-        url
-      else
-        flash_url = info_response.scan(/swfOutsideUrl:'([^']+)'/)
-        unless flash_url.empty?
-          flash_url[0][0]
-        else
-          ""
-        end
-      end
+      return url if is_flash_url?
+      return "" if is_subject_url?
+      return "" if !page
+      page.match(/swfOutsideUrl[\s]*:[\s]*["|']?[\s]*([^'|"]+)/).to_a[1]
     end
 
     def m3u8
-      if has_html?
-        if !ipad_response.nil? 
-          media["mp4"][0]
-        end
+      if !(is_flash_url? || is_subject_url?)
+        ipad_response["video"]["durl"]["url"]
       else
         ""
       end
     end
 
-    def id
-      @id
-    end
-
     def media
-      vedio_list = {}
-      vedio_list["hlv"] = []
-      vedio_list["mp4"] = []
-      if res = response
-        if res["video"]["result"] != "error"
-          vedio_list["hlv"] << res["video"]["durl"]["url"]
-        end
+      video_list = {}
+      if !(is_flash_url? || is_subject_url?)
+        video_list["mp4"] = []
+        video_list["mp4"] << ipad_response["video"]["durl"]["url"]
       end
-
-      if m_res = ipad_response
-        if m_res["video"]["result"] != "error"
-          vedio_list["mp4"] << m_res["vdieo"]["durl"]["url"]
-        end
-      end
-
-      return vedio_list
+      video_list["hlv"] = []
+      video_list["hlv"] << response["video"]["durl"]["url"]
+      return video_list
     end
 
     private
 
-    def has_html?
-      @uid =~ /[\d]{3,}?/ || (url =~ /\.html/)
-    end
-
-    def set_id
-      if url =~ /\/v\/b\/([^\D]+)-([^\D]+)\.html/
-        ids =  url.scan(/\/v\/b\/([^\D]+)-([^\D]+)\.html/)[0]
-        @id = ids[0]
-        @uid = ids[1]
-      elsif url =~ /\/playlist\/([^\D]+).*.#([^\D]+)/
-        ids = url.scan(/\/playlist\/[^\D]+-([^\D]+).*#([^\D]+)/)[0]
-        @id = ids[1]
-        @uid = ids[0]
-      elsif url =~ /\.swf/
-        ids = url.scan(/vid=([^\D]+)_([^\D]+)_.+\.swf/)[0]
-        @id = ids[0]
-        @uid = ids[1]
-      elsif url =~ /(\/[\S]?\/)/
-        if url.index("#").nil?
-          html = parse_html
-          ids = html.scan(/vid[\s]?:[\s]?['|"]([^\D]+)['|"]/)[0]
-          uids = html.scan(/uid[\s]?:[\s]?['|"]([^\D]+)['|"]/)[0]
-          @id = ids[0]
-          @uid = uids[0]
-        else
-          ids = url.scan(/(\/[\S]?\/).+#([^\D]+)/)[0]
-            @id = ids[1]
-        end
-      else
-        ids = url.split("|")
-        @id = ids[0]
-        @uid = ids[1]
-      end
+    def ipad_connection
+      rand = "0.#{rand(10000..10000000)}#{rand(10000..10000000)}"
+      Response.new(Faraday.get("http://v.iask.com/v_play.php?vid=#{ipad_vid}&ran=#{rand}&p=i&k=#{get_k(ipad_vid, rand)}")).parsed
     end
 
-    def ipad_id
-      ipad_ids = info_response.scan(/videoData:{ipad_vid:[']?([^\D]+)[']?/)
-      ipad_ids.empty? ? nil : ipad_ids[0][0]
+    def get_k(vid, rand)
+      t = Time.now.to_i.to_s(2)[0..-7].to_i(2)
+      Digest::MD5.hexdigest("#{vid.to_s}Z6prk18aWxP278cVAH#{t.to_s}#{rand.to_s}".encode('utf-8'))[0..15] + t.to_s
     end
 
-    def ipad_connect
-      conn = Faraday.new
-      response = conn.get "http://v.iask.com/v_play.php?vid=#{ipad_id}"
-      Response.new(response).parsed
+    def is_flash_url?
+      url =~ /\.swf/ 
     end
 
-    def html_info_path
-      if url =~ /\.html/
-        if url.index("#")
-          if url =~ /play_list/
-            html_url
-          else
-            url
-          end
-        else
-          url
-        end
-      elsif url =~ /\.swf/
-        html_url
-      else
-        html_url
-      end
+    def is_subject_url?
+      url =~ /#\d+/
     end
 
-    def parse_html
-      if !html_info_path.empty?
-        conn = Faraday.new
-        conn.get(html_info_path).body
-      end
+    def parse_page
+      page_res = Faraday.get(url)
+      @page = page_res.body
+      @ipad_vid = page.match(/ipad_vid[\s]*:[\s]*["|']?[\s]*(\d+)[\s]*["|']?/).to_a[1]
     end
 
-    def get_media(type=nil)
-      if type == "mp4"
-        if ipad_id
-          uri = "http://v.iask.com/v_play.php?vid=#{ipad_id}"
-        end
-      else
-        uri = "http://v.iask.com/v_play.php?vid=#{id}"
-      end
-      conn = Faraday.new
-      return conn.get(uri).body
-    end
+    attr_accessor :page, :ipad_vid
   end
 end

data/lib/getvideo/tudou.rb

@@ -45,7 +45,11 @@ module Getvideo
 
     def cover
       if url_type == "albumplay" || url_type == "oplay"
-        response["data"][0]["logo"]
+        if data = response["data"]
+          data[0]["logo"]
+        else
+          page_get_pic
+        end
       else
         page_get_pic
       end
@@ -253,11 +257,13 @@ module Getvideo
 
     def albumplay_media(type = nil)
       video_list = {}
-      response["data"][0]["streamfileids"].each_key do |type|
-        stream = parse_stream(type)
-        video_list[type] = []
-        segs(type).each do |s|
-          video_list[type] << "http://f.youku.com/player/getFlvPath/sid/" + sid + "/st/#{type}/fileid/#{stream[0..8]+s["no"].to_i.to_s(16)+stream[10..-1]}_0#{s["no"].to_i.to_s(16)}?K="+s["k"] if s["k"] != -1
+      if data = response["data"]
+        data[0]["streamfileids"].each_key do |type|
+          stream = parse_stream(type)
+          video_list[type] = []
+          segs(type).each do |s|
+            video_list[type] << "http://f.youku.com/player/getFlvPath/sid/" + sid + "/st/#{type}/fileid/#{stream[0..8]+s["no"].to_i.to_s(16)+stream[10..-1]}_0#{s["no"].to_i.to_s(16)}?K="+s["k"] if s["k"] != -1
+          end
         end
       end
       return video_list
@@ -272,7 +278,9 @@ module Getvideo
     end
 
     def videoid
-      response["data"][0]["videoid"]
+      if data = response["data"]
+        data[0]["videoid"]
+      end
     end
 
     def parse_stream(type)

data/lib/getvideo/version.rb

@@ -1,3 +1,3 @@
 module Getvideo
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/lib/getvideo/youku.rb

@@ -17,11 +17,15 @@ module Getvideo
     end
 
     def title
-      response["data"][0]["title"]
+      if data = response["data"]
+        data[0]["title"]
+      end
     end
 
     def cover
-      response["data"][0]["logo"]
+      if data = response["data"]
+        data[0]["logo"]
+      end
     end
 
     def flash
@@ -34,11 +38,13 @@ module Getvideo
 
     def media(type = nil)
       video_list = {}
-      response["data"][0]["streamfileids"].each_key do |type|
-        stream = parse_stream(type)
-        video_list[type] = []
-        segs(type).each do |s|
-          video_list[type] << "http://f.youku.com/player/getFlvPath/sid/" + sid + "/st/#{type}/fileid/#{stream[0..8]+s["no"].to_i.to_s(16)+stream[10..-1]}_0#{s["no"].to_i.to_s(16)}?K="+s["k"] if s["k"] != -1
+      if data = response["data"]
+        data[0]["streamfileids"].each_key do |type|
+          stream = parse_stream(type)
+          video_list[type] = []
+          segs(type).each do |s|
+            video_list[type] << "http://f.youku.com/player/getFlvPath/sid/" + sid + "/st/#{type}/fileid/#{stream[0..8]+s["no"].to_i.to_s(16)+stream[10..-1]}_0#{s["no"].to_i.to_s(16)}?K="+s["k"] if s["k"] != -1
+          end
         end
       end
       return video_list
@@ -55,7 +61,9 @@ module Getvideo
     end
 
     def videoid
-      response["data"][0]["videoid"]
+      if data = response["data"]
+        data[0]["videoid"]
+      end
     end
 
     def parse_stream(type)
@@ -76,6 +84,7 @@ module Getvideo
       stream_fileids.split("*").each do |s|
         real_text = real_text + text.to_s[s.to_i]
       end
+
       return real_text 
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: getvideo
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - ye.li
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-27 00:00:00.000000000 Z
+date: 2014-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday