apple-tv-converter 0.4.4 → 0.5.1

data/CHANGELOG

@@ -1,6 +1,15 @@
+v0.5.0
+------
+* Added option for renaming a file to the format recommended by Plex
+* Now fetches metadata for TV show episodes from TheTVDB.com instead of IMDB
+* When fetching metadata by name, and several records are found, the user now has the choice of which to use
+* Correctly set Media Kind metadata tag for both TV show episodes and Movies
+* Some other fixes
+
 v0.4.4
 ------
 * Support Ruby v1.8.7
+* Fetch IMDB metadata for TV show episodes as well
 
 v0.4.1
 ------

data/Gemfile

@@ -3,5 +3,8 @@ source RUBY_VERSION =~ /^1\.8/ ? 'https://rubygems.org' : :rubygems
 gemspec
 
 gem 'streamio-ffmpeg', :path => File.expand_path(File.join(File.dirname(__FILE__), 'gems', 'streamio-ffmpeg'))
-gem 'language_list'
-gem 'imdb'
+# gem 'language_list'
+# gem 'imdb'
+# gem 'httparty'
+# gem 'rubyzip', '< 1.0.0'
+# gem 'libxml-ruby'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    apple-tv-converter (0.4.2)
+    apple-tv-converter (0.5.0)
       imdb (~> 0.6.8)
       language_list (~> 0.0.3)
       streamio-ffmpeg (~> 0.9.0)
@@ -14,12 +14,17 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    awesome_print (1.1.0)
     diff-lcs (1.1.3)
     hpricot (0.8.6)
+    httparty (0.11.0)
+      multi_json (~> 1.0)
+      multi_xml (>= 0.5.2)
     imdb (0.6.8)
       hpricot (~> 0.8.4)
     language_list (0.0.3)
+    libxml-ruby (2.3.3)
+    multi_json (1.8.0)
+    multi_xml (0.5.5)
     rake (0.9.6)
     rspec (2.12.0)
       rspec-core (~> 2.12.0)
@@ -29,6 +34,7 @@ GEM
     rspec-expectations (2.12.1)
       diff-lcs (~> 1.1.3)
     rspec-mocks (2.12.2)
+    rubyzip (0.9.9)
 
 PLATFORMS
   ruby
@@ -36,9 +42,11 @@ PLATFORMS
 
 DEPENDENCIES
   apple-tv-converter!
-  awesome_print
+  httparty
   imdb
   language_list
+  libxml-ruby
   rake (~> 0.9.2)
   rspec (~> 2.7)
+  rubyzip (< 1.0.0)
   streamio-ffmpeg!

data/README.md

@@ -6,23 +6,32 @@ Now, it also supports automatically downloading subtitles from [opensubtitles.or
 ## On Mac OSX
 
 - Uses [ffmpeg](http://ffmpeg.org) to encode video and audio, as well as extracting embedded subtitles
-- Uses [Subler](http://code.google.com/p/subler/)'s command line interface to add the subtitles and set the iTunes metadata tags 
+- Uses [Subler](http://code.google.com/p/subler/)'s command line interface to add the subtitles and set the iTunes metadata tags
 
 # Command line usage
 
 ``` bash
 Usage: apple-tv-converter [options] [file]
        [file] must be provided unless the -d (--dir) switch is present.
-        --no-transcoding             Don't transcode video or audio
-        --no-subtitles               Don't add subtitles
-        --no-metadata                Don't add metadata
-        --no-cleanup                 Don't cleanup the source files after processing
+    -i, --id id                      Set a specific id for fetching metadata from online services
     -l, --languages eng,por,...      Only keep audio and subtitles in the specified languages
-    -d, --dir [DIRECTORY]            Process all files in DIRECTORY recursively
+    -d, --dir DIRECTORY              Process all files in DIRECTORY recursively
         --itunes                     Add processed file to iTunes library, if it isn't present yet
-        --imdb [ID]                  Gather data from IMDB (optionally specifying movie id. If an id isn't specified
-                                     the program looks for a file on the same directory, named <id>.imdb)
         --os                         Download subtitles and infer IMDB ID from opensubtitles.org
+        --plex                       Rename file(s) to Plex Media Server recommended format
+
+        --no-transcoding             Don't transcode video or audio
+        --no-subtitles               Don't add subtitles
+        --no-metadata                Don't add metadata (implies --no-online-metadata)
+        --no-online-metadata         Don't fetch metadata from online services (IMDB or TheTVDB)
+        --no-interactive             Perform all operations without user intervention, using sensible defaults
+        --no-cleanup                 Don't cleanup the source files after processing
+
+Other options:
+    -f, --ffmpeg LOCATION            Set path to ffmpeg binary
+
+DEPRECATED options:
+        --imdb                       Gather data from IMDB (optionally specifying movie id)
 
 Common options:
     -h, --help                       Show this message
@@ -31,26 +40,47 @@ Common options:
 
 ## Remarks
 
-- The file metadata name is set according to the file's directory name, ie, the file `/Home Movie 1/movie.mkv` is converted to `/Home Movie 1/movie.mp4` and the name on metadata is set as `Home Movie 1`.
-    - For TV Show episodes, the metadata name is a concatenation of the directory (removing a reference to the season number, in the format Sxx) with the season and episode number, ie, `/TV Show S01/tv.show.s01e01.mkv` will have, after conversion, the name `TV Show S01E01`.
-    Episode and season information is captured from the file name, in the formats S01E01 or 1x01 (case insensitive).
-- The file genre is set from the directory name, for tv shows (ie, `/TV Show S01/tv.show.s01e01.mkv` will have the genre `TV Show`), and according to the movie's size (ie, `1080p Movies`, `720p Movies`, and `XviD movies`).
+### Subtitles
+
 - External subtitles must be in SubRip (srt) format and have the same name as the file, optionally appending the language's code ie, for movie `/Home Movie 1/movie.mkv`, will load subtitles from file `/Home Movie 1/movie.srt` or `/Home Movie 1/movie.<language>.mkv`
     - Subtitles with appended language code will have the correct language set in metadata.
         - Language codes should be [ISO 639-3](http://www.iso.org/iso/home/standards/language_codes.htm) codes (mostly, I haven't quite figured all the languages yet =)
 
-    Example: 
+    Example:
     For the movie file `/Home Movie 1/movie.mkv`, the following subtitle files are loaded:
 
     - `/Home Movie 1/movie.srt` (language 'Unknown')
     - `/Home Movie 1/movie.eng.srt` (language 'English')
     - `/Home Movie 1/movie.2.por.srt` (language 'Portuguese'. Note: the _2_ is an mkvinfo id when extracted from an MKV movie)
 
+### Metadata
+
+Metadata can be obtained automatically from IMDB.com(http://www.imdb.com) (for movies) or from TheTVDB.com(http://www.thetvdb.com) (for TV show episodes). The latter also falls back to IMDB for necessary information. Most metadata will be filled, including the file's artwork, so it displays a nice image on iTunes library.
+
+#### Fallbacks
+
+If the data can't be found on neither site, there is a fallback for how metadata is set:
+- The file metadata name is set according to the file's directory name, ie, the file `/Home Movie 1/movie.mkv` is converted to `/Home Movie 1/movie.mp4` and the name on metadata is set as `Home Movie 1`.
+    - An exception to this is when the directory name has the format `Season XX`. In this situation the name is obtained from the 'grandparent' folder, ie, the file `/Home Movie 1/Season 1/movie.mp4` wil have the name on metadata set to `Home Movie 1`.
+- For TV Show episodes, the metadata name is a concatenation of the directory (removing a reference to the season number, in the format Sxx) with the season and episode number, ie, both `/TV Show S01/tv.show.s01e01.mkv` and `/TV Show/Season 1/tv.show.s01e01.mkv` will have, after conversion, the name `TV Show S01E01`.
+    Episode and season information is captured from the file name, in the formats S01E01 or 1x01 (case insensitive).
+- The file genre is set from the directory name, for tv shows (ie, `/TV Show S01/tv.show.s01e01.mkv` will have the genre `TV Show`), and according to the movie's size (ie, `1080p Movies`, `720p Movies`, and `XviD Movies`).
+
+### Plex Media Server
+
+For Plex Media Server users, you can pass the command-line option `--plex` to automatically rename the file after conversion following the recommended file name convention. For files with multiple TV show episodes, the first and last episodes are identified in the file name (if it was possible to infer from the original filename).
+
+### Other remarks
+
+After conversion, `apple-tv-converter` will create a file named `.apple-tv-converter.data` on the base directory of the file containing some information (IMDB id, TheTVDB id, etc.) that can be useful for subsequent processing).
+
 ## Thanks
 
-**Subtitles service powered by www.OpenSubtitles.org**
-![pensubtitles.org logo](http://static.opensubtitles.org/gfx/logo-transparent.png)
+**Subtitles service powered by [www.OpenSubtitles.org](http://www.opensubtitles.org)**
+![opensubtitles.org logo](http://static.opensubtitles.org/gfx/logo-transparent.png)
 
+**Movie metadata service powered by [www.imdb.com](http://www.imdb.com)**
+**TV Show metadata service powered by [www.thetvdb.com](http://www.thetvdb.com)**
 
 # TODO
 

data/bin/atc-filesystem-watcher

@@ -0,0 +1,75 @@
+#!/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"

data/gems/streamio-ffmpeg/lib/ffmpeg/movie.rb

@@ -93,6 +93,7 @@ module FFMPEG
       return @audio_channels[/\d*/].to_i if @audio_channels["channels"]
       return 1 if @audio_channels["mono"]
       return 2 if @audio_channels["stereo"]
+      return 4 if @audio_channels["4.0"]
       return 6 if @audio_channels["5.1"]
     end
 
@@ -169,6 +170,7 @@ module FFMPEG
       audio_bitrate = audio_bitrate =~ %r(\A(\d+) kb/s(?: \(default\))\Z) ? $1.to_i : nil
       audio_sample_rate = audio_sample_rate[/\d*/].to_i
 
+      stream.send :language=, 'und' if stream.language.nil?
       stream.send :audio_codec=, audio_codec
       stream.send :audio_sample_rate=, audio_sample_rate
       stream.send :audio_channels=, audio_channels
@@ -192,6 +194,7 @@ module FFMPEG
       subtitle_codec = line.split("\n").first.gsub(/^.*?Subtitles?:\s/, '').strip
       subtitle_format = subtitle_codec.split(/\s+/).first
 
+      stream.send :language=, 'und' if stream.language.nil?
       stream.send :subtitle_codec=, subtitle_codec
       stream.send :subtitle_format=, subtitle_format
     end

data/lib/apple_tv_converter.rb

@@ -6,8 +6,6 @@ require 'logger'
 require 'stringio'
 require 'shellwords'
 require 'open3'
-# require 'streamio-ffmpeg'
-# require 'awesome_print'
 require 'fileutils'
 require 'language_list'
 require 'open-uri'
@@ -16,19 +14,19 @@ require "xmlrpc/client"
 require 'net/http'
 require 'uri'
 require 'base64'
-
-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/movie_hasher'
-require 'apple_tv_converter/subtitles_fetcher/opensubtitles'
-require 'apple_tv_converter/media_converter_adapter'
-require 'apple_tv_converter/media_converter_windows_adapter' if RUBY_PLATFORM =~ /(win|w)(32|64)$/
-require 'apple_tv_converter/media_converter_mac_adapter' if RUBY_PLATFORM =~ /(darwin)/
+require 'zlib'
 
 module AppleTvConverter
+
+  # Determine whether running on Windows
+  #
+  # @return [boolean] true if running on Windows
+  def self.is_windows? ; RUBY_PLATFORM =~/.*?mingw.*?/i ; end
+  # Determine whether running on Mac OS X
+  #
+  # @return [boolean] true if running on Mac OS X
+  def self.is_macosx? ; RUBY_PLATFORM =~/.*?darwin.*?/i ; end
+
   # AppleTvConverter logs information about its progress when it's transcoding.
   # Jack in your own logger through this method if you wish to.
   #
@@ -80,7 +78,20 @@ module AppleTvConverter
     @atomic_parsley_binary.nil? ? 'AtomicParsley' : @atomic_parsley_binary
   end
 
-  def get_language_name(language_code)
+  def self.copy(from, to)
+    open(from) do |f|
+      File.open(to, "wb") do |file|
+        file.puts f.read
+      end
+    end
+  end
+
+  def self.data_path()
+    @data_path ||= File.expand_path(File.join('~', 'Library', 'Application Support', 'apple-tv-converter')) if is_macosx?
+    @data_path
+  end
+
+  def self.get_language_name(language_code)
     return language_code if language_code.length > 3
 
     # ??? - English
@@ -141,3 +152,15 @@ module AppleTvConverter
     return nil
   end
 end
+
+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/movie_hasher'
+require 'apple_tv_converter/subtitles_fetcher/opensubtitles'
+require 'apple_tv_converter/tv_db_fetcher'
+require 'apple_tv_converter/media_converter_adapter'
+require 'apple_tv_converter/media_converter_windows_adapter' if RUBY_PLATFORM =~ /(win|w)(32|64)$/
+require 'apple_tv_converter/media_converter_mac_adapter' if RUBY_PLATFORM =~ /(darwin)/

data/lib/apple_tv_converter/apple_tv_converter.sublime-workspace

@@ -520,90 +520,108 @@
 	"buffers":
 	[
 		{
-			"file": "subtitles_fetcher/opensubtitles.rb",
+			"file": "media_converter.rb",
 			"settings":
 			{
-				"buffer_size": 7535,
-				"line_ending": "Unix"
+				"buffer_size": 3737,
+				"line_ending": "Windows"
 			}
 		},
 		{
-			"file": "media_converter.rb",
+			"file": "/Users/pedro/development/personal/apple-tv-converter/apple_tv_converter.gemspec",
 			"settings":
 			{
-				"buffer_size": 3735,
-				"line_ending": "Windows"
+				"buffer_size": 996,
+				"line_ending": "Unix"
 			}
 		},
 		{
-			"file": "media_converter_adapter.rb",
+			"file": "command_line.rb",
 			"settings":
 			{
-				"buffer_size": 8156,
+				"buffer_size": 5826,
 				"line_ending": "Unix"
 			}
 		},
 		{
-			"file": "/Users/pedro/development/personal/apple-tv-converter/gems/streamio-ffmpeg/lib/ffmpeg/movie.rb",
+			"file": "/Users/pedro/development/personal/apple-tv-converter/lib/apple_tv_converter.rb",
 			"settings":
 			{
-				"buffer_size": 6598,
+				"buffer_size": 3959,
 				"line_ending": "Unix"
 			}
 		},
 		{
-			"file": "/Users/pedro/development/personal/apple-tv-converter/apple_tv_converter.gemspec",
+			"contents": "Searching 62 files for \"ap \"\n\n/Users/pedro/development/personal/apple-tv-converter/Rakefile:\n   30      media = parse_filename(File.join('Z:', 'Completed Torrents', 'Battlestar Galactica s03', 'battlestar.galactica.s03e01.avi'))\n   31  \n   32: ap ['media', media]\n   33      converter.process_media media\n   34    end\n   ..\n   51  \n   52  def parse_filename(file)\n   53:     ap ['file',file, FFMPEG::Movie.new(file)]\n   54    return nil unless FFMPEG::Movie.new(file).valid?\n   55  \n\n/Users/pedro/development/personal/apple-tv-converter/gems/streamio-ffmpeg/lib/ffmpeg/movie.rb:\n  130  \n  131      def load_all_streams(ffmpeg_output)\n  132:       @streams = ffmpeg_output.split(/.*? (?=(?:Chapter|Stream))/).map do |line|\n  133          if line =~ /^Stream #\\d+:\\d+/\n  134            begin\n  ...\n  147              build_subtitle_stream stream, line if stream.type == :subtitle\n  148            rescue => e\n  149:             ap [\n  150                e,\n  151                ffmpeg_output.split(/.*? (?=(?:Chapter|Stream))/),\n\n/Users/pedro/development/personal/apple-tv-converter/lib/apple_tv_converter/command_line.rb:\n   77              end\n   78  \n   79:             options.media.push *(found_files.map do |file|\n   80                parse_filename(file)\n   81              end.compact)\n   ..\n  116  \n  117          opts.parse! arguments\n  118:         options.media.push *(arguments.map { |file| parse_filename(file) }.compact)\n  119  \n  120          raise ArgumentError.new(\"No media file supplied\") unless options.media.any?\n\n/Users/pedro/development/personal/apple-tv-converter/lib/apple_tv_converter/media.rb:\n  106  \n  107      def has_embedded_subtitles?(languages = [])\n  108:       languages = languages.map { |l| l.downcase.to_sym }\n  109        ffmpeg_data.streams.select { |stream| stream.type == :subtitle && (languages.empty? || languages.include?(stream.language.downcase.to_sym)) }.any?\n  110      end\n\n/Users/pedro/development/personal/apple-tv-converter/lib/apple_tv_converter/media_converter_adapter.rb:\n   42              printf \"  * #{File.basename(filename)}: Progress:     0%\"\n   43              start_time = Time.now.to_i\n   44:             transcoded = media.ffmpeg_data.transcode(filename, \"#{options} -map #{stream.input_number}:#{stream.stream_number}\", :validate_output => false) do |progress|\n   45                elapsed = Time.now.to_i - start_time\n   46                printf \"\\r\" + (\" \" * 40)\n   ..\n   98          end\n   99  \n  100:         # If the file has more than one audio track, map all tracks but subtitles when transcoding\n  101          if media.audio_streams.length > 0\n  102            media.streams.each do |stream|\n  103:             options[:map] << \" -map #{stream.input_number}:#{stream.stream_number}\" if stream.type == :video || (stream.type == :audio && (languages.nil? || languages.empty? || ([nil, 'und', 'unk'] + languages).include?(stream.language)))\n  104            end\n  105          end\n\n/Users/pedro/development/personal/apple-tv-converter/lib/apple_tv_converter/media_converter_mac_adapter.rb:\n    5  \n    6        if has_subtitles?(media)\n    7:         list_files(media.original_filename.gsub(File.extname(media.original_filename), '*.srt')).map do |subtitle_filename|\n    8            subtitle_filename =~ /\\.(\\w{3})\\.srt$/i\n    9            language_code = $1 || 'und'\n\n/Users/pedro/development/personal/apple-tv-converter/lib/apple_tv_converter/media_converter_windows_adapter.rb:\n   18  \n   19        if has_subtitles?(media)\n   20:         list_files(File.join(File.dirname(media.original_filename), '*.srt')).map do |subtitle_filename|\n   21            subtitle_filename =~ /(\\w{3})\\.srt$/\n   22            language_code = $1 || 'eng'\n\n/Users/pedro/development/personal/apple-tv-converter/lib/apple_tv_converter/subtitles_fetcher/opensubtitles.rb:\n  138            # order the grouped subtitles by download count (descending), and keep only\n  139            # the first (we basically going with the majority of the people)\n  140:           return Hash[*(media_subtitles.map {|a,b| [a, b.sort { |c, d| c['SubDownloadsCnt'].to_i <=> d['SubDownloadsCnt'].to_i }.reverse.first] }).flatten]\n  141          end\n  142  \n  ...\n  185            rescue Exception => e\n  186              puts \"Error:\"\n  187:             ap e\n  188:             ap e.message\n  189  \n  190              raise e\n\n15 matches across 8 files\n\n\nSearching 62 files for \"awesome_print\"\n\n/Users/pedro/development/personal/apple-tv-converter/Gemfile.lock:\n   15    remote: http://rubygems.org/\n   16    specs:\n   17:     awesome_print (1.1.0)\n   18      diff-lcs (1.1.3)\n   19      hpricot (0.8.6)\n   ..\n   37  DEPENDENCIES\n   38    apple-tv-converter!\n   39:   awesome_print\n   40    imdb\n   41    language_list\n\n/Users/pedro/development/personal/apple-tv-converter/lib/apple_tv_converter.rb:\n    8  require 'open3'\n    9  # require 'streamio-ffmpeg'\n   10: require 'awesome_print'\n   11  require 'fileutils'\n   12  require 'language_list'\n\n3 matches across 2 files\n",
 			"settings":
 			{
-				"buffer_size": 996,
+				"buffer_size": 5006,
+				"line_ending": "Unix",
+				"name": "Find Results",
+				"scratch": true
+			}
+		},
+		{
+			"file": "/Users/pedro/development/personal/apple-tv-converter/Rakefile",
+			"settings":
+			{
+				"buffer_size": 2140,
+				"line_ending": "Windows"
+			}
+		},
+		{
+			"file": "/Users/pedro/development/personal/apple-tv-converter/Gemfile",
+			"settings":
+			{
+				"buffer_size": 239,
 				"line_ending": "Unix"
 			}
 		},
 		{
-			"file": "command_line.rb",
+			"file": "/Users/pedro/development/personal/apple-tv-converter/gems/streamio-ffmpeg/lib/ffmpeg/transcoder.rb",
 			"settings":
 			{
-				"buffer_size": 5397,
+				"buffer_size": 4116,
 				"line_ending": "Unix"
 			}
 		},
 		{
-			"file": "/Users/pedro/development/personal/apple-tv-converter/lib/apple_tv_converter.rb",
+			"file": "/Users/pedro/development/personal/apple-tv-converter/README.md",
 			"settings":
 			{
-				"buffer_size": 3944,
+				"buffer_size": 3632,
 				"line_ending": "Unix"
 			}
 		},
 		{
-			"file": "/Users/pedro/development/personal/apple-tv-converter/Gemfile",
+			"file": "version.rb",
 			"settings":
 			{
-				"buffer_size": 268,
+				"buffer_size": 48,
 				"line_ending": "Unix"
 			}
 		},
 		{
-			"file": "media_converter_mac_adapter.rb",
+			"file": "/Users/pedro/development/personal/apple-tv-converter/gems/streamio-ffmpeg/lib/ffmpeg/movie.rb",
 			"settings":
 			{
-				"buffer_size": 5117,
+				"buffer_size": 6657,
 				"line_ending": "Unix"
 			}
 		},
 		{
-			"file": "/Users/pedro/development/personal/apple-tv-converter/gems/streamio-ffmpeg/lib/ffmpeg/transcoder.rb",
+			"file": "media_converter_mac_adapter.rb",
 			"settings":
 			{
-				"buffer_size": 4116,
+				"buffer_size": 5330,
 				"line_ending": "Unix"
 			}
 		},
 		{
-			"file": "/Users/pedro/development/personal/apple-tv-converter/README.md",
+			"file": "/Users/pedro/development/personal/apple-tv-converter/CHANGELOG",
 			"settings":
 			{
-				"buffer_size": 3632,
+				"buffer_size": 1022,
 				"line_ending": "Unix"
 			}
 		}
@@ -759,7 +777,11 @@
 	},
 	"console":
 	{
-		"height": 160.0
+		"height": 160.0,
+		"history":
+		[
+			"import urllib2,os;pf='Package Control.sublime-package';ipp=sublime.installed_packages_path();os.makedirs(ipp) if not os.path.exists(ipp) else None;open(os.path.join(ipp,pf),'wb').write(urllib2.urlopen('http://sublime.wbond.net/'+pf.replace(' ','%20')).read())"
+		]
 	},
 	"distraction_free":
 	{
@@ -772,23 +794,24 @@
 	},
 	"file_history":
 	[
+		"/Users/pedro/development/personal/apple-tv-converter/lib/apple_tv_converter/subtitles_fetcher/opensubtitles.rb",
+		"/Users/pedro/development/personal/apple-tv-converter/lib/apple_tv_converter/media_converter_mac_adapter.rb",
+		"/Users/pedro/development/personal/apple-tv-converter/lib/apple_tv_converter/media_converter_adapter.rb",
 		"/Users/pedro/development/personal/apple-tv-converter/CHANGELOG",
+		"/Users/pedro/development/personal/apple-tv-converter/gems/streamio-ffmpeg/lib/ffmpeg/movie.rb",
+		"/Users/pedro/development/personal/apple-tv-converter/Rakefile",
 		"/Users/pedro/development/personal/apple-tv-converter/lib/apple_tv_converter/version.rb",
 		"/Users/pedro/development/personal/apple-tv-converter/gems/streamio-ffmpeg/lib/streamio-ffmpeg.rb",
 		"/Users/pedro/development/personal/apple-tv-converter/gems/streamio-ffmpeg/streamio-ffmpeg.gemspec",
 		"/Users/pedro/development/personal/apple-tv-converter/gems/streamio-ffmpeg/Gemfile",
 		"/Users/pedro/development/personal/apple-tv-converter/README.md",
 		"/Users/pedro/development/personal/apple-tv-converter/subtitle_1953515823.gzip",
-		"/Users/pedro/development/personal/apple-tv-converter/Rakefile",
 		"/Users/pedro/development/personal/apple-tv-converter/lib/apple_tv_converter/movie_hasher.rb",
 		"/Users/pedro/development/personal/apple-tv-converter/test/hasher.rb",
 		"/Users/pedro/development/personal/apple-tv-converter/lib/apple_tv_converter/command_line.rb",
 		"/Users/pedro/development/personal/apple-tv-converter/lib/apple_tv_converter/media.rb",
 		"/Users/pedro/development/personal/apple-tv-converter/gems/streamio-ffmpeg/lib/ffmpeg/transcoder.rb",
-		"/Users/pedro/development/personal/apple-tv-converter/lib/apple_tv_converter/media_converter_mac_adapter.rb",
 		"/Users/pedro/development/personal/apple-tv-converter/lib/apple_tv_converter.rb",
-		"/Users/pedro/development/personal/apple-tv-converter/lib/apple_tv_converter/media_converter_adapter.rb",
-		"/Users/pedro/development/personal/apple-tv-converter/gems/streamio-ffmpeg/lib/ffmpeg/movie.rb",
 		"/Users/pedro/development/personal/apple-tv-converter/apple_tv_converter.gemspec",
 		"/Users/pedro/development/personal/apple-tv-converter/Gemfile",
 		"/Users/pedro/development/gems/streamio-ffmpeg/lib/ffmpeg/transcoder.rb",
@@ -898,8 +921,7 @@
 		"/Users/pedro/development/toconline/lib/cloudware/toc_online/saft/importer.rb",
 		"/Users/pedro/development/toconline/app/controllers/billing/documents_controller.rb",
 		"/Users/pedro/development/toconline/app/controllers/billing/items_controller.rb",
-		"/Users/pedro/development/toconline/app/controllers/billing/gadgets_controller.rb",
-		"/Users/pedro/development/toconline/app/views/my_company/companies/summary.html.erb"
+		"/Users/pedro/development/toconline/app/controllers/billing/gadgets_controller.rb"
 	],
 	"find":
 	{
@@ -907,7 +929,7 @@
 	},
 	"find_in_files":
 	{
-		"height": 98.0,
+		"height": 0.0,
 		"where_history":
 		[
 			"",
@@ -924,6 +946,13 @@
 		"case_sensitive": false,
 		"find_history":
 		[
+			"open",
+			"@[a-z_]+=",
+			"\n#<",
+			"@[a-z_]+=",
+			"@id=",
+			"awesome_print",
+			"ap ",
 			", st",
 			"Shellwords.escape(",
 			"round(",
@@ -1044,19 +1073,12 @@
 			"convert?",
 			"media.",
 			"convert_",
-			"convert_audio",
-			"shell",
-			"converted_filename",
-			"mov_text",
-			"audio",
-			"AppleTvConverter.logger.debug",
-			"||=",
-			"[:custom]"
+			"convert_audio"
 		],
 		"highlight": true,
 		"in_selection": false,
 		"preserve_case": false,
-		"regex": false,
+		"regex": true,
 		"replace_history":
 		[
 			">\n<",
@@ -1076,23 +1098,24 @@
 	"groups":
 	[
 		{
-			"selected": 10,
+			"selected": 2,
 			"sheets":
 			[
 				{
 					"buffer": 0,
-					"file": "subtitles_fetcher/opensubtitles.rb",
+					"file": "media_converter.rb",
+					"semi_transient": false,
 					"settings":
 					{
-						"buffer_size": 7535,
+						"buffer_size": 3737,
 						"regions":
 						{
 						},
 						"selection":
 						[
 							[
-								3568,
-								3568
+								0,
+								0
 							]
 						],
 						"settings":
@@ -1149,25 +1172,26 @@
 							"translate_tabs_to_spaces": true
 						},
 						"translation.x": 0.0,
-						"translation.y": 2139.0,
+						"translation.y": 720.0,
 						"zoom_level": 1.0
 					},
 					"type": "text"
 				},
 				{
 					"buffer": 1,
-					"file": "media_converter.rb",
+					"file": "/Users/pedro/development/personal/apple-tv-converter/apple_tv_converter.gemspec",
+					"semi_transient": false,
 					"settings":
 					{
-						"buffer_size": 3735,
+						"buffer_size": 996,
 						"regions":
 						{
 						},
 						"selection":
 						[
 							[
-								1449,
-								1449
+								426,
+								426
 							]
 						],
 						"settings":
@@ -1224,25 +1248,26 @@
 							"translate_tabs_to_spaces": true
 						},
 						"translation.x": 0.0,
-						"translation.y": 234.0,
+						"translation.y": 0.0,
 						"zoom_level": 1.0
 					},
 					"type": "text"
 				},
 				{
 					"buffer": 2,
-					"file": "media_converter_adapter.rb",
+					"file": "command_line.rb",
+					"semi_transient": false,
 					"settings":
 					{
-						"buffer_size": 8156,
+						"buffer_size": 5826,
 						"regions":
 						{
 						},
 						"selection":
 						[
 							[
-								5098,
-								5098
+								3726,
+								3726
 							]
 						],
 						"settings":
@@ -1299,25 +1324,26 @@
 							"translate_tabs_to_spaces": true
 						},
 						"translation.x": 0.0,
-						"translation.y": 1531.0,
+						"translation.y": 1872.0,
 						"zoom_level": 1.0
 					},
 					"type": "text"
 				},
 				{
 					"buffer": 3,
-					"file": "/Users/pedro/development/personal/apple-tv-converter/gems/streamio-ffmpeg/lib/ffmpeg/movie.rb",
+					"file": "/Users/pedro/development/personal/apple-tv-converter/lib/apple_tv_converter.rb",
+					"semi_transient": false,
 					"settings":
 					{
-						"buffer_size": 6598,
+						"buffer_size": 3959,
 						"regions":
 						{
 						},
 						"selection":
 						[
 							[
-								4454,
-								4454
+								0,
+								0
 							]
 						],
 						"settings":
@@ -1374,25 +1400,184 @@
 							"translate_tabs_to_spaces": true
 						},
 						"translation.x": 0.0,
-						"translation.y": 2442.0,
+						"translation.y": 0.0,
 						"zoom_level": 1.0
 					},
 					"type": "text"
 				},
 				{
 					"buffer": 4,
-					"file": "/Users/pedro/development/personal/apple-tv-converter/apple_tv_converter.gemspec",
+					"semi_transient": false,
 					"settings":
 					{
-						"buffer_size": 996,
+						"buffer_size": 5006,
+						"regions":
+						{
+							"match":
+							{
+								"flags": 112,
+								"regions":
+								[
+									[
+										244,
+										247
+									],
+									[
+										375,
+										378
+									],
+									[
+										709,
+										712
+									],
+									[
+										926,
+										929
+									],
+									[
+										1205,
+										1208
+									],
+									[
+										1390,
+										1393
+									],
+									[
+										1719,
+										1722
+									],
+									[
+										2235,
+										2238
+									],
+									[
+										2526,
+										2529
+									],
+									[
+										2708,
+										2711
+									],
+									[
+										3214,
+										3217
+									],
+									[
+										3587,
+										3590
+									],
+									[
+										4048,
+										4051
+									],
+									[
+										4287,
+										4290
+									],
+									[
+										4311,
+										4314
+									],
+									[
+										4560,
+										4573
+									],
+									[
+										4701,
+										4714
+									],
+									[
+										4907,
+										4920
+									]
+								],
+								"scope": ""
+							}
+						},
+						"selection":
+						[
+							[
+								4911,
+								4911
+							]
+						],
+						"settings":
+						{
+							"BracketHighlighterBusy": false,
+							"bh_regions":
+							[
+								"bh_regex",
+								"bh_regex_center",
+								"bh_regex_open",
+								"bh_regex_close",
+								"bh_double_quote",
+								"bh_double_quote_center",
+								"bh_double_quote_open",
+								"bh_double_quote_close",
+								"bh_square",
+								"bh_square_center",
+								"bh_square_open",
+								"bh_square_close",
+								"bh_angle",
+								"bh_angle_center",
+								"bh_angle_open",
+								"bh_angle_close",
+								"bh_curly",
+								"bh_curly_center",
+								"bh_curly_open",
+								"bh_curly_close",
+								"bh_default",
+								"bh_default_center",
+								"bh_default_open",
+								"bh_default_close",
+								"bh_unmatched",
+								"bh_unmatched_center",
+								"bh_unmatched_open",
+								"bh_unmatched_close",
+								"bh_round",
+								"bh_round_center",
+								"bh_round_open",
+								"bh_round_close",
+								"bh_tag",
+								"bh_tag_center",
+								"bh_tag_open",
+								"bh_tag_close",
+								"bh_single_quote",
+								"bh_single_quote_center",
+								"bh_single_quote_open",
+								"bh_single_quote_close"
+							],
+							"detect_indentation": false,
+							"encoding_helper_encoding_sublime": "UTF-8",
+							"output_tag": 2,
+							"result_base_dir": "",
+							"result_file_regex": "^([A-Za-z\\\\/<].*):$",
+							"result_line_regex": "^ +([0-9]+):",
+							"scroll_past_end": true,
+							"syntax": "Packages/Default/Find Results.hidden-tmLanguage",
+							"translate_tabs_to_spaces": false
+						},
+						"translation.x": 0.0,
+						"translation.y": 1880.0,
+						"zoom_level": 1.0
+					},
+					"type": "text"
+				},
+				{
+					"buffer": 5,
+					"file": "/Users/pedro/development/personal/apple-tv-converter/Rakefile",
+					"semi_transient": false,
+					"settings":
+					{
+						"buffer_size": 2140,
 						"regions":
 						{
 						},
 						"selection":
 						[
 							[
-								426,
-								426
+								1512,
+								1512
 							]
 						],
 						"settings":
@@ -1449,25 +1634,100 @@
 							"translate_tabs_to_spaces": true
 						},
 						"translation.x": 0.0,
+						"translation.y": 546.0,
+						"zoom_level": 1.0
+					},
+					"type": "text"
+				},
+				{
+					"buffer": 6,
+					"file": "/Users/pedro/development/personal/apple-tv-converter/Gemfile",
+					"semi_transient": false,
+					"settings":
+					{
+						"buffer_size": 239,
+						"regions":
+						{
+						},
+						"selection":
+						[
+							[
+								0,
+								0
+							]
+						],
+						"settings":
+						{
+							"BracketHighlighterBusy": false,
+							"bh_regions":
+							[
+								"bh_regex",
+								"bh_regex_center",
+								"bh_regex_open",
+								"bh_regex_close",
+								"bh_double_quote",
+								"bh_double_quote_center",
+								"bh_double_quote_open",
+								"bh_double_quote_close",
+								"bh_square",
+								"bh_square_center",
+								"bh_square_open",
+								"bh_square_close",
+								"bh_angle",
+								"bh_angle_center",
+								"bh_angle_open",
+								"bh_angle_close",
+								"bh_curly",
+								"bh_curly_center",
+								"bh_curly_open",
+								"bh_curly_close",
+								"bh_default",
+								"bh_default_center",
+								"bh_default_open",
+								"bh_default_close",
+								"bh_unmatched",
+								"bh_unmatched_center",
+								"bh_unmatched_open",
+								"bh_unmatched_close",
+								"bh_round",
+								"bh_round_center",
+								"bh_round_open",
+								"bh_round_close",
+								"bh_tag",
+								"bh_tag_center",
+								"bh_tag_open",
+								"bh_tag_close",
+								"bh_single_quote",
+								"bh_single_quote_center",
+								"bh_single_quote_open",
+								"bh_single_quote_close"
+							],
+							"encoding_helper_confidence": 1.0,
+							"encoding_helper_encoding": "UTF-8",
+							"encoding_helper_encoding_sublime": "UTF-8",
+							"syntax": "Packages/Ruby/Ruby.tmLanguage"
+						},
+						"translation.x": 0.0,
 						"translation.y": 0.0,
 						"zoom_level": 1.0
 					},
 					"type": "text"
 				},
 				{
-					"buffer": 5,
-					"file": "command_line.rb",
+					"buffer": 7,
+					"file": "/Users/pedro/development/personal/apple-tv-converter/gems/streamio-ffmpeg/lib/ffmpeg/transcoder.rb",
+					"semi_transient": false,
 					"settings":
 					{
-						"buffer_size": 5397,
+						"buffer_size": 4116,
 						"regions":
 						{
 						},
 						"selection":
 						[
 							[
-								3564,
-								3564
+								1111,
+								1111
 							]
 						],
 						"settings":
@@ -1524,25 +1784,39 @@
 							"translate_tabs_to_spaces": true
 						},
 						"translation.x": 0.0,
-						"translation.y": 1168.0,
+						"translation.y": 584.0,
 						"zoom_level": 1.0
 					},
 					"type": "text"
 				},
 				{
-					"buffer": 6,
-					"file": "/Users/pedro/development/personal/apple-tv-converter/lib/apple_tv_converter.rb",
+					"buffer": 8,
+					"file": "/Users/pedro/development/personal/apple-tv-converter/README.md",
+					"semi_transient": false,
 					"settings":
 					{
-						"buffer_size": 3944,
+						"buffer_size": 3632,
 						"regions":
 						{
+							"TagLint":
+							{
+								"flags": 52,
+								"icon": "dot",
+								"regions":
+								[
+									[
+										1502,
+										1506
+									]
+								],
+								"scope": "variable.parameter"
+							}
 						},
 						"selection":
 						[
 							[
-								277,
-								277
+								0,
+								0
 							]
 						],
 						"settings":
@@ -1594,8 +1868,9 @@
 							"encoding_helper_confidence": 1.0,
 							"encoding_helper_encoding": "UTF-8",
 							"encoding_helper_encoding_sublime": "UTF-8",
-							"syntax": "Packages/Ruby/Ruby.tmLanguage",
-							"tab_size": 2,
+							"is_xml": false,
+							"syntax": "Packages/Markdown/Markdown.tmLanguage",
+							"tab_size": 4,
 							"translate_tabs_to_spaces": true
 						},
 						"translation.x": 0.0,
@@ -1605,19 +1880,20 @@
 					"type": "text"
 				},
 				{
-					"buffer": 7,
-					"file": "/Users/pedro/development/personal/apple-tv-converter/Gemfile",
+					"buffer": 9,
+					"file": "version.rb",
+					"semi_transient": false,
 					"settings":
 					{
-						"buffer_size": 268,
+						"buffer_size": 48,
 						"regions":
 						{
 						},
 						"selection":
 						[
 							[
-								0,
-								0
+								42,
+								42
 							]
 						],
 						"settings":
@@ -1678,19 +1954,20 @@
 					"type": "text"
 				},
 				{
-					"buffer": 8,
-					"file": "media_converter_mac_adapter.rb",
+					"buffer": 10,
+					"file": "/Users/pedro/development/personal/apple-tv-converter/gems/streamio-ffmpeg/lib/ffmpeg/movie.rb",
+					"semi_transient": false,
 					"settings":
 					{
-						"buffer_size": 5117,
+						"buffer_size": 6657,
 						"regions":
 						{
 						},
 						"selection":
 						[
 							[
-								1394,
-								1394
+								2956,
+								2956
 							]
 						],
 						"settings":
@@ -1747,25 +2024,26 @@
 							"translate_tabs_to_spaces": true
 						},
 						"translation.x": 0.0,
-						"translation.y": 106.0,
+						"translation.y": 1615.0,
 						"zoom_level": 1.0
 					},
 					"type": "text"
 				},
 				{
-					"buffer": 9,
-					"file": "/Users/pedro/development/personal/apple-tv-converter/gems/streamio-ffmpeg/lib/ffmpeg/transcoder.rb",
+					"buffer": 11,
+					"file": "media_converter_mac_adapter.rb",
+					"semi_transient": false,
 					"settings":
 					{
-						"buffer_size": 4116,
+						"buffer_size": 5330,
 						"regions":
 						{
 						},
 						"selection":
 						[
 							[
-								1111,
-								1111
+								0,
+								0
 							]
 						],
 						"settings":
@@ -1822,38 +2100,26 @@
 							"translate_tabs_to_spaces": true
 						},
 						"translation.x": 0.0,
-						"translation.y": 584.0,
+						"translation.y": 1324.0,
 						"zoom_level": 1.0
 					},
 					"type": "text"
 				},
 				{
-					"buffer": 10,
-					"file": "/Users/pedro/development/personal/apple-tv-converter/README.md",
+					"buffer": 12,
+					"file": "/Users/pedro/development/personal/apple-tv-converter/CHANGELOG",
+					"semi_transient": false,
 					"settings":
 					{
-						"buffer_size": 3632,
+						"buffer_size": 1022,
 						"regions":
 						{
-							"TagLint":
-							{
-								"flags": 52,
-								"icon": "dot",
-								"regions":
-								[
-									[
-										1502,
-										1506
-									]
-								],
-								"scope": "variable.parameter"
-							}
 						},
 						"selection":
 						[
 							[
-								2165,
-								2167
+								247,
+								247
 							]
 						],
 						"settings":
@@ -1905,13 +2171,10 @@
 							"encoding_helper_confidence": 1.0,
 							"encoding_helper_encoding": "UTF-8",
 							"encoding_helper_encoding_sublime": "UTF-8",
-							"is_xml": false,
-							"syntax": "Packages/Markdown/Markdown.tmLanguage",
-							"tab_size": 4,
-							"translate_tabs_to_spaces": true
+							"syntax": "Packages/Text/Plain text.tmLanguage"
 						},
 						"translation.x": 0.0,
-						"translation.y": 657.0,
+						"translation.y": 0.0,
 						"zoom_level": 1.0
 					},
 					"type": "text"
@@ -1954,6 +2217,7 @@
 	{
 		"height": 132.0
 	},
+	"project": "apple_tv_converter.sublime-project",
 	"replace":
 	{
 		"height": 66.0
@@ -1964,6 +2228,22 @@
 		"height": 0.0,
 		"selected_items":
 		[
+			[
+				"change",
+				"CHANGELOG"
+			],
+			[
+				"mac",
+				"lib/apple_tv_converter/media_converter_mac_adapter.rb"
+			],
+			[
+				"strmo",
+				"gems/streamio-ffmpeg/lib/ffmpeg/movie.rb"
+			],
+			[
+				"",
+				"lib/apple_tv_converter.rb"
+			],
 			[
 				"version",
 				"lib/apple_tv_converter/version.rb"
@@ -1996,10 +2276,6 @@
 				"mediaconada",
 				"lib/apple_tv_converter/media_converter_adapter.rb"
 			],
-			[
-				"mac",
-				"lib/apple_tv_converter/media_converter_mac_adapter.rb"
-			],
 			[
 				"opens",
 				"lib/apple_tv_converter/subtitles_fetcher/opensubtitles.rb"
@@ -2112,10 +2388,6 @@
 				"movie",
 				"gems/streamio-ffmpeg/lib/ffmpeg/movie.rb"
 			],
-			[
-				"",
-				"apple_tv_converter.gemspec"
-			],
 			[
 				"appl",
 				"apple-tv-converter/lib/apple_tv_converter.rb"
@@ -2467,19 +2739,19 @@
 			[
 				"deplo",
 				"toconline/config/deploy.rb"
-			],
-			[
-				"deploy",
-				"toconline/config/deploy.rb"
-			],
-			[
-				"mycompsett",
-				"toconline/app/views/my_company/companies/_settings.html.erb"
 			]
 		],
 		"width": 0.0
 	},
 	"select_project":
+	{
+		"height": 500.0,
+		"selected_items":
+		[
+		],
+		"width": 380.0
+	},
+	"select_symbol":
 	{
 		"height": 0.0,
 		"selected_items":
@@ -2487,10 +2759,16 @@
 		],
 		"width": 0.0
 	},
+	"settings":
+	{
+	},
 	"show_minimap": true,
 	"show_open_files": true,
 	"show_tabs": true,
 	"side_bar_visible": false,
 	"side_bar_width": 307.0,
-	"status_bar_visible": true
+	"status_bar_visible": true,
+	"template_settings":
+	{
+	}
 }