grab_epg 0.0.6 → 0.0.7

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MTY3OWJkM2RiYzc1MTAyNDA0Y2IxMTMyZTMzNzY5YmEwZGE5OWNiMg==
+    M2NhMmRmNzYzYmYzMjFiODIyMGZjOTFjZGY4YjgxNDNiNjVkYTVjMA==
   data.tar.gz: !binary |-
-    OTg5MmU4MGE1YzYwMzNiNDkwNzlmOWIxNWYwN2NiZjE0OTk5NTFmZg==
+    YTQ4NDAwODM3NGY1OTZhZmU2OGY0NmM3M2RmZjMxMDEzNWVjYTU2MQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZGMzMDViMTBjNmVmMWVmODVmYjhiMmMyZDkwY2RkYWQwNjI5NjYzZTgwNDM4
-    ZjJkNmQ3YzQyNmM2OTQyNWU3MzVhOTQ5NmNmMWYwZmVlMmM0MDU4MjhmZDM0
-    ZWRhNjRmNzI1YzU2MjU2NDY2MDgwMTllNDRmZjI2YmNlZjdjZGU=
+    OTJiY2UzYmRiOWUxNTI2OTRmOGQ1ODI0YWZkMzE5OTc2M2ZhMGMwN2EzNTMz
+    YjdjNGNmNzZhOGYzZWQ3NTMwMWY2NmU2MjhjZjE5ODkyMGUxOTVjN2Y2YjVm
+    OTg3MzhiZGIyZDhmMTQwMzFlZTJlMDdiMjczNmJhYTA5NWI4NDk=
   data.tar.gz: !binary |-
-    YjRmYTU2NGEwODE2ZjhkZGRkNThmNmNkZDc5NGQ3MDM0M2M5YTA0ODg2Mjkx
-    ZjMzM2YxYTcxYzI5YTVjMjdlYTY2ZjkyYTAwNmVmNDJjMmZlZDgzNjExMDMx
-    OTJjNWIxN2M1YmM5M2VmMTQ2MjM4NzY5ZDFiMGYyZjkxZmJmNTI=
+    OWFkZTQ2YmJmY2MxOWEwYWQyZDMzYTY2MzQ5NzBmYTFlNDk4NGJlZDYxNDNl
+    ZmExOTViNzZmMWIzNjM1MjRiYzZkYTI1YTg5ZThjYWIzZWU5NzA1MWU3M2Vl
+    MWZiYWVhNTc4MzcxNTE5NmJlOTNjZDFkZjc2YjQwNDI1OTM3ZGU=

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.0.6"
+  gem.version       = "0.0.7"
   gem.homepage      = "https://github.com/hahazql/grab_epg"
 end

data/lib/grabepg.rb

@@ -99,12 +99,12 @@ module Grabepg
     begin
       doc = Nokogiri::HTML(open(url,:proxy=>"http://#{proxy}")) unless proxy.nil?||proxy.empty?
       doc = Nokogiri::HTML(open(url)) if proxy.nil?||proxy.empty?
-      @no_firest = false
+      @no_firest = 0
     rescue => err
-      @no_firest = true
+      @no_firest += 1
       p "*************************Proxy:#{proxy}, url:#{url}"
-      get_doc_with_proxy(proxylist,url) unless @no_firest
-      raise RuntimeError,"Error: #{err.to_s}" if @no_firest
+      get_doc_with_proxy(proxylist,url) if @no_firest<4
+      raise RuntimeError,"Error: #{err.to_s}" unless @no_firest<4
     end
     @proxyindex += 1
     unless doc
@@ -116,7 +116,13 @@ module Grabepg
 
 
   #获取节目表
-  def self.getschedule(channel,herf,proxylist,site="http://www.tvmao.com",img_dir_down_path=@img_down_dir_path)
+  def self.getschedule(channel,herf,proxylist,day_num=7,img_dir_down_path=@img_down_dir_path)
+    begin
+      day_num = 1 if day_num<1
+    rescue
+      day_num = 1
+    end
+    site="http://www.tvmao.com"
     unless img_dir_down_path
       img_dir_down_path = __FILE__
     end
@@ -128,18 +134,19 @@ module Grabepg
     _img_url = "http://static.haotv.me/channel/logo/"
     @show_schedule = {}
 
-    get_week_url = lambda {|url|
+    get_week_url = lambda {|url,day_num|
        _url = site
        urls = []
        _urls = url.split("-")
        0.upto(1).each do |i|
         _url = _url+"#{_urls[i]}"+"-"
        end
-      1.upto(7).each do |i|
+      1.upto(day_num).each do |i|
         urls << _url+"w#{i}.html"
       end
       urls
     }
+
     channel_schedule = {}
     get_week_url.call(herf).each do |url|
       p "Grab: #{url}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grab_epg
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - hahazql