apple-tv-converter 0.3.0 → 0.3.1

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

@@ -133,7 +133,7 @@ module FFMPEG
         if line =~ /^Stream #\d+:\d+/
           begin
             stream = FFMPEG::Stream.new
-            bogus, input_number, stream_number, language, type = line.match(/Stream #(\d+):(\d+)(?:\((.*?)\))?:\s*(\w+):(.*)\n/).to_a
+            bogus, input_number, stream_number, language, type = line.match(/Stream #(\d+):(\d+)(?:(?:\[|\()(.*?)(?:\]|\)))?:\s*(\w+):(.*)\n/).to_a
 
             stream.send(:input_number=, input_number)
             stream.send(:stream_number=, stream_number)

data/lib/apple_tv_converter/apple_tv_converter.sublime-workspace

@@ -519,14 +519,6 @@
 	},
 	"buffers":
 	[
-		{
-			"file": "/Users/pedro/development/gems/streamio-ffmpeg/lib/ffmpeg/movie.rb",
-			"settings":
-			{
-				"buffer_size": 6811,
-				"line_ending": "Unix"
-			}
-		},
 		{
 			"file": "media_converter_adapter.rb",
 			"settings":
@@ -539,7 +531,7 @@
 			"file": "command_line.rb",
 			"settings":
 			{
-				"buffer_size": 5224,
+				"buffer_size": 5215,
 				"line_ending": "Unix"
 			}
 		},
@@ -590,6 +582,32 @@
 				"buffer_size": 3767,
 				"line_ending": "Unix"
 			}
+		},
+		{
+			"contents": "Searching 65 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  154              build_subtitle_stream stream, line if stream.type == :subtitle\n  155            rescue => e\n  156:             ap [\n  157                e,\n  158                e.backtrace,\n\n/Users/pedro/development/personal/apple-tv-converter/lib/apple_tv_converter/command_line.rb:\n   76              end\n   77  \n   78:             options.media.push *(found_files.map do |file|\n   79                parse_filename(file)\n   80              end.compact)\n   ..\n  111  \n  112          opts.parse! arguments\n  113:         options.media.push *(arguments.map { |file| parse_filename(file) }.compact)\n  114  \n  115          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   20              printf \"  * #{File.basename(filename)}: Progress:     0%\"\n   21              start_time = Time.now.to_i\n   22:             transcoded = media.ffmpeg_data.transcode(filename, \"#{options} -map #{stream.input_number}:#{stream.stream_number}\", :validate_output => false) do |progress|\n   23                elapsed = Time.now.to_i - start_time\n   24                printf \"\\r\" + (\" \" * 40)\n   ..\n   71          end\n   72  \n   73:         # If the file has more than one audio track, map all tracks but subtitles when transcoding\n   74          if media.audio_streams.length > 0\n   75            media.streams.each do |stream|\n   76:             options[:map] << \" -map #{stream.input_number}:#{stream.stream_number}\" if stream.type == :video || (stream.type == :audio && (languages.nil? || languages.empty? || languages.include?(stream.language)))\n   77            end\n   78          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/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  154              build_subtitle_stream stream, line if stream.type == :subtitle\n  155            rescue => e\n  156:             ap [\n  157                e,\n  158                ffmpeg_output.split(/.*? (?=(?:Chapter|Stream))/),\n\n14 matches across 8 files\n",
+			"settings":
+			{
+				"buffer_size": 4193,
+				"line_ending": "Unix",
+				"name": "Find Results",
+				"scratch": true
+			}
+		},
+		{
+			"file": "/Users/pedro/development/personal/apple-tv-converter/gems/streamio-ffmpeg/lib/ffmpeg/movie.rb",
+			"settings":
+			{
+				"buffer_size": 6825,
+				"line_ending": "Unix"
+			}
+		},
+		{
+			"file": "version.rb",
+			"settings":
+			{
+				"buffer_size": 48,
+				"line_ending": "Unix"
+			}
 		}
 	],
 	"build_system": "",
@@ -708,6 +726,8 @@
 	},
 	"file_history":
 	[
+		"/Users/pedro/development/personal/apple-tv-converter/gems/streamio-ffmpeg/lib/ffmpeg/movie.rb",
+		"/Users/pedro/development/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/x.mp4",
 		"/Users/pedro/development/personal/apple-tv-converter/lib/apple_tv_converter.rb",
@@ -733,7 +753,6 @@
 		"/Users/pedro/Downloads/SAFT_508903726_20130215150034.xml",
 		"/Users/pedro/.irb-history",
 		"/Users/pedro/development/gems/streamio-ffmpeg/lib/ffmpeg/encoding_options.rb",
-		"/Users/pedro/development/gems/streamio-ffmpeg/lib/ffmpeg/movie.rb",
 		"/Users/pedro/development/personal/mkv/mkv.gemspec",
 		"/Users/pedro/development/gems/streamio-ffmpeg/lib/streamio-ffmpeg.rb",
 		"/Users/pedro/development/personal/apple-tv-converter/CHANGELOG",
@@ -834,8 +853,7 @@
 		"/Users/pedro/development/toconline/app/views/devise/registrations/accept_employee_invitation.html.erb",
 		"/Users/pedro/development/toconline/app/models/employee_invitation.rb",
 		"/Users/pedro/development/toconline/app/models/manager_invitation.rb",
-		"/Users/pedro/development/toconline/app/models/invitation.rb",
-		"/Users/pedro/development/toconline/app/controllers/registrations_controller.rb"
+		"/Users/pedro/development/toconline/app/models/invitation.rb"
 	],
 	"find":
 	{
@@ -860,6 +878,8 @@
 		"case_sensitive": false,
 		"find_history":
 		[
+			"/Stream #(\\d+):(\\d+)(?:\\((.*?)\\))?:\\s*(\\w+):(.*)\\n/",
+			"ap ",
 			"SublerCLI",
 			"/",
 			"timeout",
@@ -985,9 +1005,7 @@
 			"Nota",
 			"Guia",
 			"Fatura",
-			"F",
-			"customer",
-			"customers"
+			"F"
 		],
 		"highlight": true,
 		"in_selection": false,
@@ -1012,42 +1030,11 @@
 	"groups":
 	[
 		{
-			"selected": 4,
+			"selected": 1,
 			"sheets":
 			[
 				{
 					"buffer": 0,
-					"file": "/Users/pedro/development/gems/streamio-ffmpeg/lib/ffmpeg/movie.rb",
-					"settings":
-					{
-						"buffer_size": 6811,
-						"regions":
-						{
-						},
-						"selection":
-						[
-							[
-								5639,
-								5639
-							]
-						],
-						"settings":
-						{
-							"encoding_helper_confidence": 1.0,
-							"encoding_helper_encoding": "UTF-8",
-							"encoding_helper_encoding_sublime": "UTF-8",
-							"syntax": "Packages/Ruby/Ruby.tmLanguage",
-							"tab_size": 2,
-							"translate_tabs_to_spaces": true
-						},
-						"translation.x": 0.0,
-						"translation.y": 3232.0,
-						"zoom_level": 1.0
-					},
-					"type": "text"
-				},
-				{
-					"buffer": 1,
 					"file": "media_converter_adapter.rb",
 					"settings":
 					{
@@ -1078,19 +1065,19 @@
 					"type": "text"
 				},
 				{
-					"buffer": 2,
+					"buffer": 1,
 					"file": "command_line.rb",
 					"settings":
 					{
-						"buffer_size": 5224,
+						"buffer_size": 5215,
 						"regions":
 						{
 						},
 						"selection":
 						[
 							[
-								2651,
-								2651
+								3177,
+								3177
 							]
 						],
 						"settings":
@@ -1103,13 +1090,13 @@
 							"translate_tabs_to_spaces": true
 						},
 						"translation.x": 0.0,
-						"translation.y": 1114.0,
+						"translation.y": 1111.0,
 						"zoom_level": 1.0
 					},
 					"type": "text"
 				},
 				{
-					"buffer": 3,
+					"buffer": 2,
 					"file": "media.rb",
 					"settings":
 					{
@@ -1140,7 +1127,7 @@
 					"type": "text"
 				},
 				{
-					"buffer": 4,
+					"buffer": 3,
 					"file": "media_converter_mac_adapter.rb",
 					"settings":
 					{
@@ -1171,7 +1158,7 @@
 					"type": "text"
 				},
 				{
-					"buffer": 5,
+					"buffer": 4,
 					"file": "/Users/pedro/development/gems/streamio-ffmpeg/lib/ffmpeg/transcoder.rb",
 					"settings":
 					{
@@ -1202,7 +1189,7 @@
 					"type": "text"
 				},
 				{
-					"buffer": 6,
+					"buffer": 5,
 					"file": "media_converter.rb",
 					"settings":
 					{
@@ -1233,7 +1220,7 @@
 					"type": "text"
 				},
 				{
-					"buffer": 7,
+					"buffer": 6,
 					"file": "/Users/pedro/development/personal/apple-tv-converter/Gemfile",
 					"settings":
 					{
@@ -1262,7 +1249,7 @@
 					"type": "text"
 				},
 				{
-					"buffer": 8,
+					"buffer": 7,
 					"file": "/Users/pedro/development/personal/apple-tv-converter/lib/apple_tv_converter.rb",
 					"settings":
 					{
@@ -1287,7 +1274,164 @@
 							"translate_tabs_to_spaces": true
 						},
 						"translation.x": 0.0,
-						"translation.y": 360.0,
+						"translation.y": 0.0,
+						"zoom_level": 1.0
+					},
+					"type": "text"
+				},
+				{
+					"buffer": 8,
+					"settings":
+					{
+						"buffer_size": 4193,
+						"regions":
+						{
+							"match":
+							{
+								"flags": 112,
+								"regions":
+								[
+									[
+										244,
+										247
+									],
+									[
+										375,
+										378
+									],
+									[
+										709,
+										712
+									],
+									[
+										926,
+										929
+									],
+									[
+										1167,
+										1170
+									],
+									[
+										1352,
+										1355
+									],
+									[
+										1681,
+										1684
+									],
+									[
+										2197,
+										2200
+									],
+									[
+										2488,
+										2491
+									],
+									[
+										2670,
+										2673
+									],
+									[
+										3152,
+										3155
+									],
+									[
+										3525,
+										3528
+									],
+									[
+										3848,
+										3851
+									],
+									[
+										4065,
+										4068
+									]
+								],
+								"scope": ""
+							}
+						},
+						"selection":
+						[
+							[
+								4067,
+								4067
+							]
+						],
+						"settings":
+						{
+							"detect_indentation": false,
+							"encoding_helper_encoding_sublime": "UTF-8",
+							"output_tag": 1,
+							"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": 853.0,
+						"zoom_level": 1.0
+					},
+					"type": "text"
+				},
+				{
+					"buffer": 9,
+					"file": "/Users/pedro/development/personal/apple-tv-converter/gems/streamio-ffmpeg/lib/ffmpeg/movie.rb",
+					"settings":
+					{
+						"buffer_size": 6825,
+						"regions":
+						{
+						},
+						"selection":
+						[
+							[
+								4291,
+								4291
+							]
+						],
+						"settings":
+						{
+							"encoding_helper_confidence": 1.0,
+							"encoding_helper_encoding": "UTF-8",
+							"encoding_helper_encoding_sublime": "UTF-8",
+							"syntax": "Packages/Ruby/Ruby.tmLanguage",
+							"tab_size": 2,
+							"translate_tabs_to_spaces": true
+						},
+						"translation.x": 0.0,
+						"translation.y": 2563.0,
+						"zoom_level": 1.0
+					},
+					"type": "text"
+				},
+				{
+					"buffer": 10,
+					"file": "version.rb",
+					"settings":
+					{
+						"buffer_size": 48,
+						"regions":
+						{
+						},
+						"selection":
+						[
+							[
+								48,
+								48
+							]
+						],
+						"settings":
+						{
+							"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"
@@ -1340,6 +1484,18 @@
 		"height": 0.0,
 		"selected_items":
 		[
+			[
+				"version",
+				"lib/apple_tv_converter/version.rb"
+			],
+			[
+				"command",
+				"lib/apple_tv_converter/command_line.rb"
+			],
+			[
+				"movie",
+				"gems/streamio-ffmpeg/lib/ffmpeg/movie.rb"
+			],
 			[
 				"",
 				"apple_tv_converter.gemspec"
@@ -1380,10 +1536,6 @@
 				"comma",
 				"apple-tv-converter/lib/apple_tv_converter/command_line.rb"
 			],
-			[
-				"movie",
-				"streamio-ffmpeg/lib/ffmpeg/movie.rb"
-			],
 			[
 				"moviespec",
 				"streamio-ffmpeg/spec/ffmpeg/movie_spec.rb"
@@ -1416,10 +1568,6 @@
 				"gemfil",
 				"apple-tv-converter/Gemfile"
 			],
-			[
-				"version",
-				"apple-tv-converter/lib/apple_tv_converter/version.rb"
-			],
 			[
 				"gemsp",
 				"apple-tv-converter/apple_tv_converter.gemspec"
@@ -1428,10 +1576,6 @@
 				"mediaconv",
 				"apple-tv-converter/lib/apple_tv_converter/media_converter.rb"
 			],
-			[
-				"command",
-				"apple-tv-converter/lib/apple_tv_converter/command_line.rb"
-			],
 			[
 				"mediaconver",
 				"apple-tv-converter/lib/apple_tv_converter/media_converter_adapter.rb"
@@ -1866,7 +2010,7 @@
 	"show_minimap": true,
 	"show_open_files": true,
 	"show_tabs": true,
-	"side_bar_visible": true,
+	"side_bar_visible": false,
 	"side_bar_width": 307.0,
 	"status_bar_visible": true
 }

data/lib/apple_tv_converter/command_line.rb

@@ -84,7 +84,7 @@ module AppleTvConverter
             options.add_to_itunes = true
           end
 
-          opts.on('--imdb [ID]', Integer,
+          opts.on('--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)"
             ) do |id|

data/lib/apple_tv_converter/version.rb

@@ -1,3 +1,3 @@
 module AppleTvConverter
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: apple-tv-converter
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-12 00:00:00.000000000 Z
+date: 2013-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec