subtitulos_downloader 0.5.5 → 0.6.0

data/Gemfile

@@ -4,7 +4,7 @@ source "http://rubygems.org"
 gemspec
 
 group :development, :test do
-  gem 'ruby-debug19'
+ 
 end
 
 group :test do

data/lib/subtitulos_downloader/provider/subtitulos_es.rb

@@ -32,7 +32,7 @@ module SubtitulosDownloader
 
       begin
         subs = get_subtitles(lang, episode_subs_table, show_sub)
-        subtitle = Subtitle.new subs, language, show_episode
+        subtitle = Subtitle.new subs, language, show_episode, @direct_link, @provider_link, @provider_name, @provider_language
       rescue SDException => e
         if language == 'es'
           if lang == 'España' 
@@ -56,6 +56,7 @@ module SubtitulosDownloader
     protected
 
     def get_subtitles(language, episode_table, show_sub)
+      @provider_link = (episode_table/"td.NewsTitle/a").first.attributes['href']
       (episode_table/"tr/td.language").each do |lang|
         language_sub = lang.inner_html.strip.force_encoding('utf-8')
         if language_sub =~ /#{language}/i
@@ -65,6 +66,9 @@ module SubtitulosDownloader
               subtitle_a = lang.parent.search("a").at(0)
               subtitle_url = subtitle_a.attributes['href']
               # puts "Fetching #{language} subtitle file"
+              @provider_language = language_sub
+              @direct_link = subtitle_url
+              # @provider_link = "#{@base_uri}/show/#{show_sub[:id_show]}"
               open(subtitle_url, 
                 "User-Agent" => @user_agent,
                 "Referer" => "#{@base_uri}/show/#{show_sub[:id_show]}") { |f|
@@ -83,15 +87,27 @@ module SubtitulosDownloader
 
     def search_show show_episode
       shows = []
+      old_name = show_episode.show_name
+      show_episode.show_name = 'Louie' if show_episode.show_name == 'Louie (2010)'
+      show_episode.show_name = 'Castle' if show_episode.show_name == 'Castle (2009)'
+      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']
-        if show_name =~ /#{show_episode.show_name}/i
-          shows << { :show_episode => show_episode, :url => show_url, :id_show => show_url.split('/show/')[1].to_i }
+        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 << show
+          break
+        elsif show_name =~ /^#{show_episode.show_name}/i and (show_name != 'Scrubs Interns' and show_name != 'true blood minisodes')
+          shows << show
         end
       end
       raise ShowNotFound, "[#{@provider_name}] #{show_episode.show_name} not found" if shows.count == 0
       raise MoreThanOneShow, "[#{@provider_name}] Found #{shows.count} for #{show_episode.show_name}" if shows.count > 1
+      old_name = 'The Office (US)' if old_name == 'The Office (1995)'
+      show_episode.show_name = old_name
       shows
     end
 
@@ -104,7 +120,7 @@ module SubtitulosDownloader
         "Referer" =>"#{@base_uri}" ) { |f|
           
           cont = f.read
-          raise SeasonNotFound, "[#{@provider_name}] Season for #{show_episode.full_name} not found" if cont == ''
+          raise SeasonNotFound, "[#{@provider_name}] Season for #{show_episode.full_name} not found" if not cont.match(/<table/)
 
           season_doc = Hpricot(cont)
 
@@ -139,4 +155,4 @@ module SubtitulosDownloader
 
   end
 
-end
+end

data/lib/subtitulos_downloader/subtitle.rb

@@ -2,13 +2,17 @@ module SubtitulosDownloader
 
   class Subtitle
 
-    attr_accessor :subtitles, :language, :show_episode
+    attr_accessor :subtitles, :language, :show_episode, :direct_link, :provider, :provider_link, :provider_language
 
-    def initialize(subs, language, show_episode)
+    def initialize(subs, language, show_episode, direct_link, provider_link, provider, provider_language)
       @subtitles = subs
       @language = language
       @show_episode = show_episode
       @show_episode.subtitles << self
+      @provider_link = provider_link
+      @direct_link = direct_link
+      @provider = provider
+      @provider_language = provider_language
     end
 
 

data/lib/subtitulos_downloader/version.rb

@@ -1,3 +1,3 @@
 module SubtitulosDownloader
-  VERSION = "0.5.5"
+  VERSION = "0.6.0"
 end

data/spec/show_episode_spec.rb

@@ -33,7 +33,7 @@ describe SubtitulosDownloader::ShowEpisode do
 
     it 'should show the subtitle given a language' do
       episode = SubtitulosDownloader::ShowEpisode.new('fake show', 3, 3)
-      subtitle = SubtitulosDownloader::Subtitle.new('subs', 'es', episode)
+      subtitle = SubtitulosDownloader::Subtitle.new('subs', 'es', episode,  'direct_link', 'provider_link', 'provider', 'provider_language')
       sub = episode.subtitle_language 'es'
       sub.should == subtitle
       sub.subtitles.should =='subs'

data/spec/subtitle_spec.rb

@@ -9,7 +9,7 @@ describe SubtitulosDownloader::Subtitle do
     end
 
     it 'should initialize' do
-      sub = SubtitulosDownloader::Subtitle.new('subs', 'en', @ep)
+      sub = SubtitulosDownloader::Subtitle.new('subs', 'en', @ep, 'direct_link', 'provider_link', 'provider', 'provider_language')
       sub.subtitles.should == 'subs'
       sub.language.should == 'en'
       sub.show_episode.should == @ep
@@ -18,11 +18,11 @@ describe SubtitulosDownloader::Subtitle do
     end
 
     it 'should show the path to save' do
-      sub = SubtitulosDownloader::Subtitle.new('subs', 'en', @ep)
+      sub = SubtitulosDownloader::Subtitle.new('subs', 'en', @ep, 'direct_link', 'provider_link', 'provider', 'provider_language')
       sub.save_path.should == 'Fringe/Season 4/Fringe - 4x07 - Wallflower-English.srt'
-      sub = SubtitulosDownloader::Subtitle.new('subs', 'es', @ep)
+      sub = SubtitulosDownloader::Subtitle.new('subs', 'es', @ep, 'direct_link', 'provider_link', 'provider', 'provider_language')
       sub.save_path.should == 'Fringe/Season 4/Fringe - 4x07 - Wallflower-Spanish.srt'
-      sub = SubtitulosDownloader::Subtitle.new('subs', 'ca', @ep)
+      sub = SubtitulosDownloader::Subtitle.new('subs', 'ca', @ep, 'direct_link', 'provider_link', 'provider', 'provider_language')
       sub.save_path.should == 'Fringe/Season 4/Fringe - 4x07 - Wallflower-ca.srt'
     end
 

metadata

@@ -1,71 +1,87 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: subtitulos_downloader
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.6.0
   prerelease: 
-  version: 0.5.5
 platform: ruby
-authors: 
+authors:
 - hector spc
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-11-20 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-10-27 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rake
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "2.0"
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
+- !ruby/object:Gem::Dependency
   name: tvdb
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+- !ruby/object:Gem::Dependency
   name: hpricot
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.8.4
   type: :runtime
   prerelease: false
-  version_requirements: *id004
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.8.4
 description: Fetch subtitles from different providers and save them to a given path
-email: 
+email:
 - hector@aerstudio.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rspec
 - Gemfile
@@ -87,38 +103,35 @@ files:
 - subtitulos_downloader.gemspec
 homepage: https://github.com/hecspc/Subtitulos-Downloader
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3007915900724619315
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -1144419666492793032
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3007915900724619315
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: -1144419666492793032
 requirements: []
-
 rubyforge_project: subtitulos_downloader
-rubygems_version: 1.8.11
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Fetch subtitles focused on spanish language
-test_files: 
+test_files:
 - spec/show_episode_spec.rb
 - spec/spec_helper.rb
 - spec/subtitle_spec.rb