pirate-autosub 0.2.3 → 0.2.4

data/Rakefile

@@ -3,14 +3,14 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('autosub', '0.2.3') do |p|
+Echoe.new('autosub', '0.2.4') do |p|
   p.description    = "Ruby tool to automatically download subtitles (srt) inside your TV Shows folder"
   p.url            = "http://github.com/pirate/autosub"
   p.author         = "Pirate"
   p.email          = "pirate.2061@gmail.com"
   p.ignore_pattern = ["tmp/*", "script/*"]
   p.executable_pattern = "bin/autosub"
-  p.runtime_dependencies = ["hpricot", "rubyzip", "optiflag", "simple-rss"]
+  p.runtime_dependencies = ["hpricot", "rubyzip", "optiflag", "simple-rss", "mechanize"]
 end
 
 Dir["#{File.dirname(__FILE__)}/tasks/*.rake"].sort.each { |ext| load ext }

data/autosub.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{autosub}
-  s.version = "0.2.3"
+  s.version = "0.2.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Pirate"]
-  s.date = %q{2008-12-29}
+  s.date = %q{2009-01-17}
   s.default_executable = %q{autosub}
   s.description = %q{Ruby tool to automatically download subtitles (srt) inside your TV Shows folder}
   s.email = %q{pirate.2061@gmail.com}
@@ -30,12 +30,14 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<rubyzip>, [">= 0"])
       s.add_runtime_dependency(%q<optiflag>, [">= 0"])
       s.add_runtime_dependency(%q<simple-rss>, [">= 0"])
+      s.add_runtime_dependency(%q<mechanize>, [">= 0"])
       s.add_development_dependency(%q<echoe>, [">= 0"])
     else
       s.add_dependency(%q<hpricot>, [">= 0"])
       s.add_dependency(%q<rubyzip>, [">= 0"])
       s.add_dependency(%q<optiflag>, [">= 0"])
       s.add_dependency(%q<simple-rss>, [">= 0"])
+      s.add_dependency(%q<mechanize>, [">= 0"])
       s.add_dependency(%q<echoe>, [">= 0"])
     end
   else
@@ -43,6 +45,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<rubyzip>, [">= 0"])
     s.add_dependency(%q<optiflag>, [">= 0"])
     s.add_dependency(%q<simple-rss>, [">= 0"])
+    s.add_dependency(%q<mechanize>, [">= 0"])
     s.add_dependency(%q<echoe>, [">= 0"])
   end
 end

data/lib/sites/tvsubtitle.rb

@@ -2,6 +2,7 @@ require 'simple-rss'
 require 'open-uri'
 require 'zip/zip'
 require 'cgi'
+require 'mechanize'
 
 # http://www.tvsubtitles.net/
 class TVSubtitle
@@ -30,18 +31,13 @@ class TVSubtitle
   end
   
 private
-
-  def srt_link(item)
-    id = item.link.match(/([0-9]+)/)[1]
-    http = Net::HTTP.new('www.tvsubtitles.net')
-    resp, data = http.get("/download-#{id}.html")
-    "http://www.tvsubtitles.net/#{resp.response['Location'].gsub(/\s/, '%20')}"
-  end
-
+  
   def download_srt(item, episode, lang)
-    url = srt_link(item)
+    agent = WWW::Mechanize.new
+    id = item_id(item)
     Tempfile.open("srt") do |tempfile|
-      tempfile.write(open(url).read) # download the srt
+      agent.get("http://www.tvsubtitles.net/subtitle-#{id}.html") # set cookie
+      tempfile.write(agent.get_file("http://www.tvsubtitles.net/download-#{id}.html")) # download the srt
       tempfile.close
       Zip::ZipFile.open(tempfile.path) do |zip_file|
         zip_file.each do |f|
@@ -67,4 +63,8 @@ private
     "#{item.title} #{item.description.include?('720p') ? 'hd' : 'sd'}".downcase
   end
   
+  def item_id(item)
+    item.link.match(/([0-9]+)/)[1]
+  end
+  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: pirate-autosub
 version: !ruby/object:Gem::Version 
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors: 
 - Pirate
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-29 00:00:00 -08:00
+date: 2009-01-17 00:00:00 -08:00
 default_executable: autosub
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -48,6 +48,15 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: mechanize
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 - !ruby/object:Gem::Dependency 
   name: echoe
   version_requirement: