grab_epg 0.2.9 → 0.3.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MWFkOTJjM2E1ZDAxNjViODIxYWE2OTJiODRiZThhMTBmMzRmNDU3MA==
+    MGJjOWQ0MTYxNDVjNjBiNTRkYzZlMTE5ZWU1MzNiZjRiZTIwMmY5Zg==
   data.tar.gz: !binary |-
-    N2Y1ZGJkM2Q5NmIzMDViMmFlMDc1NTQxY2NkY2JlZjAxODQxZTZiMA==
+    YjVlYWZlNDgwOWQzNGMzNDk4YmIwOWMyNmU5NWMzZTY3NTM4ZTgwZA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YTBkZDFjOWUzN2UwYzEwYWQwNDdiZjYxOTA1MjAzYTEzNDA4M2VjODdjMTgw
-    OGJkNDMxMzFjNzdiNWYwOWY0NWYyODI4OWIzZGUzMThlZTQ2ZjVmNmZjY2U2
-    ZmQyODI0MWM4ZjQ5MjQzYTgxMmEzZTdiMzdmN2I4ZmMxNmE5Njc=
+    YzdhNjczNDA2ZDc3MmQwMzEyZjI1OWJhYzI3MTQwYmJjNzJiOGY0NDRhZWMw
+    NGUzZDg2OWM0ODhlYTI5ODc3MjhmN2Y4MWQwMzc4YmQ0OTQzYzVlMjc5ZTkw
+    ZWM5ZmJhM2ViNjZlNzRlYzYyNGExOTc1OTI0MjBkNGQzNDA4ZjU=
   data.tar.gz: !binary |-
-    YWY4ZjA1YWRiZmNjOWNlY2RkYTQ2NzE1Mjk5N2U0OGMxYzU1MzBkMjg3MDdj
-    ZDVhY2ViYzY0OGFkYzhkOGEyZjA0MTM0YTk2MzRhN2RjMTUyZWM0NGY2Yzk1
-    ZDBhYWQ2ZjE5YjUzNGEwOTVhOTE0ZWIzMTNjNTk4MDI3MGEzMGI=
+    YzkzODFkOTlkYjllYjU4NjMwYWY4NDNlMTJjYTBjZjg1NDZjYmEzNGU4NWRj
+    NGIxMDg2OThlNTRhNzhjODFhZWExZjAyYzFjZTA1YTFkOThjMjdlMmUzNDdk
+    OWU2MWUxZWVmNDAxNzU0NTkwM2RiZDU0NDkzNmU3YTdmNWQ1MDc=

data/.grabepg.gemspec

@@ -10,6 +10,6 @@ Gem::Specification.new do |gem|
   gem.files         = `git ls-files`.split($\)
   gem.name          = "grab_epg"
   gem.require_paths = ["lib"]
-  gem.version       = "0.2.9"
+  gem.version       = "0.3.2"
   gem.homepage      = "https://github.com/hahazql/grab_epg"
 end

data/lib/debug.rb

@@ -12,5 +12,5 @@ class Debug
 
 # p TestGrabTvsou.new.get_channel_logo
 #  p TestGrabTvmao.new.test_get_show_type_by_batch
-  p TestGrabBase.new.test_proxy_list
+  p TestGrabTvmao.new.test_get_doc_channel_date
 end

data/lib/grab_tvmao.rb

@@ -28,6 +28,7 @@ module Grabepg
 
   def initialize
     @grabbase = GrabBase.new
+    @@proxyindex = 0
   end
 
 
@@ -46,11 +47,12 @@ module Grabepg
     end
     url = get_show_type_url(url,date)
     schedules = get_schedulelist_atday(channel,url,proxylist)
-    type = nil
+    type = []
     schedules.each do |schedule|
+      begin
       schedule_time_num = schedule["schedule_start"].gsub(":","").to_i
       if _schedule.has_key?(schedule_time_num)
-        _schedule[schedule_time_num]["type"]=_schedule[schedule_time_num]["type"]|schedule["type"]
+        _schedule[schedule_time_num]["type"]=_schedule[schedule_time_num]["type"]|schedule["type"] if schedule["type"]
         p "*****************************************************************************************"
         p "Schedule: #{_schedule[schedule_time_num]}"
         p "schedule_logo_1: #{_schedule[schedule_time_num]["schedule_logo"]}"
@@ -61,6 +63,9 @@ module Grabepg
           end
         end
       end
+      rescue
+        next
+      end
     end
     ret = []
     _schedule.each do |key,value|
@@ -150,7 +155,9 @@ module Grabepg
       when 6
         ret += "六"
       when 7
-        ret += "七"
+        ret += "日"
+      when 0
+        ret += "日"
     end
     ret
   end
@@ -320,7 +327,6 @@ module Grabepg
   def getchannels(img_dir_path)
     @channel = []
     @site=DEFAULT_SITE
-    @proxyindex = 0
     @img_down_dir_path = img_dir_path
     @img_down_file = File.new(File.join(img_dir_path,"channel_img_down_path"),'w+')
 
@@ -364,7 +370,7 @@ module Grabepg
 
     def err_doc_proxy(proxy,proxylist,url="",err="")
       if proxy.empty?||proxy.nil?
-        proxylist.delete_at[@proxyindex]
+        proxylist.delete_at[@@proxyindex]
       end
 
 
@@ -375,10 +381,10 @@ module Grabepg
       @no_firest += 1
       p "*************************Proxy:#{proxy}, url:#{url} Error:#{err}"
       #proxylist.delete(proxy)    #删除出错的代理  但如果是此网页错误则会引起BUG待修复
-      @proxyindex += 1
-      @proxyindex=@proxyindex%@size
-      doc=get_doc_with_proxy(proxylist,url) if @no_firest<4
-      unless @no_firest<4
+      @@proxyindex += 1
+      @@proxyindex=@@proxyindex%@size
+      doc=get_doc_with_proxy(proxylist,url) if @no_firest<10
+      unless @no_firest<10
         @no_firest=0
         raise RuntimeError,"Error: #{err}"
       end
@@ -389,15 +395,17 @@ module Grabepg
     #使用代理获取url的html的doc值
     def get_doc_with_proxy(proxylist,url)
       unless proxylist.nil?||proxylist.empty?
-        unless @proxyindex
-          @proxyindex = 0
+        unless @@proxyindex
+          @@proxyindex = 0
         end
         @size = proxylist.size
-        @proxyindex=@proxyindex%proxylist.size
-        if(proxylist[@proxyindex])
-          proxy = proxylist[@proxyindex]
+        @@proxyindex=@@proxyindex+1
+        @@proxyindex=@@proxyindex%@size
+        if(proxylist[@@proxyindex])
+          proxy = proxylist[@@proxyindex]
         else
-          proxy = proxylist[@proxyindex+1]
+          @@proxyindex=@@proxyindex+1
+          proxy = proxylist[@@proxyindex]
         end
         begin
           doc = Nokogiri::HTML(open(url,:proxy=>"#{proxy}").read) unless proxy.nil?||proxy.empty?
@@ -412,12 +420,10 @@ module Grabepg
           doc=err_doc_proxy(proxy,proxylist,url,err.to_s)
           @no_firest=0
           p "Get DOC"
-          @proxyindex += 1
-          @proxyindex=@proxyindex%@size
+          @@proxyindex=@@proxyindex+1
+          @@proxyindex=@@proxyindex%@size
           return doc
         end
-        @proxyindex += 1
-        @proxyindex=@proxyindex%@size
       else
         begin
           doc = Nokogiri::HTML(open(url).read) if proxy.nil?||proxy.empty?
@@ -600,7 +606,6 @@ module Grabepg
   #获取节目详细信息
   def get_show_infomation(proxy_list,schedule_herf)
     begin
-    @proxyindex = 0
     unless @site
       @site = "http://www.tvmao.com"
     end
@@ -633,10 +638,10 @@ module Grabepg
     unless @show_schedule
       @show_schedule={}
     end
-    @show_schedule.merge!(name=>get_show_schedule(proxy_list,schedule_herf)) unless @show_schedule.has_key?(name)
+    #@show_schedule.merge!(name=>get_show_schedule(proxy_list,schedule_herf)) unless @show_schedule.has_key?(name)
     {"type"=>type,"name"=>name,"img"=>schedule_img_down_path}
-    #rescue => e
-    #  p "Error In get_show_infomation msg : #{e.to_s}"
+    rescue => e
+      p "Error In get_show_infomation msg : #{e.to_s}"
     end
   end
 

data/lib/grabepg/grab_base.rb

@@ -140,8 +140,8 @@ module Grabepg
       #proxylist.delete(proxy)    #删除出错的代理  但如果是此网页错误则会引起BUG待修复
       @proxyindex += 1
       @proxyindex=@proxyindex%@size
-      doc=get_doc_with_proxy(proxylist,url) if @no_firest<4
-      unless @no_firest<4
+      doc=get_doc_with_proxy(proxylist,url) if @no_firest<10
+      unless @no_firest<10
         @no_firest=0
         raise RuntimeError,"Error: #{err}"
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grab_epg
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.3.2
 platform: ruby
 authors:
 - hahazql
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-09 00:00:00.000000000 Z
+date: 2013-06-14 00:00:00.000000000 Z
 dependencies: []
 description: ! '"用于抓取EPG信息"'
 email: