rget 2.7.1 → 2.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4e6c60d2ffb689bb76ed2145b90605d5e58e1af7
-  data.tar.gz: 3d1dac42735e0355d754806a1d64e937949e9018
+  metadata.gz: 7bbbd28e40ec354497198cdb9b5fe2456c9ff6c4
+  data.tar.gz: 9354fca608535650fb6d8a32fe76879fad5d92bf
 SHA512:
-  metadata.gz: 84c7d51103b5a72362e15b1d8724a6eb6294d75b38d112b38ca31f3b7184795a279373f79316570dcd162823508f9b5a324d83fa4a7f2af0a78d99b15e8cbec5
-  data.tar.gz: 5a3340ae874083bf758aed6252c4bd738efc306ba5845d2f63f3c939b9a609b4c86470c65c9b667cc40e63f7098c91f1243aee269520814a602e97a5cf19a00c
+  metadata.gz: a122d30189b2f9982b89df34764a267b1e89bfb56de8896a6a82fa4947579a7b886c5c11bfcc577b134748c8d81ba43ff14da8e70d28da145286790195b969e2
+  data.tar.gz: 908131045e849b941f1fa2a429f242124d28efe8dae45ca3d4ca9b953617347a5a800f00ed9e671c1241c117017b1b1b823d94f62b1a1dc07f7a7a11cc17b7ce

data/README.md

@@ -12,9 +12,20 @@ For customize radio programs, copy `rget.yaml` to `~/.rget` or current work dire
 
 ## Usage
 
-    rget imas_cg            # download and convert to mp3 THE iDOLM@STER Cinderella Girls Radio
-    rget imastudio --no-mp3 # download imastudio only (saved .m4a file)
+	 # download and convert to mp3 THE iDOLM@STER Cinderella Girls Radio
+    rget imas_cg
+
+	 # download imastudio only (saved .m4a file)
+    rget imastudio --no-mp3
+
+    # srore mp3 file to specified directory
     rget trysail --path=/home/hoge/radio
-                            # srore mp3 file to specified directory
+
+	 # store mp3 file to radio folder of Dropbox
     rget suzakinishi --path=dropbpx://radio
-	                         # store mp3 file to radio folder of Dropbox
+
+	 # show a template of the radio program configration
+    rget yaml http://example.com/radio
+
+    # download nicovideo live program by nicodl command
+	 nicodl http://live.nicovideo.jp/watch/lv999999999

data/bin/nicodl

@@ -31,7 +31,7 @@ video_id = Pathname(URI(player_url).path).basename.to_s
 begin
 	# downloading video
 	video = nico.video(video_id)
-	file = "#{video.title}.#{video.type}".gsub(%r([\\/\?:*"><|]), '_')
+	file = "#{video.title}.#{video.type}".gsub(%r([\\/\?:*"'><|]), '_')
 	open(file, 'wb:ASCII-8BIT') do |o|
 		video.get_video{|body|o.write(body)}
 	end
@@ -41,11 +41,11 @@ rescue Mechanize::ResponseCodeError
 	begin
 		live.rtmpdump_commands(video_id).each_with_index do |cmd, i|
 			src = "#{video_id}-#{i+1}.flv"
-			dst = "#{live.title.gsub(%r|/|, '_')}-#{i+1}.mp4"
+			dst = "#{live.title.concat("'").gsub(%r([\\/\?:*"'><|]), '_')}-#{i+1}.mp4"
 			unless File.exist?(src)
 				cmd[cmd.index('-o') + 1] = "./#{src}"
 				begin
-					o, e, s = Open3.capture3(cmd.join(' '))
+					o, e, s = Open3.capture3(*cmd)
 					unless s.exitstatus == 0
 						$stderr.puts e
 						next
@@ -58,21 +58,20 @@ rescue Mechanize::ResponseCodeError
 				$stderr.puts "#{src} is existent. skipping."
 			end
 
-			avconv = 'avconv'
-			args = " -i '#{src}' -acodec copy -vcodec copy '#{dst}'"
+			cmd = 'ffmpeg'
+			args = ['-i', src, '-acodec', 'copy', '-vcodec', 'copy', dst]
 			begin
-				o, e, s = Open3.capture3(avconv + args)
+				o, e, s = Open3.capture3(cmd, *args)
 				unless s.exitstatus == 0
-					raise Errno::ENOENT.new(avconv) if e =~ /: not found/
 					$stderr.puts e
 					next
 				end
 				File.delete(src)
 			rescue Errno::ENOENT
-				if avconv == 'ffmpeg'
-					$stderr.puts $!
-				else
-					avconv = 'ffmpeg'
+				if cmd == 'avconv'
+					$stderr.puts "ffmpeg or avconv not found."
+				else # retry with avconv command instead of ffmpeg
+					cmd = 'avconv'
 					retry
 				end
 			end

data/rget.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "rget"
-  spec.version       = "2.7.1"
+  spec.version       = "2.7.2"
   spec.authors       = ["TADA Tadashi"]
   spec.email         = ["t@tdtds.jp"]
   spec.description   = %q{Downloading newest radio programs on the web. Supported radio stations are hibiki, animate, onsen, seaside communications, niconico and youtube.}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rget
 version: !ruby/object:Gem::Version
-  version: 2.7.1
+  version: 2.7.2
 platform: ruby
 authors:
 - TADA Tadashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-15 00:00:00.000000000 Z
+date: 2016-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor