rget 4.6.0 → 4.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cbb60902a3e7e94cdde04a6e9fcaba67520f77691ed758954f1fc6a85ff36573
-  data.tar.gz: 5bec01d8399e3a213dad6f6809af72a69b2bc480be0fd8be4683a6098ca5db05
+  metadata.gz: 8724d5e9d9cc41ac88e02daadf6beea6ddca2040b676f09a9d1a9be06792bed8
+  data.tar.gz: 6ec002e98c4eef4010c5e7d2d3e30e05bc253db6e3b5b8a9f8bbc68b8a0c42a3
 SHA512:
-  metadata.gz: 49af824ae83d968115f0ae2b7b52a41f0b37fad355516a248ca4c4d61aa378bbfabef7e4848ef585d00e7172d1f3c9b0e3d63e840990e2db80fb9a8afdc3455b
-  data.tar.gz: c14371d3ee3fa7167279aca481a4534f17db04fdb75b056aafad9e4e2fdfa8ca519e33fb840ee856e06a17945b7b6e82ab56dcda94d354d7e18673b6dceb280f
+  metadata.gz: '059523e19ca5bfc9dbd2e17498c7c44d82de8cd0570415061d96f51d928b6a773df1ccf976995597b3eb9916f11808a562a4f3c4dfd0b3bc2b1d9d10153ba33b'
+  data.tar.gz: 749be7f67700bd1e885b4e92675c6d677018e63f7e1431667ee59d6ae8e6bc82105349c3e0047efaebd9894b339fd0fe8433d4f79c253fa33bf88dce6b77278f

data/README.md

@@ -18,33 +18,34 @@ For customize radio programs, copy `rget.yaml` to `~/.rget` or current work dire
 * <command path>/../rget.yaml (for gem)
 
 ## Installation
-
+```
   $ gem install rget
-
+```
 ## Usage
 ### rget command
+```
+# save a template of the radio program configration
+rget yaml http://example.com/radio >> ~/.rget
 
-  # save a template of the radio program configration
-  rget yaml http://example.com/radio >> ~/.rget
-
-  # download and convert to mp3 THE iDOLM@STER Cinderella Girls Radio
-  rget imas_cg
-
-  # download takamori only (saved movie file)
-  rget takamori --no-mp3
+# download and convert to mp3 THE iDOLM@STER Cinderella Girls Radio
+rget imas_cg
 
-  # srore mp3 file to specified directory
-  rget suzakinishi --path=/home/hoge/radio
+# download takamori only (saved movie file)
+rget takamori --no-mp3
 
-  # store mp3 file to radio folder of Dropbox
-  rget matsui --path=dropbpx://radio
+# srore mp3 file to specified directory
+rget suzakinishi --path=/home/hoge/radio
 
+# store mp3 file to radio folder of Dropbox
+rget matsui --path=dropbpx://radio
+```
 ### nicodl command
-
-  # download nicovideo live program
-  nicodl http://live.nicovideo.jp/watch/lv999999999
-
+```
+# download nicovideo live program
+nicodl http://live.nicovideo.jp/watch/lv999999999
+```
 ### add\_mp3info
-
-  # set cover photo into mp3 file
-  add_mp3info sample.mp3 cover.jpg
+```
+# set cover photo into mp3 file
+add_mp3info sample.mp3 cover.jpg
+```

data/lib/freshlive.rb

@@ -14,19 +14,25 @@ class FreshLive < WebRadio
 			begin
 				serial = meta['data']['title'].scan(/\d+$/).first.to_i
 				src = "#{@label}##{'%02d' % serial}.ts"
-				dst = src.sub(/\.ts$/, '.mp4')
+				dst = src.sub(/\.ts$/, @options.mp3 ? '.mp3' : '.mp4')
 				if exist?(dst)
 					puts "#{dst} is existent, skipped."
 					return
 				end
-				open(src, 'wb') do |w|
-					print "getting #{src}..."
-					ts_list(meta['data']['archiveStreamUrl']).each do |u|
-						print '.'
-						w.write(open(u, 'rb').read)
+				unless exist?(src)
+					open(src, 'wb') do |w|
+						print "getting #{src}..."
+						ts_list(meta['data']['archiveStreamUrl']).each_with_index do |u, i|
+							print '.' if i % 50 == 0
+							w.write(open(u, 'rb').read)
+						end
 					end
 				end
-				dst = mp4nize(src)
+				if @options.mp3
+					dst = to_mp3(src)
+				else
+					dst = to_mp4(src)
+				end
 				puts 'done.'
 				move(dst)
 				return
@@ -69,7 +75,7 @@ class FreshLive < WebRadio
 
 private
 	def each_programs(html)
-		x = "//section[h1[contains(text(),'アーカイブ')]]//*[contains(@class,'ProgramTitle')]/a/@href"
+		x = "//section[descendant::h1[contains(text(),'アーカイブ')]]//*[contains(@class,'ProgramTitle')]/a/@href"
 		html.xpath(x).each do |href|
 			id = Pathname(href.value).basename.to_s
 			yield JSON.parse(open("https://freshlive.tv/proxy/Programs;id=#{id}", &:read))
@@ -81,9 +87,21 @@ private
 		open(URI(rate_m3u8) + ts_m3u8).read.each_line.grep_v(/^#/).map{|u|URI(rate_m3u8) + u.chomp}
 	end
 
-	def mp4nize(src)
+	def to_mp3(src)
+		dst = src.sub(/ts$/, 'mp3')
+		command = "ffmpeg -i '#{src}' -vn -ab 64k '#{dst}'"
+		result = Open3.capture3(command)
+		if result[2].to_i == 0
+			File.delete(src)
+		else
+			File.delete(dst) if File.exist?(dst)
+		end
+		return dst
+	end
+
+	def to_mp4(src)
 		dst = src.sub(/ts$/, 'mp4')
-		command = "ffmpeg -i #{src} -vcodec copy -strict -2 #{dst}"
+		command = "ffmpeg -i '#{src}' -vcodec copy -strict -2 '#{dst}'"
 		result = Open3.capture3(command)
 		if result[2].to_i == 0
 			File.delete(src)

data/rget.gemspec

@@ -4,12 +4,12 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "rget"
-  spec.version       = "4.6.0"
+  spec.version       = "4.6.1"
   spec.authors       = ["TADA Tadashi"]
   spec.email         = ["t@tdtds.jp"]
   spec.description   = %q{Downloading newest radio programs on the web. Supported radio stations are hibiki, onsen, niconico, freshlive and himalaya.}
   spec.summary       = %q{Downloading newest radio programs on the web.}
-  spec.homepage      = "https://bitbucket.org/tdtds/rget"
+  spec.homepage      = "https://github.com/wasamas/rget"
   spec.license       = "GPL"
 
   spec.files         = `git ls-files`.split($/)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rget
 version: !ruby/object:Gem::Version
-  version: 4.6.0
+  version: 4.6.1
 platform: ruby
 authors:
 - TADA Tadashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-04 00:00:00.000000000 Z
+date: 2018-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -168,7 +168,7 @@ files:
 - lib/webradio.rb
 - rget.gemspec
 - rget.yaml
-homepage: https://bitbucket.org/tdtds/rget
+homepage: https://github.com/wasamas/rget
 licenses:
 - GPL
 metadata: {}
@@ -188,7 +188,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Downloading newest radio programs on the web.