bathyscaphe 0.1.3 → 0.1.4

data/.gitignore

@@ -1,2 +1,3 @@
 .DS_Store
+Gemfile.lock
 pkg

data/README.md

@@ -29,12 +29,6 @@ or just
     -d, --dry-run                    Parse filename but do not download anything
     -h, --help                       Show usage
 
-### TODO
-
-  1. Test regexp for matching more tv-show names
-  2. Write some tests
-  3. Maybe add other sources
-
 ### Changelog
 
 #### 0.1.3
@@ -45,10 +39,16 @@ or just
 - LICENCE defined
 
 #### 0.1.1
-Readme chenged =)
+- Readme changed =)
 
 #### 0.1.0
-Initial release
+- Initial release
+
+### TODO
+
+  1. Test regexp for matching more tv-show names
+  2. Write some tests
+  3. Maybe add other sources
 
 ### Authors
 

data/bin/bathyscaphe

@@ -14,9 +14,9 @@ file_dir = File.expand_path(File.dirname(file_arg))
 
 
 begin
-  tv_show = Bathyscaphe::TVDB.new(file_name)
+  tv_show = Bathyscaphe::TVDB.new(file_name, file_dir)
 rescue Exception => e
-  puts "\e[31m"+e+". Shame on us. \e[0m"
+  puts "\e[31m"+e.to_s+". Shame on us. \e[0m"
   exit
 end
 

data/lib/bathyscaphe/addic7ed.rb

@@ -122,9 +122,11 @@ module Bathyscaphe
     rescue URI::InvalidURIError => e
       STDERR.puts "\e[31m"+"We generated url the wrong way. Shame on us."+"\e[0m"
       STDERR.puts e
+      STDERR.puts episode_link(:lang)
       exit
     rescue OpenURI::HTTPError => the_error
       STDERR.puts "\e[31m"+"Server responded with funny status code #{the_error.io.status[0]}. Haven't seen it yet."+"\e[0m"
+      STDERR.puts episode_link(:lang)
       exit
     end
 

data/lib/bathyscaphe/tvdb.rb

@@ -6,13 +6,21 @@ module Bathyscaphe
 
     attr_accessor :name, :season, :episode
 
-    def initialize filename
+    def initialize filename, filedir
       if md = filename.match(TVREGEXP1) || md = filename.match(TVREGEXP2)
         @name = md[1].gsub(".", " ").strip
         @name = "Castle" if @name =~ /Castle 2009/i
         @name = "Missing (2012)" if @name =~ /Missing 2012/i
         @season = md[2].to_i.to_s
         @episode = md[3].to_i.to_s
+      elsif md = filedir.split("/").last.match(/(.*)Season(.*)/i)  
+        @name = md[1].gsub(/[-.]+/i, ' ').gsub("'", '').strip
+        @season = md[2].strip.scan(/^(\d+).*/).flatten.last.to_i.to_s
+        if namemd = filename.match(/(\d*).*/)
+          @episode = namemd[1].to_i.to_s
+        else
+          raise("Cant't parse filename")  
+        end
       else
         raise("Cant't parse filename")
       end

data/lib/bathyscaphe/version.rb

@@ -1,3 +1,3 @@
 module Bathyscaphe
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,44 +1,41 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: bathyscaphe
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 3
-  version: 0.1.3
+version: !ruby/object:Gem::Version
+  version: 0.1.4
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Ilia Zemskov
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-05-09 00:00:00 +04:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-05-25 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: nokogiri
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-description: Simple gem to download subtitles for tv-show episodes from addic7ed.com. Subtitles are searched based on file name.
-email: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: Simple gem to download subtitles for tv-show episodes from addic7ed.com.
+  Subtitles are searched based on file name.
+email:
 - il.zoff@gmail.com
-executables: 
+executables:
 - bathyscaphe
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - LICENSE
@@ -51,35 +48,29 @@ files:
 - lib/bathyscaphe/config.rb
 - lib/bathyscaphe/tvdb.rb
 - lib/bathyscaphe/version.rb
-has_rdoc: true
 homepage: https://github.com/ilzoff/bathyscaphe
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+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: bathyscaphe
-rubygems_version: 1.3.6
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Simple gem to download subtitles from addic7ed.com
 test_files: []
-