mediaman 0.0.2 → 0.0.3

data/README.md

@@ -1,24 +1,91 @@
 # Mediaman
 
-TODO: Write a gem description
+**Mediaman manages your media, man.**
 
-## Installation
+Have video files you need to organize? DVD backups or something?
 
-Add this line to your application's Gemfile:
+## Usage
 
-    gem 'mediaman'
+Mediaman comes with a command line interface called, cleverly enough, `mediaman`. There's a few little commands for you.
 
-And then execute:
+#### Add to Library
 
-    $ bundle
 
-Or install it yourself as:
+    $ mediaman add ~/path/to/movie.mp4
 
-    $ gem install mediaman
+This will take the video file at the passed in path and try to organize it into a library directory structure. Mediaman will try to figure out what the video file represents, and if it can, download metadata about the film or television show.
 
-## Usage
+It does this based on a few simple rules:
+
+- Movies
+
+  If the filename contains text followed by a year, it's assumed to be a movie.
+
+  For example: `Star Wars (1977)` or `star.wars.1977.stereo`.
+
+- TV Shows
+
+  If the filename contains season and episode number info, it's assumed to be a TV show.
+
+  For example: `Star Trek The Next Generation S02E03`.
+
+- Other Media
+
+  Anything else is considered "Other Media".
+
+Then it will throw it into a pretty folder for you. Like this:
+
+    ../Movies/Star Wars (1977).mov
+
+    ../TV Shows/Star Trek - The Next Generation/Season 2/2x03 - Elementary, Dear Data.mov
+
+The library root directory is your current directory, or pass in something else with the `-l` flag.
+
+If it can, it will add the media's metadata (including artwork) to an `mp4` or `mkv` file using Subler.
+
+The artwork image and metadata (in YAML format) will also be saved for your reference in an `Extras` folder in the same directory as the movie file.
+
+#### Get Metadata Only
+
+To save a sidecar YAML file with as much metadata as Mediaman can muster, just use:
+
+    $ mediaman metadata ~/path/to/movie.mp4
+
+#### Help
+
+For more information, try:
+
+    $ mediaman help
+
+## Configuration
+
+To download metadata, we currently use the [Trakt](http://trakt.tv) API, for which you can get a free key [through their website](http://trakt.tv/api-docs/authentication).
+
+Mediaman looks for this information in the environment variable `TRAKT_API_KEY`.
+
+On systems like OS X, the simplest way to have this stick around is to set this in your `~/.bash_profile` like so:
+
+    export TRAKT_API_KEY=86f7e437faa5a7fce15d1ddcb9eaeaea377667b8
+
+Want another service? Pull request please!
+
+## Requirements
+
+- OS X
+
+  Tested only with OS X 10.8 Mountain Lion (so far).
+
+- Ruby 1.9.x
+  
+  This is not the default Ruby shipped with Mountain Lion. You'll have to figure that one out yourself.
+
+## Installation
+
+Install as a Ruby gem:
+
+    $ gem install mediaman
 
-TODO: Write usage instructions here
+Or throw it in your Gemfile and use it directly from Ruby. Your move.
 
 ## Contributing
 

data/lib/mediaman/command.rb

@@ -6,21 +6,20 @@ module Mediaman
     
     desc "add <file>", "sorts the file according to its metadata"
     method_option :library, type: :string, aliases: "-l", desc: "Media library base folder to sort into.", default: "."
-    method_option :batch, type: :boolean, aliases: "-b", desc: "Adds each file or folder in the passed-in folder to the library.", default: false
+    # method_option :batch, type: :boolean, aliases: "-b", desc: "Adds each file or folder in the passed-in folder to the library.", default: false
+    method_option :itunes, type: :boolean, desc: "Attempts to add the final file to iTunes.", default: false
     def add(path)
+      puts "Adding #{File.basename File.expand_path(path)}..."
       library_document = LibraryDocument.from_path path
       library_document.library_path = File.expand_path options[:library]
-      # puts "Sidecar path:"
-      # puts library_document.library_sidecar_path
-      puts "Video:"
-      puts library_document.video_files
-      puts "Junk:"
-      puts library_document.junk_files
-      puts "Files to move:"
-      puts library_document.files_to_move.to_yaml
-      puts "moving"
+      puts "Found #{library_document.video_files.size} video files and #{library_document.junk_files.size} junk files."
       library_document.move_to_library!
       library_document.save_and_apply_metadata!
+      puts "New location: #{library_document.path}."
+      if options[:itunes]
+        library_document.add_to_itunes!
+        puts "Added to iTunes!"
+      end
     end
     
     desc "metadata <file>", "returns all the metadata discoverable about this file or directory"

data/lib/mediaman/document.rb

@@ -33,14 +33,22 @@ module Mediaman
     end
     
     def add_metadata_to_file!
-      h = metadata.to_subler_hash
-      h[:artwork] = artwork_path if File.exists?(artwork_path)
-      puts "Primary: #{primary_video_file}"
-      puts h.to_s
-      MiniSubler::Command.vendored.set_metadata primary_video_file, h
+      if supports_embedding_video_metadata?
+        h = metadata.to_subler_hash
+        h[:artwork] = artwork_path if File.exists?(artwork_path)
+        MiniSubler::Command.vendored.set_metadata primary_video_file, h
+      end
     rescue
       puts "Exception while adding metadata to file."
     end
+
+    def supports_embedding_video_metadata?
+      ext =~ /mp4/i || ext =~ /m4v/i || ext =~ /mkv/i || ext =~ /mov/i
+    end
+
+    def ext
+      File.extname self.path
+    end
     
     def download_image!
       if !File.exists?(artwork_path) && metadata.canonical_image_url.present?
@@ -56,6 +64,11 @@ module Mediaman
     def artwork_path
       extra_path "Artwork#{metadata.canonical_image_url.present? ? File.extname(metadata.canonical_image_url) : ".jpg"}"
     end
+
+    def add_to_itunes!
+      cmd = "osascript -e \"tell application \\\"iTunes\\\" to add POSIX file \\\"#{self.path}\\\"\""
+      `#{cmd}`
+    end
     
     def metadata
       @metadata ||= begin
@@ -71,9 +84,8 @@ module Mediaman
     def local_metadata
       @local_metadata ||= begin
         metadata = {}
-        metadata.merge!(filename_metadata || {})
-        metadata.merge!(video_metadata || {})
         metadata.merge!(sidecar_metadata || {})
+        metadata.merge!(filename_metadata || {})
         metadata.reject!{|k, v| v.blank?}
         Metadata.new(metadata)
       end
@@ -91,6 +103,8 @@ module Mediaman
            tv = Trakt::TVEpisode.new show_title: local_metadata['name'], season_number: local_metadata['season_number'], episode_number: local_metadata['episode_number']
            Metadata.new({'episode_details' => tv.to_hash, 'show_details' => tv.show.to_hash})
          end
+      rescue
+        {}
       end
     end
     

data/lib/mediaman/metadata.rb

@@ -46,7 +46,9 @@ module Mediaman
     def canonical_director
       if movie?
         d = movie_details.try(:[], "people").try(:[], "directors").presence
-        d.map{|director| director.name}.join ", "
+        if d
+          d.map{|director| director.name}.join ", "
+        end
       end
     end
     

data/lib/mediaman/version.rb

@@ -1,3 +1,3 @@
 module Mediaman
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/mediaman.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |gem|
   gem.version       = Mediaman::VERSION
   gem.authors       = ["Wil Gieseler"]
   gem.email         = ["supapuerco@gmail.com"]
-  gem.description   = "Helps you organize your media!"
-  gem.summary       = "Helps you organize your media!"
+  gem.description   = "Mediaman manages your media, man."
+  gem.summary       = "Mediaman manages your media, man."
   gem.homepage      = "http://github.com/supapuerco/mediaman"
 
   gem.files         = `git ls-files`.split($/)

metadata

@@ -2,7 +2,7 @@
 name: mediaman
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Wil Gieseler
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-20 00:00:00 Z
+date: 2012-08-27 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
@@ -89,7 +89,7 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id007
-description: Helps you organize your media!
+description: Mediaman manages your media, man.
 email: 
 - supapuerco@gmail.com
 executables: 
@@ -144,7 +144,7 @@ rubyforge_project:
 rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
-summary: Helps you organize your media!
+summary: Mediaman manages your media, man.
 test_files: 
 - spec/mediaman/media_filename_spec.rb
 - spec/spec_helper.rb