apple-tv-converter 0.0.1 → 0.0.2

data/CHANGELOG

@@ -1,3 +1,7 @@
+v0.0.2
+------
+* Do not clean up all subtitles in the folder after processing one file, ensure that only the current file's are deleted
+
 v0.0.1
 ------
 * Mac OSX implementation

data/README.md

@@ -9,8 +9,19 @@ Media converter for AppleTV.
 - Uses Subler for adding the subtitles and setting the iTunes metadata tags (http://code.google.com/p/subler/)
 - Uses MKVToolNix for extracting the embedded subtitles from MKV files (http://www.bunkus.org/videotools/mkvtoolnix/)
 
+## Command line usage
+
+``` bash
+apple-tv-converter option [option] [option]...
+
+options:
+    - --no-subtitles  # Skips subtitles extraction and addition
+    - --no-metadata   # Skips adding metadata to the converted file 
+    - --no-cleanup    # Skips deleting the source files
+    - Anything not starting with -- is considered a file to convert
+```
+
 # TODO
 
 - Windows implementation
-- Tests!
-- Create a Mac OSX executable for running the script
+- Tests!

data/bin/apple-tv-converter

@@ -0,0 +1,5 @@
+#!/usr/bin/ruby
+
+require 'apple_tv_converter'
+
+command_line = AppleTvConverter::CommandLine.new(*ARGV)

data/lib/apple_tv_converter.rb

@@ -12,6 +12,7 @@ require 'language_list'
 
 require 'apple_tv_converter/version'
 require 'apple_tv_converter/io_patch'
+require 'apple_tv_converter/command_line'
 require 'apple_tv_converter/media_converter'
 require 'apple_tv_converter/media'
 require 'apple_tv_converter/media_converter_adapter'

data/lib/apple_tv_converter/command_line.rb

@@ -0,0 +1,94 @@
+module AppleTvConverter
+  class CommandLine
+    def initialize(*args)
+      @skip_subtitles = false
+      @skip_metadata = false
+      @skip_cleanup = false
+
+      begin
+        options = parse_arguments(args)
+
+        media_objects = options.delete(:media)
+
+        converter = AppleTvConverter::MediaConverter.new(options)
+
+        media_objects.each do |media|
+          converter.process_media media
+        end
+      rescue ArgumentError => e
+        puts "Error: #{e.message}"
+      rescue => e
+        puts "Error: #{e.message}"
+        puts e.backtrace
+      end
+    end
+
+    private
+
+      def parse_arguments(arguments)
+        data = {
+          :skip_subtitles => false,
+          :skip_metadata => false,
+          :skip_cleanup => false,
+          :media => []
+        }
+
+        raise ArgumentError.new("No arguments supplied") unless arguments.any?
+
+        arguments.each do |argument|
+          if argument.strip =~ /^--/
+            # Can be a switch, starting with --
+            if argument.strip =~ /^--no-subtitles$/i
+              data[:skip_subtitles] = true 
+            elsif argument.strip =~ /^--no-metadata$/i
+              data[:skip_metadata] = true 
+            elsif argument.strip =~ /^--no-cleanup$/i
+              data[:skip_cleanup] = true 
+            else
+              raise ArgumentError.new("Unknown switch: #{argument}")
+            end
+          else
+            # Or a file
+            raise ArgumentError.new("File not found: #{argument}") unless File.exists?(argument)
+
+            media = parse_filename(argument)
+
+            raise ArgumentError.new("Invalid media file: #{argument}") unless media
+
+            data[:media] << media
+          end
+        end
+
+        raise ArgumentError.new("No media file supplied") unless data[:media].any?
+
+        return data
+      end
+
+      def parse_filename(file)
+        return nil unless FFMPEG::Movie.new(file).valid?
+
+        # match
+        # [0] - Full string
+        # [1] - Show name
+        begin
+          e = AppleTvConverter::Media.new
+          # Extract name
+          match = File.dirname(file).match(/.*\/(.*?)(?:S(\d+))?$/i)
+          e.show = match[1].strip
+
+          # Extract season an media number
+          match = File.basename(file).match(/.*S?(\d+)[Ex](\d+).*/i)
+          if match
+            e.season = match[1].to_i if match[1]
+            e.number = match[2].to_i if match[2]
+          end
+          e.original_filename = file
+
+          return e
+        rescue => exc
+          puts "Couldn't parse filename, skipping: #{File.basename(file)}"
+          return nil
+        end
+      end
+  end
+end

data/lib/apple_tv_converter/media_converter.rb

@@ -5,45 +5,35 @@ module AppleTvConverter
     def is_windows? ; RUBY_PLATFORM =~/.*?mingw.*?/i ; end
     def is_macosx? ; RUBY_PLATFORM =~/.*?darwin.*?/i ; end
 
-    def initialize
+    def initialize(options = {})
+      @options = {
+        :skip_subtitles => false,
+        :skip_metadata => false,
+        :skip_cleanup => false
+      }.merge(options)
+
       @adapter = is_windows? ? AppleTvConverter::MediaConverterWindowsAdapter.new : AppleTvConverter::MediaConverterMacAdapter.new
     end
 
     def process_media(media)
-      AppleTvConverter.logger.debug "**** #{File.basename(media.original_filename)}"
+      AppleTvConverter.logger.debug "  ** #{File.basename(media.original_filename)}"
       AppleTvConverter.logger.debug "* Video codec: #{media.ffmpeg_data.video_codec}"
       AppleTvConverter.logger.debug "* Audio codec: #{media.ffmpeg_data.audio_codec}"
       AppleTvConverter.logger.debug "* Container: #{media.ffmpeg_data.container}" rescue nil
 
-      extract_subtitles(media) if media.is_mkv?
+      puts "*" * (4 + File.basename(media.original_filename).length)
+      puts "* #{File.basename(media.original_filename)} *"
+      puts "*" * (4 + File.basename(media.original_filename).length)
+
+      extract_subtitles(media) if media.is_mkv? && @options[:skip_subtitles] != true
 
       if @adapter.transcode(media)
-        @adapter.add_subtitles media
-        @adapter.tag media
+        @adapter.add_subtitles(media) unless @options[:skip_subtitles] == true
+        @adapter.tag(media) unless @options[:skip_metadata] == true
 
-        # add_to_itunes media
-        @adapter.clean_up media
+        # @adapter.add_to_itunes media
+        @adapter.clean_up(media) unless @options[:skip_cleanup] == true
       end
     end
-
-    private
-
-      # HELPERS
-      def process_all_medias(medias)
-        medias.each_with_index do |media, index|
-          puts '*' * 80
-          puts "* [#{(index + 1).to_s.rjust(medias.length.to_s.length, ' ')}/#{medias.length}] #{File.basename(media.original_filename)}"
-          
-          process_media media
-        end
-      end
-
-      def process_file(file)
-        puts '*' * 80
-        puts "* #{file}"
-        
-        media = parse_filename(file)
-        process_media media
-      end
   end
 end

data/lib/apple_tv_converter/media_converter_adapter.rb

@@ -1,16 +1,16 @@
 module AppleTvConverter
   class MediaConverterAdapter
     def extract_subtitles(media)
-      printf "*** Extracting subtitles"
+      printf "* Extracting subtitles"
       media.mkv_data.extract_subtitles(File.dirname(media.original_filename)) do |progress|
-        printf "\r* Progress: #{progress}%%"
+        printf "\r  * Progress: #{progress}%%"
       end
-      puts "\r* Progress: [DONE]"
+      puts "\r  * Progress: [DONE]"
     end
 
     def transcode(media)
       if convert?(media)
-        puts "*** Encoding"
+        puts "* Encoding"
 
         options = {
           :video_codec => convert_video?(media) ? 'mpeg4' : 'copy',
@@ -20,10 +20,13 @@ module AppleTvConverter
         options[:custom] = "-qscale 1" if convert_video?(media)
 
         transcoded = media.ffmpeg_data.transcode(media.converted_filename, options) do |progress|
-          printf %Q[\r* Progress: #{(progress * 100).round(2)}%%]
+          printf "\r" + (" " * 40)
+          printf %Q[\r* Encoding Progress: #{(progress * 100).round(2)}%%]
         end
 
-        status transcoded.valid?
+        status = transcoded.valid?
+
+        printf "\r" + (" " * 40)
 
         if status
           puts "\r* Encoding: [DONE]#{' ' * 20}"
@@ -31,7 +34,7 @@ module AppleTvConverter
           puts "\r* Encoding: [ERROR]#{' ' * 20}"
         end
       else
-        puts "*** Encoding: [UNNECESSARY]"
+        puts "* Encoding: [UNNECESSARY]"
         status = true
       end
 
@@ -51,10 +54,10 @@ module AppleTvConverter
     end
 
     def clean_up(media)
-      printf "*** Cleaning up"
+      printf "* Cleaning up"
       begin
         FileUtils.rm(media.original_filename) unless media.original_filename == media.converted_filename
-        FileUtils.rm_r list_files(File.join(File.dirname(media.original_filename), '*.srt'))
+        FileUtils.rm_r list_files(media.original_filename.gsub(File.extname(media.original_filename), '*.srt'))
         puts " [DONE]"
       rescue
         puts " [ERROR]"

data/lib/apple_tv_converter/media_converter_mac_adapter.rb

@@ -1,9 +1,9 @@
 module AppleTvConverter
   class MediaConverterMacAdapter < MediaConverterAdapter
     def add_subtitles(media)
-      puts "*** Adding subtitles"
+      puts "* Adding subtitles"
 
-      printf "* Removing any previous subtitles"
+      printf "  * Removing any previous subtitles"
 
       command_line = %Q[./SublerCLI -remove -dest "#{media.converted_filename}"]
 
@@ -31,13 +31,13 @@ module AppleTvConverter
           AppleTvConverter.logger.debug "Executing:"
           AppleTvConverter.logger.debug command_line
 
-          printf "* Adding #{language.name} subtitles"
+          printf "  * Adding #{language.name} subtitles"
           output = Open3.popen3(command_line) { |stdin, stdout, stderr, wait_thr| stdout.read }
 
           puts output.strip.empty? ? " [DONE]" : " [ERROR]"
         end
       else
-        puts "* No new subtitles found"
+        puts "  * No new subtitles found"
       end
     end
 
@@ -53,7 +53,7 @@ module AppleTvConverter
       AppleTvConverter.logger.debug "Executing:"
       AppleTvConverter.logger.debug command_line
 
-      printf "*** Tagging"
+      printf "* Tagging"
 
       output = Open3.popen3(command_line) { |stdin, stdout, stderr, wait_thr| stdout.read }
 
@@ -63,7 +63,7 @@ module AppleTvConverter
     end
 
     def add_to_itunes(media)
-      printf "*** Adding to iTunes"
+      printf "  * Adding to iTunes"
 
       command_line = [
         "ln -s",

data/lib/apple_tv_converter/version.rb

@@ -1,3 +1,3 @@
 module AppleTvConverter
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: apple-tv-converter
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -95,10 +95,12 @@ description: Converts movies to a format playable on Apple TV. Supporting multip
   subtitles.
 email:
 - pedro@bbde.org
-executables: []
+executables:
+- apple-tv-converter
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/apple_tv_converter/command_line.rb
 - lib/apple_tv_converter/io_patch.rb
 - lib/apple_tv_converter/media.rb
 - lib/apple_tv_converter/media_converter.rb
@@ -110,6 +112,7 @@ files:
 - README.md
 - LICENSE
 - CHANGELOG
+- bin/apple-tv-converter
 homepage: http://github.com/gokuu/apple-tv-converter
 licenses: []
 post_install_message: