grab_epg 0.2.5 → 0.2.6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OTk2NDZhYjM1NjdjZDhjMTExYjRjZDQyM2Q4Mzg4MDFlZWQwNmQ3YQ==
+    ZWYyYTBjOGUzMmEzZjk2MjdjNjczNmFiMjRkMTg1ZjViZjY3YTk1ZA==
   data.tar.gz: !binary |-
-    NDRkMWI5ZTNkYzhmOTZlMTk4YWYwYmZjNGIzMmQ5YzJlYWVmNzgwYg==
+    MDU3OTNmODUzNDYxODhjZDc0YmM5YTkyYmU3NTY2MDg0MjdmMmEyNg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NmE4ZWQzNmJjZDRhMjBhODk4ZWY4ODI0MTllMTVlMjFmZDk1NzQ5NmFmYmVj
-    NzViZWU5YTE0ZTAzM2FmOTJiN2E5MTQ4NmJhY2IzYWVkZTE2NGEwYjU5YjQy
-    YWRiMzM0MjVlMzNkYmI3ZjRhMjRjYzQxYzZkMTFiMmY2M2U2OWY=
+    M2Q2MThkNmFhNDYzY2RlOTU1OWZlMTBhZDY2ODgxNTZmZTk5MWQ4MDEyN2Yx
+    MDczNjkyZWU0ZDUyMzFiMzE3YWI3Yjg0NjA2ZjFiNzdlNjQ0ZWIyYWM0NjA2
+    OTEyOWIwMmVkNjg0YjJiMmZhMGE3ZDE4NWY5NGRmYTViZTAzZTY=
   data.tar.gz: !binary |-
-    MWFjNjc0NTQ5ZjQ1ZjY0MTY2M2E4MmNlMjIzYjNkMzNkOThlMmUzYTI5YjM5
-    YWVhNWYzMmJjOGZiZjkwNGEzZWQxODNmZjlmYmFiMDUwNTcwYWJiMzNlMjUy
-    OTJiZWY0MzI0YjNlNWQ0NTUzNTBhMmRhODUxZjVkYTFkNTQ1NTc=
+    ZjI3ZTY4NGFiNjQzODBlY2Q2ODkwMzdhZDhhNDIxMjQ0MGZhZGE4NGNlMDlj
+    ZjE5OTgzMGY0MDkyNDY2MTk5ZjU3MjkwZWIzYmNjODhmOWEzNGIyMDlhM2Qz
+    ZDkxNTExMWYzNTBlNTY2MzU0NGIxNThiNDQ0Y2EzZDAxMzQ3NTY=

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

data/Gemfile

@@ -3,3 +3,4 @@
 source 'http://ruby.taobao.org'
 
 gem "nokogiri"
+gem 'get_proxy_list'

data/lib/debug.rb

@@ -4,11 +4,13 @@ require 'nokogiri'
 require 'open-uri'
 require File.expand_path("../test/test_grab_tvsou.rb", __FILE__)
 require File.expand_path("../test/test_grab_tvmao.rb", __FILE__)
+require File.expand_path("../test/test_grab_base.rb", __FILE__)
 #require 'test/test_grab_tvsou'
 class Debug
   # To change this template use File | Settings | File Templates.
   #proxylist = ["219.234.82.84:24809", "219.234.82.84:17130", "219.234.82.84:23684", "219.234.82.84:18253", "219.234.82.84:33987", "219.234.82.84:17183", "219.234.82.84:13243", "219.234.82.84:16158", "219.234.82.84:14826", "219.234.82.84:8489", "219.234.82.84:22222", "219.234.82.84:6370", "219.234.82.84:7571", "219.234.82.84:33944", "219.234.82.84:9743", "219.234.82.84:8089", "219.234.82.84:20991", "219.234.82.84:34032", "219.234.82.84:9415", "219.234.82.84:26149", "219.234.82.84:11095", "219.234.82.84:21724", "219.234.82.84:9177", "219.234.82.84:34034", "219.234.82.84:17945", "219.234.82.85:32229", "219.234.82.85:28341", "219.234.82.85:36314", "219.234.82.85:30605", "219.234.82.85:23684", "219.234.82.85:34015", "219.234.82.85:33919", "219.234.82.85:30639", "219.234.82.85:33965", "219.234.82.85:37299", "219.234.82.85:20747", "219.234.82.86:6666", "219.234.82.86:34106", "219.234.82.86:25301", "219.234.82.86:32896", "219.234.82.86:23034", "219.234.82.86:22685", "219.234.82.86:13078", "219.234.82.86:38770", "219.234.82.86:28402", "219.234.82.86:18887", "219.234.82.86:6588", "219.234.82.86:7292", "219.234.82.86:24268", "219.234.82.86:16472", "219.234.82.86:32597", "219.234.82.86:31122", "219.234.82.88:8817", "219.234.82.88:8160", "219.234.82.88:9239", "219.234.82.88:6133", "114.141.162.53:8080", "123.125.116.243:17656", "123.125.116.241:29156", "123.125.116.243:6938", "219.234.82.88:29484", "219.234.82.88:8084", "219.234.82.88:32229", "219.234.82.88:22758", "219.234.82.88:5616", "124.225.52.14:8080", "219.234.82.88:30028", "219.234.82.88:23685", "219.234.82.88:29037", "219.234.82.88:8755"]
 
 # p TestGrabTvsou.new.get_channel_logo
-  p TestGrabTvmao.new.test_get_show_type_by_batch
+#  p TestGrabTvmao.new.test_get_show_type_by_batch
+  p TestGrabBase.new.test_proxy_list
 end

data/lib/grabepg/grab_base.rb

@@ -29,14 +29,18 @@ module Grabepg
       ret
     end
 
+    def self.proxy_limit(limit,proxy_list)
+      return GetProxyList.get_proxy_in_time_limt(limit,proxy_list)
+    end
 
     def self.proxy_list(path)
       proxy_list = []
       crt_date = DateTime.now.strftime('%F')
-      proxy_path = "%s/proxy/%s.txt" % [File.dirname(path),crt_date]
+      proxy_path = "%s/tasks/proxy/%s.txt" % [File.dirname(path),crt_date]
       p "Proxy_Path: #{proxy_path}"
       if File.exist?(proxy_path)
         file_proxy = File.open(proxy_path,"r")
+        p "Write in file"
         file_proxy.each_line {|line|
           proxy_list << line.chomp.to_s
         }
@@ -44,8 +48,11 @@ module Grabepg
         file_proxy.flush
         file_proxy.close
       else
-        proxy_list=GetProxyList.get_list(ENV["proxy_limit"].to_i,ENV["proxy_page"].to_i)
-        dirpath = "#{File.dirname(path)}/proxy/"
+        #proxy_list=GetProxyList.get_list(ENV["proxy_limit"].to_i,ENV["proxy_page"].to_i)
+        proxy_list=["192.168.1.144:2222"]
+        dirpath = "#{File.dirname(path)}/tasks/proxy/"
+        p "**************************************************"
+        p "dirpath=#{dirpath}"
         Dir.open(dirpath)  {|fna|
           fna.each do |fn|
             if(fn.to_s != ".." && fn.to_s != ".")

metadata

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