mediaman 0.0.4 → 0.0.5

data/lib/mediaman/media_filename.rb

@@ -1,13 +1,26 @@
 module Mediaman
 
+  require "to_name"
+
   class MediaFilename
-    
+
     attr_accessor :filename
   
     def initialize(filename)        
       self.filename = filename
-      parse_name!
-      formatted_name # To init year
+      @parsed_name = self.to_name
+    end
+
+    def to_name
+      fn = ToName.to_name(filename)
+      {
+        name: fn.name,
+        year: fn.year,
+        raw_name: fn.raw_name,
+        location: fn.location,
+        season_number: fn.series,
+        episode_number: fn.episode
+      }
     end
     
     def to_hash
@@ -25,69 +38,15 @@ module Mediaman
       }
     end
   
-    def parse_name!
-      name = self.filename + ".mov"
-    
-      # Normal matching
-      normal_matches = name.match(/^([a-zA-Z0-9.]*)\.S([0-9]{1,2})E([0-9]{1,2}).*$/i)
-      if normal_matches
-        @item_name = normal_matches[1]
-        @season = normal_matches[2].to_i
-        @episode = normal_matches[3].to_i
-      end
-    
-      unless @item_name && @season && @episode
-        # Mythbusters hack
-        mythbusters_matches = name.match(/(myth.*)([0-9][0-9])([0-9][0-9])/i)
-        if mythbusters_matches && mythbusters_matches[1].downcase.include?("myth")
-          @item_name = "Mythbusters"
-          @season = mythbusters_matches[2].to_i
-          @episode = mythbusters_matches[3].to_i
-        end
-      end
-    
-    end
-    
     def raw_name
-      @item_name || self.filename
+      self.filename
     end
     
     def formatted_name
-      perioded_name = []
-      
-      name = 
-    
-      name_string = raw_name.gsub("'", "")
-      name_string = raw_name.gsub(";", "")
-        
-      splitsies = name_string.split(/[ -.\[\]]/)
-      splitsies.each_index do |i|
-        x =  splitsies[i].split(" ")
-        x = x.split("+")
-        x = x.split("_")
-        x = x.split("[")
-        x = x.split("]")
-        splitsies[i] = x
-      end
-    
-      name_done = false
-      i = 0
-      for item in splitsies.flatten
-        int = item.to_i
-        if (1900..Time.now.year + 3).cover?(int) && i > 0
-          @year = int
-          name_done = true
-        elsif item == "720p"
-          name_done = true
-        else
-          perioded_name << item unless name_done
-        end
-        i += 1
-      end    
-      name = perioded_name.join(" ")
+      name = @parsed_name[:name]
     
       # Hacks
-      name.gsub! /Extended( Version)/i, ""
+      name.gsub! /Extended( Version)( Edition)/i, ""
     
       name
     end
@@ -102,11 +61,11 @@ module Mediaman
     end
 
     def season
-      @season
+      @parsed_name[:season_number]
     end
 
     def episode
-      @episode
+      @parsed_name[:episode_number]
     end
 
     def tv?
@@ -114,7 +73,7 @@ module Mediaman
     end
   
     def year
-      @year
+      @parsed_name[:year]
     end
   
     def movie?
@@ -143,10 +102,6 @@ module Mediaman
     def to_s
       formatted_name
     end
-  
-    def debug
-      "name: #{name}, formatted_name: #{formatted_name}, slug: #{slug}, season: #{season}, episode: #{episode}, hd?: #{hd?}, tv?: #{tv?}, string: #{string}"
-    end
-  
+
   end
 end

data/lib/mediaman/trakt.rb

@@ -35,7 +35,7 @@ module Mediaman
     class Movie < Fetcher
       
       def slug
-        "#{options[:title].parameterize}-#{options[:year].to_s.parameterize}"
+        options[:slug].presence || "#{options[:title].parameterize}-#{options[:year].to_s.parameterize}"
       end
       
       def fetch!
@@ -49,12 +49,20 @@ module Mediaman
       attr_accessor :show
       
       def fetch!
-        url = "http://api.trakt.tv/show/episode/summary.json/#{Trakt.api_key}/#{options[:show_title].parameterize}/#{options[:season_number]}/#{options[:episode_number]}"
+        url = "http://api.trakt.tv/show/episode/summary.json/#{Trakt.api_key}/#{slug}"
         self.response = r = self.class.get(url)
         self.show = Trakt::TVShow.from_hash self.response['show']
         self.response['episode']
       end
+
+      def slug
+        options[:slug].presence || "#{name_slug}/#{options[:season_number]}/#{options[:episode_number]}"
+      end
       
+      def name_slug
+        options[:name_slug].presence || "#{options[:show_title].parameterize}"
+      end
+
     end
     
     class TVShow < Fetcher

data/lib/mediaman/version.rb

@@ -1,3 +1,3 @@
 module Mediaman
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/mediaman.gemspec

@@ -22,6 +22,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'mini_subler'
   gem.add_dependency 'httparty'
   gem.add_dependency 'hashie'
+  gem.add_dependency 'toname'
   
   gem.add_development_dependency "rake"
   gem.add_development_dependency "rspec"

data/spec/mediaman/media_filename_spec.rb

@@ -29,6 +29,35 @@ describe Mediaman::MediaFilename do
       h = parse("John Adams.S01E01.720p.HDTV.x264")
       h[:name].should == "John Adams"
     end
+
+    it "Breaking Bad S01E04" do
+      h = parse("Breaking Bad S01E04")
+      h[:name].should == "Breaking Bad"
+      h[:season_number].should == 1
+      h[:episode_number].should == 4
+    end
+
+    it "My Best Friend 6x03" do
+      h = parse("My Best Friend 6x03")
+      h[:name].should == "My Best Friend"
+      h[:season_number].should == 6
+      h[:episode_number].should == 3
+    end
+
+    it "extended editions" do
+      h = parse("The Fall Extended Edition")
+      h[:name].should == "The Fall"
+    end
+
+    it "extended editions" do
+      h = parse("The Fall Extended Version")
+      h[:name].should == "The Fall"
+    end
+
+    it "extended editions" do
+      h = parse("The Fall Extended")
+      h[:name].should == "The Fall"
+    end
   
   end
   

metadata

@@ -2,7 +2,7 @@
 name: mediaman
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - Wil Gieseler
@@ -68,7 +68,7 @@ dependencies:
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: rake
+  name: toname
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
@@ -76,10 +76,10 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version 
         version: "0"
-  type: :development
+  type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: rake
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
@@ -89,6 +89,17 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  version_requirements: *id008
 description: Mediaman manages your media, man.
 email: 
 - supapuerco@gmail.com