rget 3.2.3 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d1629be674db949cb4fc135e09f2fb0333b93afd
-  data.tar.gz: 2d31880ccb2cd7e51f54698ff352331a51907fc5
+  metadata.gz: 28ed24cb1351d9eb22625a2f8cfbed704895040c
+  data.tar.gz: 4460fcfd5d9b9dd8198b4c7203f3d637d5ed714f
 SHA512:
-  metadata.gz: 6927b79d9651ef8d5d18f0e03bb7c15b55779bc9942172b2ea30a0aeab738d26ec9337f7c668b4e4cebb6f1275d0f97c1094262749ec2e18d93850fb78fb4230
-  data.tar.gz: 9f10d8a3da090ece4ae60d16e85083c1c421da16c003c4373d17631e1441a8a1e02e6467f18f1e404f5ec052c18e6a05c07184b66d65cbd9759743acde70c5a1
+  metadata.gz: 16049b9c31ab2f9ad6131131475e5cab1a43689f757ffc5fb6c6449d5d20d1372b4fec620033813d0eb5f02b475951ba8416e07b6282b48b994a253e1decba32
+  data.tar.gz: 41ce5d9d60d95c31b0b49c6734a1a5a4efd96e94f6356967597a58ffd3442adfdaa9602c8e6fcd2b65c527fdaf3d4f987d96873a72cee38458d0ab8b9b6c881f

data/Gemfile

@@ -1,4 +1,4 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in get-webradio2.gemspec
+# Specify your gem's dependencies in rget.gemspec
 gemspec

data/README.md

@@ -3,15 +3,18 @@
 Downloading newest radio programs on the web. Supported radio stations are:
 
 * hibiki
-* animate
 * onsen
-* seaside communications
 * niconico
 * freshlive.tv
 
 If you want to save files as MP3, needs `ffmpeg` command.
 
-For customize radio programs, copy `rget.yaml` to `~/.rget` or current work directory and edit it.
+For customize radio programs, copy `rget.yaml` to `~/.rget` or current work directory and edit it. config file search paths are:
+
+* RGET\_CONFIG environment variable
+* ./rget.yaml
+* ~/.rget
+* <command path>/../rget.yaml (for gem)
 
 ## Installation
 

data/bin/add_mp3info

@@ -0,0 +1,10 @@
+#!/usr/bin/env ruby
+require 'mp3info'
+require 'open-uri'
+
+mp3 = ARGV.shift
+cover = ARGV.shift
+m = Mp3Info.new(mp3)
+m.tag.title = File.basename(mp3, '.mp3')
+m.tag2.add_picture(open(cover, 'r:ASCII-8BIT').read) if cover
+m.close

data/bin/rget

@@ -13,11 +13,12 @@ class GetWebRadio < Thor
 
 	config_file = nil
 	[
+		ENV['RGET_CONFIG'],
 		'./rget.yaml',
 		'~/.rget',
 		"#{Pathname(__dir__)}/../rget.yaml",
 	].each do |file|
-		path = Pathname(file).expand_path
+		path = Pathname(file).expand_path rescue next
 		if path.exist?
 			config_file = path.to_s
 			break
@@ -32,13 +33,12 @@ class GetWebRadio < Thor
 	config['programs'].each do |command, params|
 		desc command, params['desc']
 		define_method(command) do
-			url = params['url']
 			opts = OpenStruct.new(config['options'].merge(options))
 			begin
 				if params['podcast']
-					Podcast.new(url, opts){|media|media.download(params['label'])}
+					Podcast.new(params, opts){|media|media.download}
 				else
-					WebRadio(url, opts){|media|media.download(params['label'])}
+					WebRadio(params, opts){|media|media.download}
 				end
 			rescue WebRadio::NotFoundError => e
 				$stderr.puts e.message

data/lib/freshlive.rb

@@ -9,12 +9,12 @@ class FreshLive < WebRadio
 		@doc = Nokogiri(open(@archive).read).root
 	end
 
-	def download(name)
+	def download
 		offset = 0
 		begin
 			meta = program_meta(program_id(offset))
 			serial = meta['data']['title'].scan(/\d+$/).first.to_i
-			open("#{name}##{'%02d' % serial}.ts", 'wb') do |w|
+			open("#{@label}##{'%02d' % serial}.ts", 'wb') do |w|
 				ts_list(meta['data']['archiveStreamUrl']).each do |u|
 					w.write(open(u, 'rb').read)
 				end

data/lib/hibiki.rb

@@ -12,8 +12,8 @@ class Hibiki < WebRadio
 		@url = @url.sub(%r|/detail\Z|, '')
 	end
 
-	def download(name)
-		hibiki_download(name, Pathname(@url).basename.to_s)
+	def download
+		hibiki_download(@label, Pathname(@url).basename.to_s)
 	end
 
 	def dump
@@ -37,13 +37,19 @@ private
 
 	def hibiki_media_info(agent, program_id)
 		agent.request_headers = header
-		JSON.parse(agent.get("https://vcms-api.hibiki-radio.jp/api/v1/programs/#{program_id}").body,{:symbolize_names => true})
+		json = agent.get("https://vcms-api.hibiki-radio.jp/api/v1/programs/#{program_id}").body
+		JSON.parse(json, symbolize_names: true)
+	end
+
+	def find_cover(media_info)
+		media_info[:episode][:episode_parts].map{|s|s[:pc_image_url]}.reject(&:empty?)[0]
 	end
 
 	def hibiki_download(name, program_id)
 		begin
 			agent = Mechanize.new
 			media_info = hibiki_media_info(agent, program_id)
+			@cover = find_cover(media_info) unless @cover
 			serial = media_info[:episode][:name].scan(/([\d\.]+)/).flatten.first
 			video_id = media_info[:episode][:video][:id]
 

data/lib/nicovideo.rb

@@ -6,7 +6,7 @@ require 'open-uri'
 require 'rss'
 
 class Nicovideo < WebRadio
-	def initialize(url, options)
+	def initialize(params, options)
 		account = Pit::get('nicovideo', :require => {
 			:id => 'your nicovideo id',
 			:pass => 'your nicovideo password'
@@ -16,20 +16,21 @@ class Nicovideo < WebRadio
 		super
 	end
 
-	def download(name)
+	def download
 		begin
 			player_url = get_player_url(@url)
 		rescue NoMethodError
 			raise DownloadError.new('video not found')
 		end
-
 		video_id = Pathname(URI(player_url).path).basename.to_s
+		@cover = thumbinfo(video_id, 'thumbnail_url') unless @cover
+
 		video = @nico.video(video_id)
-		title = video.title || alt_title(video_id)
+		title = video.title || thumbinfo(video_id, 'title') || video_id
 		title.tr!('０-９', '0-9')
 		serial = title.scan(/(?:[#第]|[ 　]EP|track-)(\d+)|/).flatten.compact[0].to_i
 		appendix = title =~ /おまけ|アフタートーク/ ? 'a' : ''
-		@file = "#{name}##{'%02d' % serial}#{appendix}.#{video.type}"
+		@file = "#{@label}##{'%02d' % serial}#{appendix}.#{video.type}"
 		@mp3_file = @file.sub(/\....$/, '.mp3')
 		mp3nize(@file, @mp3_file) do
 			open(@file, 'wb:ASCII-8BIT') do |o|
@@ -76,8 +77,12 @@ private
 		end
 	end
 
-	def alt_title(video_id)
+	def thumbinfo(video_id, elem = nil)
 		xml = open("http://ext.nicovideo.jp/api/getthumbinfo/#{video_id}").read
-		xml.scan(%r|<title>(.*)</title>|m).flatten.first || video_id
+		if elem
+			return xml.scan(%r|<#{elem}>(.*)</#{elem}>|m).flatten.first
+		else
+			return xml
+		end
 	end
 end

data/lib/onsen.rb

@@ -4,8 +4,13 @@ require 'webradio'
 require 'nokogiri'
 
 class Onsen < WebRadio
-	def download(name)
-		onsen_download(name, @url.scan(%r|/([^/]*)/$|).flatten.first)
+	def initialize(params, options)
+		super
+		@cover = "//*[@id='newProgramWrap']//img[1]/@src" unless @cover
+	end
+
+	def download
+		onsen_download(@label, @url.scan(%r|/([^/]*)/$|).flatten.first)
 	end
 
 	def dump

data/lib/podcast.rb

@@ -9,9 +9,9 @@ class Podcast
 		yield self if block_given?
 	end
 
-	def download(name = nil)
+	def download
 		rss = RSS::Parser.parse(@url)
-		name = rss.channel.title unless name
+		label = @label || rss.channel.title
 		episode = rss.items.first
 		serial = episode.link.scan(%r|\d+[^/\.]*|).flatten.first
 		if serial.to_i > 2000 # may be year
@@ -22,7 +22,7 @@ class Podcast
 			return
 		end
 
-		file = "#{name}##{serial}.mp3"
+		file = "#{label}##{serial}.mp3"
 		if File.exist? file
 			puts "'#{file}' is existent. skipped."
 			return

data/lib/webradio.rb

@@ -2,39 +2,36 @@
 
 require 'open-uri'
 require 'open3'
+require 'mp3info'
 
 class WebRadio
 	class NotFoundError < StandardError; end
 	class DownloadError < StandardError; end
 
-	def self.instance(url, options)
-		case url
+	def self.instance(params, options)
+		case params['url']
 		when %r[^http://hibiki-radio\.jp/]
 			require 'hibiki'
-			Hibiki.new(url, options)
-		when %r[^http://sp\.animate\.tv/]
-			require 'animate'
-			Animate.new(url)
+			Hibiki.new(params, options)
 		when %r[^http://(www\.)?onsen\.ag/program/]
 			require 'onsen'
-			Onsen.new(url, options)
-		when %r[^http://seaside-c\.jp/program/], %r[http://nakamuland\.net/]
-			require 'seaside-c'
-			SeasideCommnunications.new(url, options)
+			Onsen.new(params, options)
 		when %r[nicovideo\.jp]
 			require 'nicovideo'
-			Nicovideo.new(url, options)
+			Nicovideo.new(params, options)
 		when %r[^https://freshlive\.tv/]
 			require 'freshlive'
-			FreshLive.new(url, options)
+			FreshLive.new(params, options)
 		else
-			raise 'unsupported url.'
+			raise "unsupported url: #{params['url']}"
 		end
 	end
 
-	def initialize(url, options)
+	def initialize(params, options)
 		raise 'do not instanciate directly, use WebRadio method.' if self.class == WebRadio
-		@url = url
+		@url = params['url']
+		@label = params['label']
+		@cover = params['cover']
 		@options = options
 		if !@options.dump && @options.path =~ %r|^dropbox://|
 			require 'dropbox'
@@ -42,7 +39,7 @@ class WebRadio
 		end
 	end
 
-	def download(name)
+	def download
 		raise 'not implemented.'
 	end
 
@@ -79,6 +76,7 @@ private
 			end
 		end
 		if !@options.mp3 || src == dst
+			add_cover(dst)
 			move(src) if @options.path
 			return
 		end
@@ -96,6 +94,7 @@ private
 		result = Open3.capture3(ffmpeg)
 		if result[2].to_i == 0
 			File.delete(src) if delete_src
+			add_cover(dst)
 			puts "done."
 		else
 			File.delete(dst) if File.exist?(dst)
@@ -106,6 +105,35 @@ private
 		move(dst) if @options.path
 	end
 
+	def add_cover(dst)
+		begin
+			mp3 = Mp3Info.new(dst)
+			mp3.tag.title = File.basename(dst, '.mp3')
+			mp3.tag2.add_picture(cover_image) if @cover
+			mp3.close
+		rescue
+			$stderr.puts "add mp3 info failed (#$!)"
+		end
+	end
+
+	def cover_image
+		if @cover =~ /^https?:/
+			cover_image_as_url()
+		else # XPath
+			cover_image_as_xpath()
+		end
+	end
+
+	def cover_image_as_url
+		open(@cover, 'rb', &:read)
+	end
+
+	def cover_image_as_xpath
+		html = Nokogiri(open(@url, &:read))
+		image_url = (URI(@url) + (html.xpath(@cover).text)).to_s
+		open(image_url, 'r:ASCII-8BIT', &:read)
+	end
+
 	def exist?(dst)
 		if @dropbox
 			begin

data/rget.gemspec

@@ -4,10 +4,10 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "rget"
-  spec.version       = "3.2.3"
+  spec.version       = "4.0.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, animate, onsen, seaside communications and niconico.}
+  spec.description   = %q{Downloading newest radio programs on the web. Supported radio stations are hibiki, onsen, niconico and freshlive.}
   spec.summary       = %q{Downloading newest radio programs on the web.}
   spec.homepage      = "https://bitbucket.org/tdtds/rget"
   spec.license       = "GPL"
@@ -22,6 +22,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "niconico", ">= 1.8.0"
   spec.add_runtime_dependency "pit"
   spec.add_runtime_dependency "dropbox-api", ">= 0.4.6"
+  spec.add_runtime_dependency "mp3info"
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"

data/rget.yaml

@@ -1,5 +1,5 @@
 options:
-  mp3nize: ffmpeg -i '$1' -ab 64k '$2'
+  mp3nize: ffmpeg -i '$1' -vn -acodec copy '$2' || ffmpeg -i '$1' -vn -y -ab 64k '$2'
 programs:
   imas_cg:
     desc: デレラジ☆
@@ -42,12 +42,11 @@ programs:
     desc: アイドルマスターWebラジオ～バンプレストスペシャル～ラジオは……遊びでは、ないんですから
     url: http://ch.nicovideo.jp/search/%E3%82%A2%E3%82%A4%E3%83%89%E3%83%AB%E3%83%9E%E3%82%B9%E3%82%BF%E3%83%BC?channel_id=ch346&mode=s&sort=f&order=d&type=video
     label: バンプレスト
-  amina1422:
-    desc: 佐藤亜美菜のこの世に小文字はいりません!
-    url: http://feeds.feedburner.com/amina1422
-    label: よにこも
-    podcast: true
   takamori:
     desc: 高森重戦舎 (声優バラエティ専門「声フレ」チャンネル内)
     url: https://freshlive.tv/seifre
     label: 高森重戦舎
+  matsui:
+    desc: ラジオ「松井恵理子のにじらじっ！」
+    url: http://www.onsen.ag/program/matsui/
+    label: 松井恵理子のにじらじ

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rget
 version: !ruby/object:Gem::Version
-  version: 3.2.3
+  version: 4.0.0
 platform: ruby
 authors:
 - TADA Tadashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-14 00:00:00.000000000 Z
+date: 2017-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.4.6
+- !ruby/object:Gem::Dependency
+  name: mp3info
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -123,10 +137,11 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 description: Downloading newest radio programs on the web. Supported radio stations
-  are hibiki, animate, onsen, seaside communications and niconico.
+  are hibiki, onsen, niconico and freshlive.
 email:
 - t@tdtds.jp
 executables:
+- add_mp3info
 - nicodl
 - rget
 extensions: []
@@ -137,16 +152,15 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- bin/add_mp3info
 - bin/nicodl
 - bin/rget
-- lib/animate.rb
 - lib/dropbox.rb
 - lib/freshlive.rb
 - lib/hibiki.rb
 - lib/nicovideo.rb
 - lib/onsen.rb
 - lib/podcast.rb
-- lib/seaside-c.rb
 - lib/uliza.rb
 - lib/webradio.rb
 - rget.gemspec
@@ -171,7 +185,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Downloading newest radio programs on the web.

data/lib/animate.rb

@@ -1,10 +0,0 @@
-# encoding: utf-8
-
-require 'uliza'
-
-class Animate < Uliza
-	def download(name)
-		uliza_download(name, open(@url, 'User-Agent' => 'iPhone', &:read), /(?:活動|第)(\d+)(?:週目『|回 「)/, %r|src="(http://www2.uliza.jp/IF/iphone/iPhonePlaylist.m3u8.*?)"|)
-	end
-end
-

data/lib/seaside-c.rb

@@ -1,24 +0,0 @@
-require 'webradio'
-
-class SeasideCommnunications < WebRadio
-	def download(name)
-		html = open(@url, &:read)
-		playlist_url, serial = html.scan(%r[(http:.*?\_(\d+).wax)]).flatten
-		unless playlist_url
-			raise WebRadio::DownloadError.new("recent radio program not found.")
-		end
-		serial = serial.to_i
-
-		playlist = open(playlist_url, &:read)
-		wma_url, = playlist.scan(%r[http://.*?\.wma])
-
-		@wma_file = "#{name}##{serial}.wma"
-		@mp3_file = @wma_file.sub(/\.wma$/, '.mp3')
-		mp3nize(@wma_file, @mp3_file) do
-			open(@wma_file, 'wb:ASCII-8BIT') do |wma|
-				wma.write(open(wma_url, &:read))
-			end
-		end
-	end
-end
-