rbtune 1.0.1 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f5e280b91c967fad699e9d8741a7ad90721431d592b26fd1a838c224cb1c0f94
-  data.tar.gz: b68ed39a2b494f2af7f6626e3d30959917a64a43d8c2b4a6e888bbca338b3333
+  metadata.gz: dc6b260518a675da6cb704c192d656e93f9e072e073f4a5f23b1d05274d010c0
+  data.tar.gz: 4ce90d7c6f6043a80d8e915d1f39e42f7381b3a8f2506cfef36552e1a847eadb
 SHA512:
-  metadata.gz: d6de553a844e73b388e26284e51d157c01ac931802e043158a621c943f7ceedadcced7d6c59cb1d69098f4d1aec84f22c5160d2c4159ec36789da24dbf981189
-  data.tar.gz: b5769b820fc79b85bc4f3fe7c8d4ec12829a0deb86963fecc036d2e8d84304dc91f3052e38b068469d722d6236f6a5cb1aa84d1f765741e839258cc937f9aa25
+  metadata.gz: c84c1ce4737dd272ca77f89724a31bb45d4861ab5efcda5887f305940a87192b92de52234f95388bb43d95f62ac8743c0334b1fb94418e19865a37fb7eefc7cc
+  data.tar.gz: ce82be9a5d93bd0bbb017403ab68c9345d1d1891f8724c81e5ed1aee788f652e7673eb0224a708d6ede28b41271fffc57707ffbafc10602fb2fbc646925d6c29

data/exe/timefree

@@ -86,7 +86,7 @@ sec = min*60
 begin
   radio = TimeFree.new
   radio.outdir = ENV['RADIODIR'] || '.'
-  if radio_class.is_a? RadikoPremium
+  if radio.is_a? RadikoPremium
     account, password = kc.account
     radio.login account, password
   end

data/lib/player/ffmpeg.rb

@@ -4,7 +4,8 @@ require "open3"
 require "player/mplayer"
 
 class FFMpeg < Player
-	def initialize
+	def initialize(hash={})
+		self.merge! hash
 		self['loglevel'] = 'warning'
 		self['n']        = '' # do not overwrite
 		@mplayer = Mplayer.new('-')
@@ -28,7 +29,7 @@ class FFMpeg < Player
 
 	def play
 		self['f'] = 'mpegts'
-		@output = 'pipe:1'
+		@output = '-'
 		cmd = "#{to_s} | #{@mplayer}"
 		$stderr.puts 'play: '+cmd
 		`#{cmd}`
@@ -39,12 +40,12 @@ class FFMpeg < Player
 	def rec(file, sec, quiet = true)
 		self['t'] = sec if sec
 		if quiet
-			@output = file
+			@output = %Q("#{file}")
 			cmd = to_s
 		else
 			self['f'] = 'mpegts'
-			@output = 'pipe:1'
-			cmd = "#{to_s} | tee #{file} | #{@mplayer}"
+			@output = '-'
+			cmd = %Q(#{to_s} | tee "#{file}" | #{@mplayer})
 		end
 
 		puts "rec: #{cmd}"

data/lib/player/mplayer.rb

@@ -37,7 +37,7 @@ class Mplayer < Player
 
 	def rec(file, sec, quiet = true)
 		self['dumpstream'] = ''
-		self['dumpfile']   = file
+		self['dumpfile']   = %Q("#{file}")
 		if quiet
 			self['nosound'] = ''	# 音声を再生しない
 		end

data/lib/player/rtmpdump.rb

@@ -16,7 +16,7 @@ class RtmpDump < Player
 
 	def play
 		# puts "play: #{to_s} | mplayer -"
-		`#{to_s} | mplayer -`
+		%x(#{to_s} | mplayer -)
 	end
 
 
@@ -24,12 +24,12 @@ class RtmpDump < Player
 		self['stop'] = sec
 
 		if quiet
-			self['flv'] = file
+			self['flv'] = %Q("#{file}")
 			puts "rec: #{to_s}"
-			`#{to_s}`
+			%x(#{to_s})
 		else
 			puts "rec: #{to_s}"
-			`#{to_s} | tee #{file} | mplayer -`
+			%x(#{to_s} | tee "#{file}" | mplayer -)
 		end
 	end
 

data/lib/rbtune/agqr.rb

@@ -1,36 +1,15 @@
 # 文化放送 超A&G+ を受信する
 
 require "rbtune/radio"
-require "player/rtmpdump"
-require "player/ffmpeg"
-require "fileutils"
 
 class Agqr < Radio
   def initialize
-    @ext     = 'flv'
-    @out_ext = 'm4a'
+    @ext = 'm4a'
   end
 
   def fetch_stations
-    uri = "rtmp://fms-base1.mitene.ad.jp/agqr/aandg1"
+    uri = 'https://fms2.uniqueradio.jp/agqr10/aandg1.m3u8'
     [Station.new('AGQR', uri, name: '超A&G+', ascii_name: 'aandg1')]
   end
 
-
-  def create_player(uri)
-    rtmpdump           = RtmpDump.new
-    rtmpdump['rtmp']   = uri
-    rtmpdump
-  end
-
-
-  def convert(tmpfile, recfile)
-    ffmpeg = FFMpeg.new
-    ffmpeg['loglevel'] = 'quiet'
-    ffmpeg['i'] = %Q("#{tmpfile}")
-    ffmpeg['acodec'] = 'copy'
-    stdout, stderr, status = ffmpeg.rec recfile, nil
-    FileUtils.rm tmpfile if status.success?
-  end
-
 end

data/lib/rbtune/jcba.rb

@@ -3,7 +3,6 @@
 JCBAサイマルラジオを受信する
 =end
 require "rbtune/listenradio"
-require "rbtune/station"
 
 
 class Jcba < ListenRadio

data/lib/rbtune/listenradio.rb

@@ -5,7 +5,6 @@
 
 
 require "rbtune/radio"
-require "player/ffmpeg"
 require "json"
 
 
@@ -16,13 +15,6 @@ class ListenRadio < Radio
 		@ext = 'mp4'
 	end
 
-	def create_player(uri)
-		player = FFMpeg.new
-		player['i']      = uri     # input stream
-		player['acodec'] = 'copy'  # acodecオプションはiオプションのあとに置かないとエラー
-		player
-	end
-
 
 	def stations_uri
 		'http://listenradio.jp/service/channel.aspx'

data/lib/rbtune/radiko.rb

@@ -1,84 +1,56 @@
 #radiko.rb
 # coding: utf-8
 
-require "mechanize"
 require "rbtune/radio"
-require "player/rtmpdump"
-require 'swf_ruby'
 
 
 class Radiko < Radio
 	attr_reader :authtoken
 
 
-	def playerurl
-		"http://radiko.jp/apps/js/flash/myplayer-release.swf"
-	end
-
-
-	def playerfile
-		"player.swf"
-	end
-
-
-	def keyfile
-		"authkey.png"
-	end
-
-
 	# get_auth2 の返り値により @area_id, @area_ja, @area_en が設定される
 	def open
-		unless File.exists? playerfile
-			$stderr.puts 'fetching player...'
-			fetch_file playerurl, playerfile
-		end
-		unless File.exists? keyfile
-			swfextract playerfile, 12, keyfile
-		end
-
-		@authtoken, partialkey = authenticate1 'https://radiko.jp/v2/api/auth1_fms'
-		@area_id, @area_ja, @area_en = authenticate2 'https://radiko.jp/v2/api/auth2_fms', authtoken, partialkey
+		@authtoken, partialkey = authenticate1 'https://radiko.jp/v2/api/auth1'
+		@area_id, @area_ja, @area_en = authenticate2 'https://radiko.jp/v2/api/auth2', authtoken, partialkey
 		puts "area: #{area_id} (#{area_ja}: #{area_en})"
 	end
 
 
 	def channel_to_uri
-		xml = agent.get "http://radiko.jp/v2/station/stream/#{@channel}.xml"
-		xml.at('//url/item').text
+		uri = "http://radiko.jp/v2/station/stream_smh_multi/#{@channel}.xml"
+		xml = agent.get uri
+		xml.at('//url/playlist_create_url').text
 	end
 
 
 	def create_player(uri)
-		rtmpdump           = RtmpDump.new
-		rtmpdump['rtmp']   = uri
-		rtmpdump['swfVfy'] = playerurl
-		rtmpdump['conn']   = %Q(S:"" --conn S:""  --conn S:""  --conn S:#{authtoken})
-		rtmpdump
+		FFMpeg.new( {
+			headers: %Q("X-Radiko-Authtoken: #{authtoken}"),
+			i: %Q("#{uri}"),
+			# acodec: 'copy', # acodecオプションはiオプションのあとに置かないとエラー
+		} )
 	end
 
 
 	def authenticate1(url)
-		res = agent.post url, {}, {
-				'pragma'               => 'no-cache',
-				'X-Radiko-App'         => 'pc_ts',
-				'X-Radiko-App-Version' => '4.0.0',
-				'X-Radiko-User'        => 'test-stream',
+		agent.request_headers = {
+				'X-Radiko-App'         => 'pc_html5',
+				'X-Radiko-App-Version' => '0.0.1',
 				'X-Radiko-Device'      => 'pc',
+				'X-Radiko-User'        => 'dummy_user',
 			}
-		s = res.body
-		s.sub! /\r\n\r\n.*/m, ''
-		arr = s.split(/\r\n/).map{|s| s.split('=')}.flatten
-		auth1 = Hash[*arr]
-		authtoken = auth1['X-Radiko-AuthToken'] || auth1['X-RADIKO-AUTHTOKEN']
-		offset = auth1['X-Radiko-KeyOffset'].to_i
-		length = auth1['X-Radiko-KeyLength'].to_i
-		partialkey = read_partialkey keyfile, offset, length
+		res = agent.get url
+		auth1 = res.response
+		authtoken = auth1['x-radiko-authtoken']
+		offset = auth1['x-radiko-keyoffset'].to_i
+		length = auth1['x-radiko-keylength'].to_i
+		partialkey = read_partialkey offset, length
 		[authtoken, partialkey]
 	end
 
 
-	def read_partialkey(file, offset, length)
-		key = File.open(file, "rb") { |io| io.read(offset + length) }
+	def read_partialkey(offset, length)
+		key = "bcd151073c03b352e1ef2fd66c32209da9ca0afa"
 		Base64.encode64(key[offset,length]).chomp
 	end
 
@@ -87,15 +59,13 @@ class Radiko < Radio
 	def authenticate2(url, authtoken, partialkey)
 		# pp [url, authtoken, partialkey]
 		agent.verify_mode = OpenSSL::SSL::VERIFY_NONE
-		res = agent.post url, {}, {
-			'pragma'               => 'no-cache',
-			'X-Radiko-App'         => 'pc_ts',
-			'X-Radiko-App-Version' => '4.0.0',
-			'X-Radiko-User'        => 'test-stream',
+		agent.request_headers = {
 			'X-Radiko-Device'      => 'pc',
+			'X-Radiko-User'        => 'dummy_user',
 			'X-Radiko-Authtoken'   => authtoken,
 			'X-Radiko-Partialkey'  => partialkey,
 		}
+		res = agent.get url
 		body = res.body
 		body.force_encoding 'utf-8'
 		body.split(',').map(&:strip)
@@ -119,25 +89,4 @@ class Radiko < Radio
 	end
 
 
-	def fetch_file(url, file=nil)
-		content = agent.get_file(url)
-		File.open(file, "wb") { |fout| fout.write content } if file
-		content
-	end
-
-
-	def swfextract(swffile, character_id, out_file)
-		swf = SwfRuby::SwfDumper.new
-		swf.open(swffile)
-		swf.tags.each_with_index do |tag, i|
-			tag = swf.tags[i]
-			if tag.character_id && tag.character_id == character_id
-				offset = swf.tags_addresses[i]
-				len = tag.length
-				File.open(out_file, 'wb') { |out| out.print tag.data[6..-1] }
-				break
-			end
-		end
-	end
-
 end

data/lib/rbtune/radio.rb

@@ -10,7 +10,9 @@
 require "date"
 require "benchmark"
 require "net/http"
-require "rexml/document"
+require "mechanize"
+require "player/ffmpeg"
+require "rbtune/station"
 
 class Radio
 	attr_accessor :outdir
@@ -88,7 +90,11 @@ class Radio
 
 
 	def create_player(uri)
-		# rtmpdumpのコマンドラインを生成する(playから呼ばれる)
+		# Player のサブクラスのインスタンスを生成する
+		FFMpeg.new( {
+			i: uri,
+			# acodec: 'copy', # acodecオプションはiオプションのあとに置かないとエラー
+		} )
 	end
 
 
@@ -167,7 +173,7 @@ class Radio
 		ffmpeg = FFMpeg.new
 		ffmpeg['loglevel'] = 'quiet'
 		ffmpeg['i'] = %Q("#{tmpfile}")
-		ffmpeg['b:a'] = '70k'
+		# ffmpeg['b:a'] = '70k'
 		stdout, stderr, status = ffmpeg.rec recfile, nil
 		FileUtils.rm tmpfile if status.success?
 	end

data/lib/rbtune/radiru.rb

@@ -2,51 +2,41 @@
 # coding: utf-8
 
 require "rbtune/radio"
-require "player/ffmpeg"
-require "fileutils"
 
 class Radiru < Radio
 
 
-	def create_player(uri)
-		ffmpeg           = FFMpeg.new
-		ffmpeg['i']      = uri # input stream
-		ffmpeg['acodec'] = 'copy'  # acodecオプションはiオプションのあとに置かないとエラー
-		ffmpeg
+	def stations_uri
+		"https://www.nhk.or.jp/radio/config/config_web.xml"
 	end
 
 
-  def stations_uri
-    "https://www.nhk.or.jp/radio/config/config_web.xml"
-  end
-
-
-  def parse_stations(body)
-    stations = body.search '//data'
-    stationsjp = {
-      'r1' => "ラジオ第1",
-      'r2' => "ラジオ第2",
-      'fm' => "FM",
-    }
-    stations = stations.map do |station|
-      areajp = station.at('areajp').text
-      area   = station.at('area').text
-      # 地区ごとに第1, 第2, FM を登録する
-      r1, r2, fm = %w(r1 r2 fm).map do |v|
-        hls  = "#{v}hls"
-        id   = "nhk#{v}-#{area}".upcase
-        uri  = station.at(hls).text
-        name = "NHK#{stationsjp[v]}-#{areajp}"
-        Station.new(id, uri, name: name, ascii_name: id)
-      end
-    end
-    stations.flatten!
-    # id: NHKR1, NHKR2, NHKFM を東京局に割り当てる　
-    stations.find_all { |station| station.id =~ /-TOKYO/}.reverse.map do |station|
-      id = station.id.sub(/-TOKYO/, '')
-      stations.unshift Station.new(id, station.uri, name: station.name, ascii_name: id)
-    end
-    stations
-  end
+	def parse_stations(body)
+		stations = body.search '//data'
+		stationsjp = {
+			'r1' => "ラジオ第1",
+			'r2' => "ラジオ第2",
+			'fm' => "FM",
+		}
+		stations = stations.map do |station|
+			areajp = station.at('areajp').text
+			area   = station.at('area').text
+			# 地区ごとに第1, 第2, FM を登録する
+			r1, r2, fm = %w(r1 r2 fm).map do |v|
+				hls  = "#{v}hls"
+				id   = "nhk#{v}-#{area}".upcase
+				uri  = station.at(hls).text
+				name = "NHK#{stationsjp[v]}-#{areajp}"
+				Station.new(id, uri, name: name, ascii_name: id)
+			end
+		end
+		stations.flatten!
+		# id: NHKR1, NHKR2, NHKFM を東京局に割り当てる　
+		stations.find_all { |station| station.id =~ /-TOKYO/}.reverse.map do |station|
+			id = station.id.sub(/-TOKYO/, '')
+			stations.unshift Station.new(id, station.uri, name: station.name, ascii_name: id)
+		end
+		stations
+	end
 
 end

data/lib/rbtune/simul.rb

@@ -2,14 +2,13 @@
 
 require "rbtune/radio"
 require "player/mplayer"
-require "rbtune/station"
+require "rexml/document"
 
 class Simul < Radio
 
 	def initialize
 		super
 		@ext     = 'asf'
-		@out_ext = 'm4a'
 	end
 
 
@@ -44,11 +43,6 @@ class Simul < Radio
 	end
 
 
-	def convert(tmpfile, recfile)
-		convert_ffmpeg(tmpfile, recfile)
-	end
-
-
 	def link_to_station_id(link)
 		link =~ %r{(/asx/([\w-]+).asx|nkansai.tv/(\w+)/?\Z|(flower|redswave|fm-tanba|darazfm|AmamiFM|comiten|fm-shimabara|fm-kitaq))}
 		id = ($2 || $3 || $4).sub(/fm[-_]/, 'fm').sub(/[-_]fm/, 'fm')

data/lib/rbtune/timefree.rb

@@ -1,8 +1,5 @@
 require "rbtune/radiko_premium"
-require "rbtune/station"
-require "player/ffmpeg"
 require "date"
-require "fileutils"
 
 class DateTime
 	def timefree
@@ -40,12 +37,9 @@ class TimeFree < RadikoPremium
 	end
 
 
-	def create_player(uri)
-		ffmpeg = FFMpeg.new
-		ffmpeg['loglevel'] = 'info'
-		ffmpeg['headers']  = %Q("X-Radiko-AuthToken: #{authtoken}")
-		ffmpeg['i']        = %Q("#{uri}")
-		ffmpeg['acodec']   = 'copy' # acodecオプションはiオプションのあとに置かないとエラー
-		ffmpeg
-	end
+  def create_player(uri)
+    player = super
+    player['acodec'] = 'copy'
+    player
+  end
 end

data/lib/rbtune/version.rb

@@ -1,3 +1,3 @@
 module Rbtune
-  VERSION = "1.0.1"
+  VERSION = "1.1.3"
 end

data/rbtune.gemspec

@@ -24,11 +24,8 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "mechanize", "~> 2.7"
-  spec.add_dependency "rmagick", "= 2.13.2" # swf_ruby が依存するので固定
-  spec.add_dependency "swf_ruby", "~> 0.2"
   spec.add_dependency "pit", "~> 0.0.7"
   spec.add_development_dependency "bundler", "~> 2.1"
-  spec.add_development_dependency "rake", "~> 10.0"
-  # spec.add_development_dependency "pry"
+  spec.add_development_dependency "rake", ">= 12.3.3"
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbtune
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.3
 platform: ruby
 authors:
 - ASAHI,Michiharu
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-07-01 00:00:00.000000000 Z
+date: 2021-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mechanize
@@ -24,34 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.7'
-- !ruby/object:Gem::Dependency
-  name: rmagick
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.13.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.13.2
-- !ruby/object:Gem::Dependency
-  name: swf_ruby
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: pit
   requirement: !ruby/object:Gem::Requirement
@@ -84,16 +56,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 description: Playing and Recording Radiko, Radiru*Radiru and the other IP simulcast
   sites.
 email: