rget 4.0.2 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f0e0f7e7c5cf7075e2c0e5089d305080b0f093f4
-  data.tar.gz: d6ed0e66efc6b0f5aaf6e03ed6699bb5ea8f8bc9
+  metadata.gz: 1e7390b3e41059e8ecbd831444e486d8a4e53344
+  data.tar.gz: f9954fa00090ecef43a12e6a3edb1748b5d6a3e1
 SHA512:
-  metadata.gz: 52a0e6c1012a08e408ed63da75067ccad7e9bcc04168da44c1b0eb5480b0c1b20a6cf60fe25ad79745cb76cd89002c0b1c7d844404450cb1a1c62de0e1413fe9
-  data.tar.gz: f5899e1f52c02b17b6e531fd09c6faf90b1e00d8dc59124eea066aa4238edf2e15a6566c8939a818fb2783e1ae86be74f111425883b62b9af98d88de6daf8469
+  metadata.gz: aace3fa444aed6bbc74ff1e2f46cd010bdd6bae3e2749c6cbdd077bbd7dfe84cd511b37da5b291ce4fe8617d3c157717f553bbc62b7d6f25321de6fecada3fd4
+  data.tar.gz: ead867d95d7761594d021cf6619cb4c3415843ca43d67c1a8528faae5dc6ac13aa1e2af13d07d1dc654971af8cac5852b4e99260633f6bbc09f05414db35b106

data/bin/rget

@@ -29,8 +29,8 @@ class GetWebRadio < Thor
 		exit 1
 	end
 
-	config = YAML::load_file(config_file)
-	config['programs'].each do |command, params|
+	config = {'options' => {}, 'programs' => {}}.merge(YAML::load_file(config_file) || {})
+	(config['programs'] || {}).each do |command, params|
 		desc command, params['desc']
 		define_method(command) do
 			opts = OpenStruct.new(config['options'].merge(options))
@@ -48,7 +48,17 @@ class GetWebRadio < Thor
 		end
 	end
 
-	desc 'yaml', 'dump YAML of specified URL'
+	desc 'init', 'show initial config file, save to "rget.yaml" or "~/.rget"'
+	def init
+		puts <<~CONFIG
+			options:
+			  mp3nize: ffmpeg -i '$1' -vn -acodec copy '$2' || ffmpeg -i '$1' -vn -y -ab 64k '$2'
+			  path: .
+			programs:
+		CONFIG
+	end
+
+	desc 'yaml <URL>', 'dump YAML of specified URL'
 	def yaml(url)
 		dump = WebRadio({'url'=>url}, OpenStruct.new({dump: true})).dump
 		puts YAML.dump(dump).lines.drop(1).map{|l| "  #{l}"}

data/lib/freshlive.rb

@@ -3,52 +3,88 @@ require 'nokogiri'
 require 'json'
 
 class FreshLive < WebRadio
-	def initialize(url, options)
-		super
-		@archive = URI(File.join(@url + '/archive'))
-		@doc = Nokogiri(open(@archive).read).root
-	end
-
 	def download
-		offset = 0
-		begin
-			meta = program_meta(program_id(offset))
-			serial = meta['data']['title'].scan(/\d+$/).first.to_i
-			open("#{@label}##{'%02d' % serial}.ts", 'wb') do |w|
-				ts_list(meta['data']['archiveStreamUrl']).each do |u|
-					w.write(open(u, 'rb').read)
+		if URI(@url).path =~ %r|/search/|
+			archive = @url
+		else
+			archive = URI(File.join(@url + '/programs/archive'))
+		end
+
+		each_programs(Nokogiri(open(archive).read)) do |meta|
+			begin
+				serial = meta['data']['title'].scan(/\d+$/).first.to_i
+				src = "#{@label}##{'%02d' % serial}.ts"
+				open(src, 'wb') do |w|
+					print "getting #{src}..."
+					ts_list(meta['data']['archiveStreamUrl']).each do |u|
+						print '.'
+						w.write(open(u, 'rb').read)
+					end
 				end
+				dst = mp4nize(src)
+				puts 'done.'
+				move(dst)
+				return
+			rescue OpenURI::HTTPError
+				puts 'try next.'
+				next
+			rescue
+				puts 'fail.'
+				$stderr.puts 'faild to convert .ts => .mp4'
+				return
 			end
-		rescue OpenURI::HTTPError
-			offset += 1
-			retry
 		end
+		puts 'fail.'
+		$stderr.puts 'free program not found.'
 	end
 
 	def dump
-		tag = Pathname(@url).basename.to_s
-		meta = JSON.parse(@doc.css('script').first)
-
-		return {
-			tag => {
-				'desc' => meta['name'],
-				'url' => @url,
-				'label' => tag
+		u = URI(@url)
+		if u.path =~ %r|/search/|
+			desc = URI.decode_www_form_component(Pathname(u.path).basename.to_s)
+			return {
+				'freshlive_search' => {
+					'desc' => desc,
+					'url' => @url,
+					'label' => desc
+				}
+			}
+		else
+			tag = Pathname(u.path).basename.to_s
+			meta = JSON.parse(Nokogiri(open(@url, &:read)).css('script').first)
+			return {
+				tag => {
+					'desc' => meta['name'],
+					'url' => @url,
+					'label' => tag
+				}
 			}
-		}
+		end
 	end
 
 private
-	def program_id(offset = 0)
-		Pathname(@doc.css('.ProgramTitle a')[offset].attr('href')).basename.to_s
-	end
-
-	def program_meta(id)
-		JSON.parse(open("https://freshlive.tv/proxy/Programs;id=#{id}").read)
+	def each_programs(html)
+		x = "//section[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))
+		end
 	end
 
 	def ts_list(rate_m3u8)
 		ts_m3u8 = open(rate_m3u8).read.each_line.grep_v(/^#/)[1].chomp
 		open(URI(rate_m3u8) + ts_m3u8).read.each_line.grep_v(/^#/).map{|u|URI(rate_m3u8) + u.chomp}
 	end
+
+	def mp4nize(src)
+		dst = src.sub(/ts$/, 'mp4')
+		command = "ffmpeg -i #{src} -vcodec copy -strict -2 #{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
 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       = "4.0.2"
+  spec.version       = "4.1.0"
   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 and freshlive.}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rget
 version: !ruby/object:Gem::Version
-  version: 4.0.2
+  version: 4.1.0
 platform: ruby
 authors:
 - TADA Tadashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-28 00:00:00.000000000 Z
+date: 2017-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor