apple-tv-converter 0.5.5 → 0.5.6

data/CHANGELOG

@@ -1,3 +1,7 @@
+v0.5.6
+------
+* Fixed "[libfaac @ 0x7ff7bc0e6e00] Specified channel layout '2.1' is not supported" error
+
 v0.5.5
 ------
 * Fixed gem version requirements

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    apple-tv-converter (0.5.5)
+    apple-tv-converter (0.5.6)
       httparty (~> 0)
       imdb (~> 0.6, >= 0.6.8)
       language_list (~> 0.0, >= 0.0.3)

data/lib/apple_tv_converter/command_line.rb

@@ -205,6 +205,8 @@ module AppleTvConverter
             return e
           rescue => exc
             puts "Couldn't parse filename, skipping: #{File.basename(file)}"
+            puts exc.respond_to? :message ? exc.message : exc
+
             return nil
           end
         rescue Errno::ENOENT

data/lib/apple_tv_converter/media_converter_adapter.rb

@@ -104,7 +104,7 @@ module AppleTvConverter
           audio_bitrate ||= media.ffmpeg_data.audio_bitrate || 448
 
           options[:extra] << " -af volume=2.000000" # Increase the volume when transcoding
-          options[:extra] << " -ac #{media.ffmpeg_data.audio_channels || media.audio_streams.first.audio_channels} -ar #{media.ffmpeg_data.audio_sample_rate}"
+          options[:extra] << " -ac #{get_transcoded_audio_channels(media)} -ar #{media.ffmpeg_data.audio_sample_rate}"
           options[:extra] << " -ab #{[audio_bitrate, (media.ffmpeg_data.audio_bitrate || 1000000)].min}k"
         end
 
@@ -325,5 +325,13 @@ module AppleTvConverter
 
         options
       end
+
+      def get_transcoded_audio_channels(media)
+        audio_channels = media.ffmpeg_data.audio_channels || media.audio_streams.first.audio_channels
+        # Fix for "[libfaac @ 0x7ff7bc0e6e00] Specified channel layout '2.1' is not supported" error
+        audio_channels = 4 if audio_channels == 3
+
+        audio_channels
+      end
   end
 end

data/lib/apple_tv_converter/media_converter_mac_adapter.rb

@@ -82,7 +82,7 @@ module AppleTvConverter
           unless media.is_tv_show_episode?
             metadata['Name'] = media.imdb_movie.title.gsub(/"/, '"')
           end
-          metadata['Genre'] = media.imdb_movie.genres.first.gsub(/"/, '"')
+          metadata['Genre'] = media.imdb_movie.genres.first.gsub(/"/, '"') if media.imdb_movie.genres.any?
           metadata['Description'] = media.imdb_movie.plot.gsub(/"/, '"') if media.imdb_movie.plot
           metadata['Release Date'] = media.imdb_movie.year if media.imdb_movie.year
           metadata['Director'] = (media.imdb_movie.director.first || '').gsub(/"/, '"') if media.imdb_movie.director.any?

data/lib/apple_tv_converter/version.rb

@@ -1,3 +1,3 @@
 module AppleTvConverter
-  VERSION = "0.5.5"
+  VERSION = "0.5.6"
 end

metadata

@@ -1,18 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: apple-tv-converter
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.5.6
+  prerelease: 
 platform: ruby
 authors:
 - Pedro Rodrigues
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-06 00:00:00.000000000 Z
+date: 2014-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -20,6 +22,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -27,6 +30,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -37,6 +41,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -47,6 +52,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: streamio-ffmpeg
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -57,6 +63,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -67,6 +74,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: language_list
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -77,6 +85,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -87,6 +96,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: imdb
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -97,6 +107,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -107,6 +118,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -114,6 +126,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -121,6 +134,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -131,6 +145,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -141,6 +156,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: libxml-ruby
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -151,6 +167,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -167,19 +184,22 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- CHANGELOG
-- Gemfile
-- Gemfile.lock
-- LICENSE
-- README.md
-- bin/SublerCLI
-- bin/apple-tv-converter
-- bin/atc-filesystem-watcher
+- lib/apple_tv_converter/apple_tv_converter.sublime-project
+- lib/apple_tv_converter/apple_tv_converter.sublime-workspace
+- 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
+- lib/apple_tv_converter/media_converter_adapter.rb
+- lib/apple_tv_converter/media_converter_mac_adapter.rb
+- lib/apple_tv_converter/media_converter_windows_adapter.rb
+- lib/apple_tv_converter/movie_hasher.rb
+- lib/apple_tv_converter/subtitles_fetcher/opensubtitles.rb
+- lib/apple_tv_converter/tv_db_fetcher.rb
+- lib/apple_tv_converter/version.rb
+- lib/apple_tv_converter.rb
 - gems/streamio-ffmpeg/CHANGELOG
 - gems/streamio-ffmpeg/Gemfile
-- gems/streamio-ffmpeg/LICENSE
-- gems/streamio-ffmpeg/README.md
-- gems/streamio-ffmpeg/Rakefile
 - gems/streamio-ffmpeg/lib/ffmpeg/encoding_options.rb
 - gems/streamio-ffmpeg/lib/ffmpeg/errors.rb
 - gems/streamio-ffmpeg/lib/ffmpeg/io_monkey.rb
@@ -188,6 +208,9 @@ files:
 - gems/streamio-ffmpeg/lib/ffmpeg/transcoder.rb
 - gems/streamio-ffmpeg/lib/ffmpeg/version.rb
 - gems/streamio-ffmpeg/lib/streamio-ffmpeg.rb
+- gems/streamio-ffmpeg/LICENSE
+- gems/streamio-ffmpeg/Rakefile
+- gems/streamio-ffmpeg/README.md
 - gems/streamio-ffmpeg/spec/ffmpeg/encoding_options_spec.rb
 - gems/streamio-ffmpeg/spec/ffmpeg/movie_spec.rb
 - gems/streamio-ffmpeg/spec/ffmpeg/transcoder_spec.rb
@@ -209,42 +232,37 @@ files:
 - gems/streamio-ffmpeg/spec/spec_helper.rb
 - gems/streamio-ffmpeg/spec/streamio-ffmpeg_spec.rb
 - gems/streamio-ffmpeg/streamio-ffmpeg.gemspec
-- lib/apple_tv_converter.rb
-- lib/apple_tv_converter/apple_tv_converter.sublime-project
-- lib/apple_tv_converter/apple_tv_converter.sublime-workspace
-- 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
-- lib/apple_tv_converter/media_converter_adapter.rb
-- lib/apple_tv_converter/media_converter_mac_adapter.rb
-- lib/apple_tv_converter/media_converter_windows_adapter.rb
-- lib/apple_tv_converter/movie_hasher.rb
-- lib/apple_tv_converter/subtitles_fetcher/opensubtitles.rb
-- lib/apple_tv_converter/tv_db_fetcher.rb
-- lib/apple_tv_converter/version.rb
+- bin/apple-tv-converter
+- bin/SublerCLI
+- README.md
+- LICENSE
+- CHANGELOG
+- Gemfile
+- Gemfile.lock
 homepage: http://github.com/gokuu/apple-tv-converter
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 1.8.24
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Converts movies to a format playable on Apple TV.
 test_files: []
+has_rdoc: 

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NGEwYjFkNGY5NGVmYTRmZmI2ZjBhM2FjNDgxYzRiMWYyMDI0NzQyMg==
-  data.tar.gz: !binary |-
-    MTFjZGI1OGY1ZDdmNmJiODE3YzFkMDRhZTNiYjUzZWU2ZmY1NDQ2Nw==
-SHA512:
-  metadata.gz: !binary |-
-    ZmZiZGFiMDhhMWU5NjAzNGFkNDkwMjE3ZDY1MjY5MDc3MzQwMTI2NGE3NWU0
-    MWQ4ZmEzMmM5MjZmNGM4M2IxYTU2MjJlOGQ2NTk5N2YyNThiMDE1YTVkNWNj
-    YjRlMGU1MGFmMTViMjcxZmJmYzMzYTQ1NGQ5NGFmNDMyOTM2YzE=
-  data.tar.gz: !binary |-
-    MzNmMDcwY2I3YjUyM2ZkOWNiYjEzOTBjZWIwZTZmZGQ1MWY0MDI1ZjkwNDU0
-    OGJiM2MyYjY4M2ZhNTFlMWM3ZGE2Y2M3ZjM3ZThkZDg1ODBlYzFjNDVhNTNh
-    MzI2MTcyZmM0Nzc5MzEzYTRmNTYwM2E5Mjg2ZTkxZmNhMzFhZjE=

data/bin/atc-filesystem-watcher

@@ -1,75 +0,0 @@
-#!/usr/bin/ruby
-
-require 'yaml'
-require 'fileutils'
-require 'shellwords'
-# require 'apple_tv_converter'
-
-def debug(message)
-  puts "[#{Process.pid.to_s.ljust(6, ' ')} @ #{Time.now.strftime('%Y/%m/%d %H:%I:%S')}] #{message}"
-  STDOUT.flush
-end
-
-def check_for_file_complete(file)
-  debug "Check for file complete: #{file}"
-  same_size_counter = 0
-  previous_size = 0
-  while true
-    new_size = File.size(file)
-
-    debug "size: #{previous_size} -> #{new_size}"
-
-    if previous_size < new_size
-      same_size_counter = 0
-    else
-      same_size_counter += 1
-    end
-
-    return true if same_size_counter == 3
-
-    previous_size = new_size
-    sleep 1
-  end
-end
-
-
-debug "Starting"
-EXTENSIONS = ["avi", "mov", "mpg", "mpeg", "wmv", "mp4", "mkv", "ogg", "m2ts"]
-
-plist_file = File.read(File.expand_path(File.join('~', 'Library', 'LaunchAgents', 'org.gokuu.apple-tv-converter.plist')))
-
-paths = plist_file.match(/WatchPaths.*?(<array>.*?<string>.*?<\/string>.*?<\/array>)/m)[1].gsub(/<\/?.*?>/, "\n").strip.gsub(/\s{2,}/, "\n").split("\n")
-
-existing_files = File.expand_path(File.join('~', 'Library', 'Application Support', 'apple-tv-converter', 'files.yml'))
-FileUtils.mkdir_p File.dirname(existing_files)
-files = YAML.load_file(existing_files) if File.exists?(existing_files)
-files ||= {}
-
-paths.each do |path|
-  if File.directory?(path)
-    old_existing = files[path] || []
-    new_existing = Dir[File.join(path, '**', '*')].select { |f| !File.directory?(f) }
-
-    to_process = new_existing.select { |new_file| !old_existing.include?(new_file) && EXTENSIONS.include?(File.extname(new_file).gsub(/^\./, '').downcase) }
-
-    if to_process.any?
-      command_line = "/usr/bin/apple-tv-converter --ffmpeg /usr/local/bin/ffmpeg --itunes -l eng,por --imdb --os"
-
-      to_process.each do |f|
-        if check_for_file_complete(f)
-          command_line << %Q[ "#{f}"]
-        end
-      end
-
-      debug command_line
-
-      debug `#{command_line}`
-    end
-
-    files[path] = new_existing
-  end
-end
-
-File.open(existing_files, 'w') { |file| file.write files.to_yaml }
-
-debug "Complete"