rget 4.12.0 → 4.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 313f0120701854057599c157f85971584cd70eed1dd45f6d8cc5ea1444cc714c
-  data.tar.gz: 0f998f200f67b6a28186d3070b4b3f03e50b76d14e9c6def56a39afbdfda7a52
+  metadata.gz: 680138673b4a74e24fc3114cfefd7e4d7a1f4f56fe37ca70b7848c0256b95d63
+  data.tar.gz: fe7fdd1168af355285b5ec7ab4c9741f1acdd4fc496ea3a2bc9e59b5869f7011
 SHA512:
-  metadata.gz: 8ce23bc480247bcf370528ac3f08191846516d5746f0a075862f21eb7e863caf2b6e89ecb297766018b248e8ddcb76b0ce477cd98ec5e58939a15f38da27930d
-  data.tar.gz: 7cdfbc35c482db64f26899523d0338d69ca5faa82b70b84f187d4824766c97e2dc86f06d89565c9f4d54586a8449453a9aa3384cad17465a1446e251f8c19e28
+  metadata.gz: 394aac18d5099e78ef52c99896a132fdc805edc8670fa7e980e074ffd8ecd7fd02cf6ae423c059852c43253ab585b82d720d1400602c127a6dbd46ac80f3474e
+  data.tar.gz: d01d41849aa9e3ac8cef2e3e523b62445116bffe09952d7f91909a82c2e1b7d47de58429d537eb423a35c563ebe84ce29eecbdd42ed26c07629b0ee2a346fc88

data/.devcontainer/Dockerfile

@@ -1,4 +1,4 @@
-FROM ruby:2
+FROM ruby:3
 ENV USER vscode
 LABEL maintainer "@tdtds <t@tdtds.jp>"
 RUN apt-get -y update && apt-get -y install ffmpeg && \

data/lib/hls.rb

@@ -3,13 +3,14 @@ require 'open3'
 
 class HLS < WebRadio
 private
-	def hls_download(name, serial, m3u_meta)
+	def hls_download(name, serial, m3u_meta, headers = {})
 		mp4_file = "#{name}##{serial}.mp4"
 		mp3_file = "#{name}##{serial}.mp3"
-		m3u = URI.open(m3u_meta, &:read).scan(/^[^#].*/).first
+		m3u = URI.open(m3u_meta, headers, &:read).scan(/^[^#].*/).first
 		m3u = Pathname(m3u_meta).dirname.join(m3u) if Pathname(m3u).relative?
+		ffmpeg_headers = headers.empty? ? '' : "-headers '" + headers.map{|k, v| "#{k}: #{v}"}.join("\r\n") + "'"
 		mp3nize(mp4_file, mp3_file) do
-			result = Open3.capture3(%Q[ffmpeg -loglevel error -protocol_whitelist file,http,https,tcp,tls,crypto -i "#{m3u}" "#{mp4_file}"])
+			result = Open3.capture3(%Q[ffmpeg -loglevel error -protocol_whitelist file,http,https,tcp,tls,crypto #{ffmpeg_headers} -i "#{m3u}" "#{mp4_file}"])
 			unless result[2].to_i == 0
 				raise WebRadio::DownloadError.new("failed download the radio program (#{@label}).")
 			end

data/lib/onsen.rb

@@ -5,21 +5,25 @@ require 'nokogiri'
 require 'json'
 
 class Onsen < HLS
+	HEADERS = {
+		"Referer" => 'https://www.onsen.ag/'
+	}
+
 	def initialize(params, options)
 		super
 		@cover = "//*[@class='newest-content--left']//img[1]/@src" unless @cover
 	end
 
 	def download
-		html = URI.open(@url, &:read)
+		html = URI.open(@url, HEADERS, &:read)
 		serial = Nokogiri(html).css('.play-video-info td')[0].text.scan(/\d+/)[0].to_i
 		m3u8 = JSON.parse(html.scan(%r|streaming_url:("https:.*?.m3u8")|).flatten.sort.last)
-		hls_download(@label, serial, m3u8)
+		hls_download(@label, serial, m3u8, HEADERS)
 	end
 
 	def dump
 		tag = Pathname(@url).basename.to_s.gsub(%r|[-/]|, '_')
-		html = Nokogiri(URI.open(@url, &:read))
+		html = Nokogiri(URI.open(@url, HEADERS, &:read))
 		title = html.css('h3')[0].text
 		return {
 			tag => {

data/lib/youtube.rb

@@ -61,7 +61,7 @@ class YoutubePlaylist < Youtube
             @cover = item['thumbnail']['thumbnails'].last['url']
             title = item['title']['runs'][0]['text']
             serial = title.scan(/\d+/).first.to_i
-            url = "https://www.youtube.com#{item["navigationEndpoint"]["commandMetadata"]["webCommandMetadata"]["url"]}"
+            url = "https://www.youtube.com/watch?v=#{item["videoId"]}"
 
             mp4_file = serial_file title, @label, serial, 'mp4'
             mp3_file = serial_file title, @label, serial, 'mp3'

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.12.0"
+  spec.version       = "4.13.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, himalaya, asobi store, stand.fm and youtube.}
@@ -23,6 +23,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "pit"
   spec.add_runtime_dependency "dropbox_api"
   spec.add_runtime_dependency "mp3info"
+  spec.add_runtime_dependency "rss"
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"

data/rget.yaml

@@ -9,7 +9,6 @@ programs:
     desc: ラジオ「松井恵理子のにじらじっ！」
     url: http://www.onsen.ag/program/matsui/
     label: 松井恵理子のにじらじ
-    cover: //*[@id='newProgramWrap']//img[1]/@src
   suzakinishi:
     desc: 洲崎西
     url: http://ch.nicovideo.jp/search/%E6%B4%B2%E5%B4%8E%E8%A5%BF?channel_id=ch2589908&mode=s&sort=f&order=d&type=video

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rget
 version: !ruby/object:Gem::Version
-  version: 4.12.0
+  version: 4.13.0
 platform: ruby
 authors:
 - Tada, Tadashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-17 00:00:00.000000000 Z
+date: 2021-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -94,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rss
+  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
@@ -204,7 +218,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.2.32
 signing_key: 
 specification_version: 4
 summary: Downloading newest radio programs on the web.