subdl 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 88749b74dbf27dfdba46db301bbeb2d302c8ee78
-  data.tar.gz: f2e8bbc9698a7b8470e4e4b01478d31a9ab1a102
+  metadata.gz: d2db16138366c1df81aeaa2223014160c3d3d34c
+  data.tar.gz: c4766a193aab8bd65530651d666cb0aeb0ae3f5c
 SHA512:
-  metadata.gz: af183442e79790255ef4f9b5703b2bf331f3a13ac9e459a63594dc8d11c67b82dab9746c81d2936f2ac7bbd91f802c2ffc9daa3696edce0272def174c940074d
-  data.tar.gz: d166c4af0f2e0a98366ad5e52e173a84a500d5390da7047878a7fc4b8f62762eb43fab7589af37b844219588c83c853c0d2d1b8ade1500e6afa14fe7fb9092a0
+  metadata.gz: ecfbaf73ca2b4cd282b40d5f0599393cd6beeb8d35414439ffa83d2592b1849eb69f5c2636df0eb5068f521873805962c67c5e12b95ef3b81f6be7edac5f075f
+  data.tar.gz: fed07781bea4e3620b5cb5433cbdbfa2b6dbd20e2046ec073a36cdc13f07064f23ae39341dd358d3870d085a4a0df099f1beaf418326c3e7e3e76988de8e4305

data/bin/subdl

@@ -1,10 +1,9 @@
 #!/usr/bin/env ruby
 require 'subdl'
 
-subdl = Subdl.new mechanize_agent, 
-                  ItasaLoginForm.new, 
+subdl = Subdl.new(ItasaAgent.new,
+                  SubtitlesNet.new,
                   $stdout,
-                  FileSystem.new,
-                  FileReader.new
+                  FileSystem.new)
 
 subdl.main ARGV

data/lib/subdl.rb

@@ -4,25 +4,20 @@ require 'json'
 require 'zipruby'
 require 'nokogiri'
 
+require 'subdl/subtitles_net'
+require 'subdl/italiansubs'
+
 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
+      download_sub_for argv.shift
     end
   end
-end
 
-class Crawler
-
-  def initialize itasa, credentials, file_system, stdout
-    @itasa = itasa
-    @credentials = credentials
+  def initialize itasa, subtitles_net, stdout, file_system
+    @itasa = Itasa.new itasa
+    @subtitles_net = subtitles_net
+    @credentials = Credentials.new file_system
     @file_system = file_system
     @stdout = stdout
   end
@@ -31,22 +26,35 @@ class Crawler
     movie_file = MovieFile.new path, @stdout
     ids = @itasa.search_subtitles(movie_file.search_term)
 
-    if not ids.any? 
-      @stdout.puts "No subtitles found on Itasa for: #{path}"
-    end
-
-    ids.each do |id|
-      @itasa.login *@credentials.read
-      @itasa.download_zip id do |zip_contents|
-        unpack_subtitle_to zip_contents, movie_file
+    if ids.any? 
+      ids.each do |id|
+        @itasa.login *@credentials.read
+        @itasa.download_zip id do |zip_contents|
+          unpack_subtitle_to zip_contents, movie_file, 'itasa'
+        end
       end
+    else
+      @stdout.puts "No subtitles found on ITASA for: #{path}"
+      show    = movie_file.show
+      season  = movie_file.season
+      episode = movie_file.episode
+      
+      search_results = SearchResults.new(
+        @subtitles_net.search show, season, episode)
+
+      details_page_link = search_results.subtitles.first.href
+      page = @subtitles_net.get details_page_link
+      details_page = DetailsPage.new page
+
+      zip_contents = @subtitles_net.get details_page.zip_location
+      unpack_subtitle_to zip_contents, movie_file, 'subtitles-net'
     end
   end
 
-  def unpack_subtitle_to zip_contents, movie_file
+  def unpack_subtitle_to zip_contents, movie_file, source_id
     Zip::Archive.open_buffer(zip_contents) do |archive|
       archive.each do |entry|
-        movie_file.save_subtitle entry.read, @file_system
+        movie_file.save_subtitle entry.read, @file_system, source_id
       end
     end
   end
@@ -81,9 +89,10 @@ class MovieFile
     "%s %dx%02d" % [show, season, episode]
   end
 
-  def save_subtitle contents, fs
+  # TODO: accept filename instead of source_id
+  def save_subtitle contents, fs, source_id
     srt_filename = @filename.gsub /.mp4$/, ''
-    srt_filename += ".itasa#{next_distinguisher}.srt"
+    srt_filename += ".#{source_id}#{next_distinguisher}.srt"
     @stdout.puts "Downloaded as #{srt_filename}"
     fs.save_file srt_filename, contents
   end
@@ -105,45 +114,18 @@ class FileSystem
       f.write contents
     end
   end
-end
-
-def mechanize_agent
-  Mechanize.new do |a|
-    a.user_agent_alias = 'Mac FireFox'
-  end
-end
-
-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)
-  end
-
-  private
-
-  def logged_in?
-    return false unless @page
-    link_that_exists_only_once_logged = @page.search(
-      "//a[@href='forum/index.php?action=unreadreplies']")
-    return link_that_exists_only_once_logged.first != nil
+  def read_expand expandable_path
+    File.read(File.expand_path(expandable_path))
   end
-
-
 end
 
 class Itasa
-  def initialize agent, login_form
+  def initialize agent
     @agent = agent
-    @login_form = login_form || ItasaLoginForm.new
   end
 
   def login username, password
-    @login_form.login username, password, "http://#{host}", @agent
+    @agent.login username, password
   end
 
   def search_subtitles text
@@ -201,12 +183,7 @@ class Credentials
     [username, password]
   end
   def read
-    parse @file_reader.read_expand('~/.itasa-credentials')
+    @parsed ||= 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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: subdl
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Andrea Francia