apple-tv-converter 0.1.0 → 0.2.0

data/lib/apple_tv_converter/media_converter_mac_adapter.rb

@@ -1,41 +1,27 @@
 module AppleTvConverter
   class MediaConverterMacAdapter < MediaConverterAdapter
     def add_subtitles(media)
-      puts "* Adding subtitles"
-
-      # No need remove any subtitles, no video will have subtitles!
-      # printf "  * Removing any previous subtitles"
-
-      # command_line = %Q[./SublerCLI -remove -dest "#{media.converted_filename}"]
-
-      # AppleTvConverter.logger.debug "Executing:"
-      # AppleTvConverter.logger.debug command_line
-
-      # output = Open3.popen3(command_line) { |stdin, stdout, stderr, wait_thr| stdout.read }
-
-      # puts output.strip.empty? ? " [DONE]" : (output.strip == 'Error: (null)' ? " [NONE FOUND]" : " [ERROR]")
+      puts "* Adding external subtitles"
 
       if has_subtitles?(media)
         list_files(media.original_filename.gsub(File.extname(media.original_filename), '*.srt')).map do |subtitle_filename|
-          subtitle_filename =~ /(\w{3})\.srt$/
-          language_code = $1 || 'eng'
-
-          language = ::LanguageList::LanguageInfo.find_by_iso_639_3(language_code)
-          language ||= ::LanguageList::LanguageInfo.find_by_iso_639_3('eng')
+          subtitle_filename =~ /\.(\w{3})\.srt$/i
+          language_code = $1 || 'und'
 
+          language_name = get_language_name(language_code)
 
           command_line = "./SublerCLI "
           command_line << %Q[-source "#{subtitle_filename}" ]
-          command_line << %Q[-language "#{language.name}" ]
+          command_line << %Q[-language "#{language_name}" ]
           command_line << %Q[-dest "#{media.converted_filename}"]
 
           AppleTvConverter.logger.debug "Executing:"
           AppleTvConverter.logger.debug command_line
 
-          printf "  * Adding #{language.name} subtitles"
-          output = Open3.popen3(command_line) { |stdin, stdout, stderr, wait_thr| stdout.read }
+          printf "  * Adding #{language_name} subtitles"
+          output, exit_status = Open3.popen3(command_line) { |stdin, stdout, stderr, wait_thr| [ stdout.read, wait_thr.value] }
 
-          puts output.strip.empty? ? " [DONE]" : " [ERROR]"
+          puts exit_status.exitstatus == 0 ? " [DONE]" : " [ERROR]"
         end
       else
         puts "  * No subtitles found"
@@ -44,10 +30,40 @@ module AppleTvConverter
 
     def tag(media)
       metadata = ''
-      metadata << %Q[{Name: #{media.show} S#{media.season.to_s.rjust(2, '0')}E#{media.number.to_s.rjust(2, '0')}}] if media.is_tv_show_episode?
-      metadata << %Q[{Name: #{media.show}}] if media.is_movie?
-      metadata << %Q[{Genre: #{media.show}}{TV Show: #{media.show}}{TV Season: #{media.season}}{TV Episode #: #{media.number}}] if media.is_tv_show_episode?
-      metadata << %Q[{Genre: #{media.quality} Movies}] if media.is_movie?
+
+      if media.is_tv_show_episode?
+        metadata << %Q[{Name: #{media.show} S#{media.season.to_s.rjust(2, '0')}E#{media.number.to_s.rjust(2, '0')}}]
+        metadata << %Q[{Genre: #{media.genre}}]
+        metadata << %Q[{TV Show: #{media.show}}]
+        metadata << %Q[{TV Season: #{media.season}}]
+        metadata << %Q[{TV Episode #: #{media.number}}]
+      else
+        # imdb_movie = load_movie_from_imdb(media)
+
+        # if !imdb_movie
+          metadata << %Q[{Name: #{media.show}}]
+          metadata << %Q[{Genre: #{media.genre}}]
+        # else
+        #   metadata << %Q[{Name: #{imdb_movie.title}}]
+        #   metadata << %Q[{Genre: #{imdb_movie.genres.first}}]
+        #   metadata << %Q[{Description: #{imdb_movie.plot}}]
+        #   metadata << %Q[{Release Date: #{imdb_movie.year}}]
+        #   metadata << %Q[{Director: #{imdb_movie.director.first}}]
+        #   metadata << %Q[{Codirector: #{imdb_movie.director[1]}}] if imdb_movie.director.length > 1
+
+        #   if imdb_movie.poster
+        #     open(imdb_movie.poster) do |f|
+        #       File.open(media.artwork_filename,"wb") do |file|
+        #         file.puts f.read
+        #       end
+        #     end
+
+        #     metadata << %Q[{Artwork: #{media.artwork_filename}}]
+        #   end
+        # end
+      end
+
+      metadata << %Q[{HD Video: true}] if media.hd?
 
       command_line = %Q[./SublerCLI -metadata "#{metadata}" -dest "#{media.converted_filename}"]
 
@@ -56,44 +72,48 @@ module AppleTvConverter
 
       printf "* Tagging"
 
-      output = Open3.popen3(command_line) { |stdin, stdout, stderr, wait_thr| stdout.read }
+      output, exit_status = Open3.popen3(command_line) { |stdin, stdout, stderr, wait_thr| [ stdout.read, wait_thr.value ] }
 
-      puts output.strip.empty? ? " [DONE]" : " [ERROR]"
+      puts exit_status.exitstatus == 0 ? " [DONE]" : " [ERROR]"
 
       return output.strip.empty?
     end
 
     def add_to_itunes(media)
-      printf "  * Adding to iTunes"
+      printf "* Adding to iTunes"
 
       command_line = [
-        "ln -s",
-        "#{media.converted_filename}".gsub(/\s/, '\ ').gsub(/\[/, '\[').gsub(/\]/, '\]'),
-        "#{File.expand_path(File.join('~', 'Music', 'iTunes', 'iTunes Media', 'Automatically Add to iTunes.localized'))}".gsub(/\s/, '\ ').gsub(/\[/, '\[').gsub(/\]/, '\]')
+        'osascript',
+        '-e',
+        %Q['tell application "iTunes" to set results to (every file track of playlist "Library" whose name equals "#{media.name}")']
       ].join(' ')
 
       AppleTvConverter.logger.debug "Executing:"
       AppleTvConverter.logger.debug command_line
+      output, exit_status = Open3.popen3(command_line) { |stdin, stdout, stderr, wait_thr| [ stdout.read, wait_thr.value ] }
+
+      if output.strip.blank?
+        # Blank result means the file isn't in the library
+        command_line = [
+          'osascript',
+          '-e',
+          %Q['tell application "iTunes" to add POSIX file "#{media.converted_filename}"']
+        ].join(' ')
+
+        AppleTvConverter.logger.debug "Executing:"
+        AppleTvConverter.logger.debug command_line
+        output, exit_status = Open3.popen3(command_line) { |stdin, stdout, stderr, wait_thr| [ stdout.read, wait_thr.value ] }
 
-      `#{command_line}`
+        puts ' [DONE]'
+      else
+        puts ' [NOT NECESSARY]'
+      end
 
-      puts ' [DONE]'
       return true
     end
 
     def list_files(ls)
-      `ls -1 #{ls.gsub(/\s/, '\ ').gsub(/\[/, '\[').gsub(/\]/, '\]')} 2>/dev/null`.split("\n")
+      `ls -1 #{Shellwords.escape(ls).gsub(/\\\*/, '*')} 2>/dev/null`.split("\n")
     end
-
-    protected
-
-      def get_transcode_options(media)
-        options = {
-          :video_codec => convert_video?(media) ? 'mpeg4' : 'copy',
-          :audio_codec => convert_audio?(media) ? 'libfaac' : 'copy'
-        }
-
-        return options
-      end
   end
 end

data/lib/apple_tv_converter/version.rb

@@ -1,3 +1,3 @@
 module AppleTvConverter
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: apple-tv-converter
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-20 00:00:00.000000000 Z
+date: 2013-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec