subdl 0.0.6 → 0.0.7

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: b353f0e19e883d57a353f5ea315cc4d6ef1a71e6
+  data.tar.gz: b81266cb82694395f3b86f77bbee9a69f8723271
+SHA512:
+  metadata.gz: f67572d0e484e3055ee9d61f389a9a16274bcffd9c3beee96389364e5a9cd43688523fb49c2c27fee8829b16d480e58b833b96b2dd90632f1aac89c9a09522db
+  data.tar.gz: cc0219092a9b21f22235e51edd83867b64f255eb66db0b5f35d03d26cebc72f535e41e494a3e0ced9dfa99f7ddc8c0b84922ec590266d746ba9bfd53d5a82777

data/bin/subdl

@@ -1,11 +1,10 @@
 #!/usr/bin/env ruby
-
 require 'subdl'
 
-itasa = Itasa.new
-Credentials.new.read_to itasa
-crawler = Crawler.new itasa
+subdl = Subdl.new mechanize_agent, 
+                  ItasaLoginForm.new, 
+                  $stdout,
+                  FileSystem.new,
+                  FileReader.new
 
-until ARGV.empty? do
-  crawler.download_sub_for ARGV.shift
-end
+subdl.main ARGV

data/lib/subdl.rb

@@ -2,16 +2,37 @@ require 'mechanize'
 require 'cgi'
 require 'json'
 require 'zipruby'
+require 'nokogiri'
+
+class Subdl
+  def initialize agent, itasa_login, stdout, file_system,
+                 file_reader
+    itasa = Itasa.new(agent, itasa_login)
+    credentials = Credentials.new file_reader
+    @crawler = Crawler.new itasa, credentials, file_system, stdout
+  end
+  def main argv
+    until argv.empty? do
+      @crawler.download_sub_for argv.shift
+    end
+  end
+end
 
 class Crawler
 
-  def initialize itasa
+  def initialize itasa, credentials, file_system, stdout
     @itasa = itasa
+    @credentials = credentials
+    @file_system = file_system
+    @stdout = stdout
   end
 
   def download_sub_for path
-    movie_file = MovieFile.new(path)
-    @itasa.each_id movie_file.search_term do |id, showname|
+    movie_file = MovieFile.new path, @stdout
+    ids = @itasa.search_subtitles(movie_file.search_term)
+
+    ids.each do |id|
+      @itasa.login *@credentials.read
       @itasa.download_zip id do |zip_contents|
         unpack_subtitle_to zip_contents, movie_file
       end
@@ -21,7 +42,7 @@ class Crawler
   def unpack_subtitle_to zip_contents, movie_file
     Zip::Archive.open_buffer(zip_contents) do |archive|
       archive.each do |entry|
-        movie_file.add_subtitle entry.read
+        movie_file.save_subtitle entry.read, @file_system
       end
     end
   end
@@ -30,8 +51,8 @@ end
 
 class MovieFile
   attr_reader :episode, :season, :show
-  attr_writer :fs
-  def initialize filename
+
+  def initialize filename, stdout=nil
     @filename = filename
     text = File.basename filename
     text = remove_year_from text
@@ -41,7 +62,7 @@ class MovieFile
       @season = remove_leading_zeros m[2]
       @episode = remove_leading_zeros m[3]
     end
-    @fs = FileSystem
+    @stdout = stdout
   end
 
   def remove_year_from text
@@ -56,10 +77,11 @@ class MovieFile
     "%s %dx%02d" % [show, season, episode]
   end
 
-  def add_subtitle contents
+  def save_subtitle contents, fs
     srt_filename = @filename.gsub /.mp4$/, ''
     srt_filename += ".itasa#{next_distinguisher}.srt"
-    @fs.save_file srt_filename, contents
+    @stdout.puts "Downloaded as #{srt_filename}"
+    fs.save_file srt_filename, contents
   end
 
   def next_distinguisher
@@ -74,58 +96,81 @@ class MovieFile
 end
 
 class FileSystem
-  def self.save_file filename, contents
+  def save_file filename, contents
     File.open filename, 'w' do |f|
       f.write contents
     end
   end
 end
 
-class Itasa
-  def initialize
-    @agent = Mechanize.new do |a|
-      a.user_agent_alias = 'Mac FireFox'
-    end
+def mechanize_agent
+  Mechanize.new do |a|
+    a.user_agent_alias = 'Mac FireFox'
   end
+end
 
-  def login username, password
-    home_page = @agent.get "http://#{host}"
+class ItasaLoginForm
+
+  def login username, password, page_where_to_login, agent
+    return if logged_in?
+    home_page = agent.get page_where_to_login
     login_form = home_page.form 'login'
     login_form.username = username
     login_form.passwd = password
-    @page = @agent.submit(login_form)
+    @page = agent.submit(login_form)
   end
 
+  private
+
   def logged_in?
     return false unless @page
     link_that_exists_only_once_logged = @page.search(
       "//a[@href='forum/index.php?action=unreadreplies']")
-    link_that_exists_only_once_logged.first
+    return link_that_exists_only_once_logged.first != nil
+  end
+
+
+end
+
+class Itasa
+  def initialize agent, login_form
+    @agent = agent
+    @login_form = login_form || ItasaLoginForm.new
+  end
+
+  def login username, password
+    @login_form.login username, password, "http://#{host}", @agent
   end
 
-  def each_id text
+  def autocomplete_data_for text
     response = @agent.get search_url(text)
-    JSON.parse(response.body).each do |episode|
-      yield episode['id'], episode['value']
-    end
-    nil
+    response.body
+  end
+
+  def search_subtitles text
+    json = autocomplete_data_for text
+    return extract_ids_from_autocomplete_data json
+  end
+
+  def extract_ids_from_autocomplete_data json
+    JSON.parse(json).map { |episode| episode['id'] }
   end
 
   def download_zip id
     page = @agent.get subtitle_page_url(id)
-    zipped_subtitle = @agent.get subtitle_zip_url(page)
+    zipped_subtitle = @agent.get subtitle_zip_url(page.body)
     yield zipped_subtitle.body
   end
 
   def subtitle_zip_url page
-    link = page.search("//a[img[contains(@src,'download2.gif')]]").first
-    return link[:href]
+    doc = Nokogiri::HTML(page)
+    return doc.at_xpath("//a[img[contains(@src,'download2.gif')]]")[:href]
   end
 
   def search_url text
     url = URI.parse "http://#{host}/modules/mod_itasalivesearch/search.php"
     url.query = "term=#{CGI.escape text}"
-    return url
+    return url.to_s
   end
 
   def subtitle_page_url id
@@ -139,10 +184,22 @@ class Itasa
 end
 
 class Credentials
-  def read_to itasa
-    contents = File.read(File.expand_path('~/.itasa-credentials')).lines
-    username = contents.next.chomp
-    password = contents.next.chomp
-    itasa.login username, password
+  def initialize file_reader
+    @file_reader = file_reader
+  end
+  def parse file_contents
+    lines = file_contents.lines.to_a
+    username = lines[0].chomp
+    password = lines[1].chomp
+    [username, password]
+  end
+  def read
+    parse @file_reader.read_expand('~/.itasa-credentials')
+  end
+end
+
+class FileReader
+  def read_expand expandable_path
+    File.read(File.expand_path(expandable_path))
   end
 end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: subdl
 version: !ruby/object:Gem::Version
-  version: 0.0.6
-  prerelease: 
+  version: 0.0.7
 platform: ruby
 authors:
 - Andrea Francia
@@ -14,81 +13,71 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: mechanize
   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'
 - !ruby/object:Gem::Dependency
   name: zipruby
   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'
 - !ruby/object:Gem::Dependency
   name: json
   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'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: A simple hello world gem
@@ -102,26 +91,25 @@ files:
 - bin/subdl
 homepage: https://github.com/andreafrancia/subdl
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Download subtitles for your favorite show.
 test_files: []