subtitulos_downloader 0.6.2 → 0.7.0

data/lib/subtitulos_downloader/provider/subtitulos_es.rb

@@ -1,5 +1,8 @@
 # encoding: utf-8
-require 'hpricot'
+require 'nokogiri'
+require 'uri'
+require 'net/http'
+require 'ensure/encoding'
 
 module SubtitulosDownloader
 
@@ -57,59 +60,57 @@ module SubtitulosDownloader
     protected
 
     def get_translators(show_sub)
-      open(@provider_link,
+      ep_doc = Nokogiri::HTML(open(@provider_link,
         "User-Agent" => @user_agent,
-        "Referer" => "#{@base_uri}/show/#{show_sub[:id_show]}" ) { |f|
-          
-        cont = f.read
-
-        ep_doc = Hpricot(cont)
-        split = @direct_link.split('/')
-        sub_id = [split.pop, split.pop].reverse.join('/')
-        ep_doc.search('span.descargar').each do |green|
-          a = green.search('a').at(0)
-          if a and a.attributes['href'] == @direct_link 
-            translated = green.next_sibling.next_sibling.next_sibling
-            @translators = translated.search('a').count
-            return @translators
-            
-          end
-          # title = (episode_table/"tr/td[@colspan='5']/a").inner_html.force_encoding('utf-8')
-          # episode_str = "%02d" % show_episode.episode
-          # episode_number = "#{show_episode.season}x#{episode_str}"
-          # if title =~ /#{episode_number}/i
-          #   ep_t = episode_table
-          #   break
-          # end
+        "Referer" => "#{@base_uri}/show/#{show_sub[:id_show]}" ), nil, 'UTF-8')
+      ep_doc.encoding = 'utf-8'
+      split = @direct_link.split('/')
+      sub_id = [split.pop, split.pop].reverse.join('/')
+      ep_doc.css('span.descargar').each do |green|
+        a = green.css('a').first
+        if a and a['href'] == @direct_link 
+          translated = green.xpath('following-sibling::span')[2]
+          @translators = translated.css('a').count
+          return @translators
         end
-        @translators = -1
-      }
+        # title = (episode_table/"tr/td[@colspan='5']/a").inner_html
+        # episode_str = "%02d" % show_episode.episode
+        # episode_number = "#{show_episode.season}x#{episode_str}"
+        # if title =~ /#{episode_number}/i
+        #   ep_t = episode_table
+        #   break
+        # end
+      end
+      @translators = -1
     end
 
     def get_subtitles(language, episode_table, show_sub)
-      @provider_link = (episode_table/"td.NewsTitle/a").first.attributes['href']
+      @provider_link = episode_table.css("td.NewsTitle a").first['href']
       
       translation_unfinished = false
-      (episode_table/"tr/td.language").each do |lang|
-        language_sub = lang.inner_html.strip.force_encoding('utf-8')
+      episode_table.css("tr td.language").each do |lang|
+        language_sub = lang.text.strip
         if language_sub =~ /#{language}/i
-          # puts "Language #{language} found"
-          if not lang.next_sibling.inner_html =~ /[0-9]+\.?[0-9]*% Completado/i
+          # puts "Language #{language} found #{language_sub}"  
+          completed = lang.parent.css('td:nth-child(6)')
+          if not completed.text.strip =~ /[0-9]+\.?[0-9]*% Completado/i
             # puts "Translation for language #{language} completed"
-            subtitle_a = lang.parent.search("a").at(0)
-            subtitle_url = subtitle_a.attributes['href']
+            subtitle_a = lang.parent.css("a").first
+            subtitle_url = subtitle_a['href']
             # puts "Fetching #{language} subtitle file"
             @provider_language = language_sub
             @direct_link = subtitle_url
             # @provider_link = "#{@base_uri}/show/#{show_sub[:id_show]}"
-            translation_unfinished = false              
-            open(subtitle_url, 
-              "User-Agent" => @user_agent,
-              "Referer" => "#{@base_uri}/show/#{show_sub[:id_show]}") { |f|
-                # Save the response body
-                subs= f.read
-                return subs
-            }
+            translation_unfinished = false 
+
+            uri = URI.parse subtitle_url
+            http = Net::HTTP.new(uri.host, uri.port)
+            req = Net::HTTP::Get.new(uri.path, {"User-Agent" => @user_agent, "Referer" => "#{@base_uri}/show/#{show_sub[:id_show]}"})
+            response = http.request(req)
+            utf8_body = response.body.ensure_encoding('UTF-8', :external_encoding => 'ISO-8859-1', :invalid_characters => :transcode)
+            
+            return utf8_body
+            
           else
             translation_unfinished = true              
           end
@@ -131,9 +132,9 @@ module SubtitulosDownloader
       show_episode.show_name = 'The Newsroom' if show_episode.show_name == 'The Newsroom (2012)'
       show_episode.show_name = 'The Office' if show_episode.show_name == 'The Office (US)' or show_episode.show_name == 'The Office (1995)'
       show_episode.show_name = 'Spartacus: Blood and Sand' if show_episode.show_name =~ /Spartacus/i	
-      @shows_doc.search("a").each do |show_subs|
-        show_name = show_subs.inner_html.force_encoding('utf-8')
-        show_url = show_subs.attributes['href']
+      @shows_doc.css("#contenido a").each do |show_subs|
+        show_name = show_subs.text
+        show_url = show_subs['href']
         show = { :show_episode => show_episode, :url => show_url, :id_show => show_url.split('/show/')[1].to_i }
         if (show_name == show_episode.show_name)
           shows = []
@@ -154,25 +155,21 @@ module SubtitulosDownloader
 
       season_url = "#{@base_uri}/ajax_loadShow.php?show=#{show_sub[:id_show]}&season=#{show_episode.season}"
       ep_t = nil
-      open(season_url,
+      season_doc = Nokogiri::HTML(open(season_url,
         "User-Agent" => @user_agent,
-        "Referer" =>"#{@base_uri}" ) { |f|
-          
-          cont = f.read
-          raise SeasonNotFound, "[#{@provider_name}] Season for #{show_episode.full_name} not found" if not cont.match(/<table/)
-
-          season_doc = Hpricot(cont)
-
-          season_doc.search('table').each do |episode_table|
-            title = (episode_table/"tr/td[@colspan='5']/a").inner_html.force_encoding('utf-8')
-            episode_str = "%02d" % show_episode.episode
-            episode_number = "#{show_episode.season}x#{episode_str}"
-            if title =~ /#{episode_number}/i
-              ep_t = episode_table
-              break
-            end
-          end
-      }
+        "Referer" =>"#{@base_uri}" ), nil, 'UTF-8')
+      season_doc.encoding = 'utf-8'
+      raise SeasonNotFound, "[#{@provider_name}] Season for #{show_episode.full_name} not found" if season_doc.css('table').count == 0
+
+      season_doc.css('table').each do |episode_table|
+        title = episode_table.css("tr td[colspan='5'] a").text
+        episode_str = "%02d" % show_episode.episode
+        episode_number = "#{show_episode.season}x#{episode_str}"
+        if title =~ /#{episode_number}/i
+          ep_t = episode_table
+          break
+        end
+      end
 
       if ep_t
         return ep_t
@@ -184,12 +181,11 @@ module SubtitulosDownloader
 
 
     def get_shows_page
-      open(
+      @shows_doc = Nokogiri::HTML(open(
       "#{@base_uri}/series", 
       "User-Agent" => @user_agent,
-      "Referer" =>"#{@base_uri}" ) { |f|
-        @shows_doc = Hpricot(f.read)
-      }
+      "Referer" =>"#{@base_uri}" ), nil, 'UTF-8')
+      @shows_doc.encoding = 'utf-8'
     end
 
   end

data/lib/subtitulos_downloader/version.rb

@@ -1,3 +1,3 @@
 module SubtitulosDownloader
-  VERSION = "0.6.2"
+  VERSION = "0.7.0"
 end

data/subtitulos_downloader.gemspec

@@ -21,7 +21,10 @@ Gem::Specification.new do |s|
   # specify any dependencies here; for example:
   s.add_development_dependency "rake"
   s.add_development_dependency "rspec", "~>2.0"
+  s.add_development_dependency "awesome_print", ">= 1.1.0"
   # s.add_runtime_dependency "rest-client"
   s.add_dependency("tvdb", ">= 0.1.0")
+  s.add_dependency("nokogiri", ">= 1.5.5")
   s.add_dependency("hpricot", ">= 0.8.4")
+  s.add_dependency("ensure-encoding")
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: subtitulos_downloader
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-27 00:00:00.000000000 Z
+date: 2012-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -43,6 +43,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: awesome_print
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: tvdb
   requirement: !ruby/object:Gem::Requirement
@@ -59,6 +75,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.1.0
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.5.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.5.5
 - !ruby/object:Gem::Dependency
   name: hpricot
   requirement: !ruby/object:Gem::Requirement
@@ -75,6 +107,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.8.4
+- !ruby/object:Gem::Dependency
+  name: ensure-encoding
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Fetch subtitles from different providers and save them to a given path
 email:
 - hector@aerstudio.com
@@ -115,7 +163,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4045992027944727546
+      hash: -93796529028502819
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -124,7 +172,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4045992027944727546
+      hash: -93796529028502819
 requirements: []
 rubyforge_project: subtitulos_downloader
 rubygems_version: 1.8.24