subdl 0.0.3 → 0.0.4

data/lib/subdl.rb

@@ -4,6 +4,7 @@ require 'json'
 require 'zipruby'
 
 class Crawler
+
   def initialize itasa
     @itasa = itasa
   end
@@ -11,13 +12,25 @@ class Crawler
   def download_sub_for path
     movie_file = MovieFile.new(path)
     @itasa.each_id movie_file.search_term do |id, showname|
-      @itasa.unpack_subtitle_to id, movie_file.srt_file
+      @itasa.download_zip id do |zip_contents|
+        unpack_subtitle_to zip_contents, movie_file
+      end
     end
   end
+
+  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
+      end
+    end
+  end
+
 end
 
 class MovieFile
   attr_reader :episode, :season, :show
+  attr_writer :fs
   def initialize filename
     @filename = filename
     text = File.basename filename
@@ -28,6 +41,7 @@ class MovieFile
       @season = remove_leading_zeros m[2]
       @episode = remove_leading_zeros m[3]
     end
+    @fs = FileSystem
   end
 
   def remove_year_from text
@@ -37,20 +51,31 @@ class MovieFile
   def remove_leading_zeros text
     text.gsub /^0*/, ''
   end
+
   def search_term
     "%s %dx%02d" % [show, season, episode]
   end
-  def srt_file
-    WritableFile.new "#{@filename}.itasa.srt"
+
+  def add_subtitle contents
+    srt_filename = @filename.gsub /.mp4$/, ''
+    srt_filename += ".itasa#{next_distinguisher}.srt"
+    @fs.save_file srt_filename, contents
   end
-end
 
-class WritableFile
-  def initialize path
-    @path = path
+  def next_distinguisher
+    if @subs_added
+      distinguisher = ".#{@subs_added}"
+    else
+      distinguisher = ''
+    end    
+    @subs_added = @subs_added.to_i + 1
+    return distinguisher
   end
-  def save contents
-    File.open @path, 'w' do |f|
+end
+
+class FileSystem
+  def self.save_file filename, contents
+    File.open filename, 'w' do |f|
       f.write contents
     end
   end
@@ -87,17 +112,12 @@ class Itasa
     nil
   end
 
-  def unpack_subtitle_to id, dest
+  def download_zip id
     url = "http://#{host}/index.php?option=com_remository&Itemid=6&func=fileinfo&id=#{id}"
     page = @agent.get url
     download_link = page.search("//a[img[contains(@src,'download2.gif')]]").first
     zipped_subtitle = @agent.get download_link[:href]
-    zip_contents = zipped_subtitle.body
-    Zip::Archive.open_buffer(zip_contents) do |archive|
-      archive.each do |entry|
-        dest.save entry.read
-      end
-    end
+    yield zipped_subtitle.body
   end
 
   def host

metadata

@@ -1,135 +1,127 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: subdl
-version: !ruby/object:Gem::Version 
-  hash: 25
+version: !ruby/object:Gem::Version
+  version: 0.0.4
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 3
-  version: 0.0.3
 platform: ruby
-authors: 
+authors:
 - Andrea Francia
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-03-14 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-03-14 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: mechanize
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: zipruby
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  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 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: json
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  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 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    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
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    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
-  version_requirements: *id005
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A simple hello world gem
 email: andrea@andreafrancia.it
-executables: 
+executables:
 - subdl
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/subdl.rb
 - bin/subdl
 homepage: https://github.com/andreafrancia/subdl
 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: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Download subtitles for your favorite show.
 test_files: []
-