mediaman 0.0.5 → 0.0.6

data/lib/mediaman/document.rb

@@ -98,9 +98,9 @@ module Mediaman
     def remote_metadata
       @remote_metadata ||= begin
          if local_metadata['movie']
-           Metadata.new({'movie_details' => Trakt::Movie.new(title: local_metadata['name'], year: local_metadata['year'])})
+           Metadata.new({'movie_details' => Trakt::Movie.new(title: local_metadata['name'], year: local_metadata['year'], title_slug: local_metadata['title_slug'])})
          elsif local_metadata['tv']
-           tv = Trakt::TVEpisode.new show_title: local_metadata['name'], season_number: local_metadata['season_number'], episode_number: local_metadata['episode_number']
+           tv = Trakt::TVEpisode.new show_title: local_metadata['name'], season_number: local_metadata['season_number'], episode_number: local_metadata['episode_number'], title_slug: local_metadata['title_slug']
            Metadata.new({'episode_details' => tv.to_hash, 'show_details' => tv.show.to_hash})
          end
       rescue

data/lib/mediaman/media_filename.rb

@@ -7,10 +7,15 @@ module Mediaman
     attr_accessor :filename
   
     def initialize(filename)        
-      self.filename = filename
+      self.filename = override_filename filename
       @parsed_name = self.to_name
     end
 
+    def override_filename(name)
+      name.gsub!("2012", "") if name.include?("Newsroom")
+      name
+    end
+
     def to_name
       fn = ToName.to_name(filename)
       {
@@ -34,7 +39,8 @@ module Mediaman
         season_number: self.season,
         episode_number: self.episode,
         hd: self.hd?,
-        hd_format: self.hd_format
+        hd_format: self.hd_format,
+        title_slug: self.title_slug
       }
     end
   
@@ -46,9 +52,9 @@ module Mediaman
       name = @parsed_name[:name]
     
       # Hacks
-      name.gsub! /Extended( Version)( Edition)/i, ""
+      name.gsub! /Extended( Version)?( Edition)?/i, ""
     
-      name
+      name.strip.chomp
     end
   
     def title_slug

data/lib/mediaman/trakt.rb

@@ -56,11 +56,11 @@ module Mediaman
       end
 
       def slug
-        options[:slug].presence || "#{name_slug}/#{options[:season_number]}/#{options[:episode_number]}"
+        options[:slug].presence || "#{title_slug}/#{options[:season_number]}/#{options[:episode_number]}"
       end
       
-      def name_slug
-        options[:name_slug].presence || "#{options[:show_title].parameterize}"
+      def title_slug
+        options[:title_slug].presence || "#{options[:show_title].parameterize}"
       end
 
     end

data/lib/mediaman/version.rb

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

data/spec/mediaman/media_filename_spec.rb

@@ -44,19 +44,39 @@ describe Mediaman::MediaFilename do
       h[:episode_number].should == 3
     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
+    it "extended version" 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"
+    it "Newsroom 2012" do
+      h = parse("The Newsroom 2012 S01E01")
+      h[:tv].should be_true
+      h[:name].should == "The Newsroom"
+      h[:title_slug].should == "the-newsroom-2012"
+      h[:season_number].should == 1
+      h[:episode_number].should == 1
+    end
+
+    it "Newsroom 2012" do
+      h = parse("The Newsroom S01E01")
+      h[:tv].should be_true
+      h[:name].should == "The Newsroom"
+      h[:title_slug].should == "the-newsroom-2012"
+      h[:season_number].should == 1
+      h[:episode_number].should == 1
     end
   
   end

metadata

@@ -2,7 +2,7 @@
 name: mediaman
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors: 
 - Wil Gieseler