bathyscaphe 0.1.4 → 0.1.5

data/README.md

@@ -31,6 +31,9 @@ or just
 
 ### Changelog
 
+#### 0.1.4
+- Ability to get season, name and episode based on folder, so we can parse something like this «Grey's anatomy - Season 1 Full - ENG/01-A hard day's night.srt»
+
 #### 0.1.3
 - RDoc + Refactoring
 

data/lib/bathyscaphe.rb

@@ -8,4 +8,10 @@ module Bathyscaphe
   end  
 end
 
-Bathyscaphe.require_all_libs_relative_to(__FILE__)
+Bathyscaphe.require_all_libs_relative_to(__FILE__)
+
+class Object
+  def blank?
+    respond_to?(:empty?) ? empty? : !self
+  end
+end

data/lib/bathyscaphe/config.rb

@@ -5,7 +5,11 @@ require 'yaml'
 CONFIG_FILENAME  = File.expand_path("~/.config/bathyscaphe/bathyscaphe.conf")
 
 CONFIG_DEFAULTS = {
-  :source => 'http://addic7ed.com'
+  :consumer_key => "",
+  :consumer_secret => "",
+  :oauth_token => "",
+  :oauth_token_secret => "",
+  :username => ""
 }
 
 module Bathyscaphe
@@ -16,12 +20,16 @@ module Bathyscaphe
     }
 
     def self.parse_options
+      options = {}
       optparser = OptionParser.new do |opts|
         opts.set_summary_indent('  ')
         opts.banner = "Usage: #{File.basename($0)} [OPTIONS] TV_SHOW"
         # opts.on( "-s", "--source SOURCE", String, "Set source to download subtitles from","Current: #{self.source}" ) { |o| self.source = o ; self.save }
         opts.on( "-d", "--dry-run", "Parse filename but do not download anything") { |o| OPTIONS[:dry_run] = o}
-
+        opts.on( "-v", "--version", "Show version") do
+          options[:version] = true
+          puts Bathyscaphe::VERSION
+        end
         opts.on_tail( "-h", "--help", "Show usage") do
           puts opts
           exit
@@ -31,7 +39,7 @@ module Bathyscaphe
       begin
         optparser.parse!
         if ARGV.empty?
-          puts optparser
+          puts optparser unless options[:version]
           exit
         else
           tv_show = ARGV[0]

data/lib/bathyscaphe/tvdb.rb

@@ -3,27 +3,45 @@ module Bathyscaphe
 
     TVREGEXP1 = /(.*)S([0-9]{2})E([0-9]{2}).*/i
     TVREGEXP2 = /(.*).([0-9]{1,2})x([0-9]{1,2}).*/i
+    TVREGEXP3 = /(.*)Season\s*([0-9]{1,2})\s*Episode\s*([0-9]{1,2}).*/i
+
+    TVREGEXP4 = /.*\/(.*)\/Season\s*([0-9]{1,2})\/([0-9]{1,2}).*/i
+    TVREGEXP5 = /.*\/(.*)\/Season\s*([0-9]{1,2})\/.*S(?:[0-9]{2})E([0-9]{2}).*/i
 
     attr_accessor :name, :season, :episode
 
     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)  
+
+      wholefile = File.join(filedir, filename)
+      @name = @season = @episode = nil
+
+      if md = filename.match(TVREGEXP1) || md = filename.match(TVREGEXP2) || md = filename.match(TVREGEXP3)
+        @name, @season, @episode = get_from_md(md)
+      end
+      return unless [@name, @season, @episode].collect(&:blank?).any?
+
+      if md = wholefile.match(TVREGEXP4) || md = wholefile.match(TVREGEXP5)
+        @name, @season, @episode = get_from_md(md)
+      end
+      return unless [@name, @season, @episode].collect(&:blank?).any?
+
+      if 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
+
+    end
+
+    def get_from_md(md)
+      name = md[1].gsub(/[-.]+/i, " ").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
+      return name, season, episode
     end
   end
 end

data/lib/bathyscaphe/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bathyscaphe
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-25 00:00:00.000000000 Z
+date: 2012-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri