rget 4.11.0 → 4.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 399f9407dcfa7a2c99884c4c7c1cac60fabaae386622bac006896d877e2f1c71
-  data.tar.gz: 5ba2047c907946753452437b51ecf3a55f3e7fa97e247c6ffab04f10badda4fc
+  metadata.gz: 313f0120701854057599c157f85971584cd70eed1dd45f6d8cc5ea1444cc714c
+  data.tar.gz: 0f998f200f67b6a28186d3070b4b3f03e50b76d14e9c6def56a39afbdfda7a52
 SHA512:
-  metadata.gz: f0d57aff2683b09e53fbd663a11db02e862430d51ed97588c317e1432aa0b5d13625fc6747a8c83b210b1b394a726c48662af5c2b22ba24bbd08d8ddebf08487
-  data.tar.gz: de34fca3119bbb1a78704131e0a825fe3f2d0b77d1426dbe08bb0cf94eed751f6961b1c34e37a55f2907dfafed803877f692aeafffe780f9513b1b239270ba03
+  metadata.gz: 8ce23bc480247bcf370528ac3f08191846516d5746f0a075862f21eb7e863caf2b6e89ecb297766018b248e8ddcb76b0ce477cd98ec5e58939a15f38da27930d
+  data.tar.gz: 7cdfbc35c482db64f26899523d0338d69ca5faa82b70b84f187d4824766c97e2dc86f06d89565c9f4d54586a8449453a9aa3384cad17465a1446e251f8c19e28

data/.devcontainer/devcontainer.json

@@ -13,7 +13,10 @@
 
   // Add the IDs of extensions you want installed when the container is created.
   "extensions": [
-		"rebornix.ruby"
+    "rebornix.ruby"
+    ,"github.vscode-pull-request-github"
+    ,"eamodio.gitlens"
+    ,"donjayamanne.githistory"
   ],
 
   // Uncomment the next line if you want start specific services in your Docker Compose config.

data/README.md

@@ -8,7 +8,7 @@ Downloading newest radio programs on the web. Supported radio stations are:
 * himalaya.fm
 * Asobi Store
 * stand.fm
-* YouTube (playlist only)
+* YouTube (playlist or  channel)
 
 If you want to save files as MP3, needs `ffmpeg` command.
 To download niconico video or YouTube, also needs latest `youtube-dl` command (you can get it from `https://yt-dl.org/`), then specify user ID and password to `~/.netrc` for niconico as:

data/lib/webradio.rb

@@ -20,9 +20,6 @@ class WebRadio
 		when %r[nicovideo\.jp]
 			require 'nicovideo'
 			Nicovideo.new(params, options)
-		when %r[^https://freshlive\.tv/]
-			require 'freshlive'
-			FreshLive.new(params, options)
 		when %r[^http://m\.himalaya\.fm/]
 			require 'himalaya'
 			Himalaya.new(params, options)
@@ -34,7 +31,10 @@ class WebRadio
 			StandFm.new(params, options)
 		when %r[^https://www\.youtube\.com/playlist]
 			require 'youtube'
-			Youtube.new(params, options)
+			YoutubePlaylist.new(params, options)
+		when %r[^https://www\.youtube\.com/c/]
+			require 'youtube'
+			YoutubeChannel.new(params, options)
 		else
 			raise UnsupportError, "unsupported url: #{params['url']}"
 		end

data/lib/youtube.rb

@@ -1,40 +1,121 @@
 require 'open-uri'
 require 'json'
+require 'nokogiri'
 
 class Youtube < WebRadio
-	def initialize(params, options)
-		super
-		@offset = 0
-	end
+    def initialize(params, options)
+    super
+        @offset = 0
+        @target_content = []
+  end
 
-    def download
-        html = URI.open(@url).read
-        json_str = html.scan(/ytInitialData = (.*);<\/script>/).flatten.first
-        json = JSON.parse(json_str)
-        title = json["contents"]["twoColumnBrowseResultsRenderer"]["tabs"][0]["tabRenderer"]["content"]["sectionListRenderer"]["contents"][0]["itemSectionRenderer"]["contents"][0]["playlistVideoListRenderer"]["contents"][0]["playlistVideoRenderer"]["title"]["runs"][0]["text"]
-        @cover = json["contents"]["twoColumnBrowseResultsRenderer"]["tabs"][0]["tabRenderer"]["content"]["sectionListRenderer"]["contents"][0]["itemSectionRenderer"]["contents"][0]["playlistVideoListRenderer"]["contents"][0]["playlistVideoRenderer"]["thumbnail"]["thumbnails"].last["url"]
-        mp4_url = "https://www.youtube.com#{json["contents"]["twoColumnBrowseResultsRenderer"]["tabs"][0]["tabRenderer"]["content"]["sectionListRenderer"]["contents"][0]["itemSectionRenderer"]["contents"][0]["playlistVideoListRenderer"]["contents"][0]["playlistVideoRenderer"]["navigationEndpoint"]["commandMetadata"]["webCommandMetadata"]["url"]}"
-        serial = title.scan(/[0-9]+/).first
+    private
 
-        mp4_file = "#{@label}##{serial}.mp4"
-        mp3_file = "#{@label}##{serial}.mp3"
+    def youtube_download(mp4_url, mp4_file, mp3_file)
         begin
             mp3nize(mp4_file, mp3_file) do
                 loop do
                     print '.'
-                    _, err, status = Open3.capture3("youtube-dl -f mp4 -o #{mp4_file} --netrc '#{mp4_url}'")
+                    _, err, status = Open3.capture3("youtube-dl -f mp4 -o '#{mp4_file}' --netrc '#{mp4_url}'")
                     break if status == 0
                     next if err =~ /403: Forbidden/
                     raise ForbiddenError.new("Could not access to #{mp4_url}") if err =~ /TypeError|AssertionError/
                     raise DownloadError.new(err)
                 end
             end
-		rescue ForbiddenError
-			puts "#{$!.message}, try next."
-			@offset += 1
-			retry
-		rescue NotFoundError
-			raise DownloadError.new('video not found')
+    rescue ForbiddenError
+      puts "#{$!.message}, try next."
+      @offset += 1
+      retry
+    rescue NotFoundError
+      raise DownloadError.new('video not found')
+        end
+    end
+
+    def first_video(html)
+        json_str = html.scan(/ytInitialData = (.*);<\/script>/).flatten.first
+        json = JSON.parse(json_str)
+        contents = json.dig(*@target_content)
+        yield contents.first
+    end
+
+    def serial_file(title, label, serial, ext)
+        if serial > 0
+            "#{@label}##{serial}.#{ext}"
+        else
+            "#{title}.#{ext}"
         end
     end
 end
+
+class YoutubePlaylist < Youtube
+
+    def initialize(params, options)
+    super
+    @target_content = ["contents", "twoColumnBrowseResultsRenderer", "tabs", 0, "tabRenderer", "content", "sectionListRenderer", "contents", 0, "itemSectionRenderer", "contents", 0, "playlistVideoListRenderer", "contents"].freeze
+  end
+
+    def download
+        first_video(URI.open(@url).read) do |content|
+            item = content['playlistVideoRenderer']
+            @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"]}"
+
+            mp4_file = serial_file title, @label, serial, 'mp4'
+            mp3_file = serial_file title, @label, serial, 'mp3'
+
+            youtube_download url, mp4_file, mp3_file
+        end
+    end
+
+    def dump
+      uri = URI(@url)
+      tag = Hash[URI.decode_www_form(File.basename(uri.query))]['list']
+      html = Nokogiri(uri.open.read)
+      label, = html.css('title').text.split(/ - .*\Z/)
+      return {
+        tag => {
+          'desc' => label,
+          'url' => @url,
+          'label' => label
+        }
+      }
+     end
+end
+
+class YoutubeChannel < Youtube
+  def initialize(params, options)
+        super
+        @target_content = ['contents', 'twoColumnBrowseResultsRenderer', 'tabs', 1, 'tabRenderer', 'content', 'sectionListRenderer', 'contents', 0, 'itemSectionRenderer', 'contents', 0, 'gridRenderer', 'items'].freeze
+    end
+
+    def download
+        first_video(URI.open(@url).read) do |content|
+            item = content['gridVideoRenderer']
+            @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']}"
+
+            mp4_file = serial_file title, @label, serial, 'mp4'
+            mp3_file = serial_file title, @label, serial, 'mp3'
+
+            youtube_download url, mp4_file, mp3_file
+        end
+    end
+
+    def dump
+      tag = @url.scan(%r|/c/([^/]*)|).flatten.first
+      html = Nokogiri(URI(@url).open.read)
+      label = html.css('meta[property="og:title"]').attr('content').text
+      return {
+        tag => {
+          'desc' => label,
+          'url' => "#{@url.scan(%r|(.*?/c/[^/]*)|).flatten.first}/videos?view=0&sort=dd&flow=grid",
+          'label' => label
+        }
+      }
+    end
+end

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       = "4.11.0"
+  spec.version       = "4.12.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 playlist.}
+  spec.description   = %q{Downloading newest radio programs on the web. Supported radio stations are hibiki, onsen, niconico, himalaya, asobi store, stand.fm and youtube.}
   spec.summary       = %q{Downloading newest radio programs on the web.}
   spec.homepage      = "https://github.com/wasamas/rget"
   spec.license       = "GPL"

data/rget.yaml

@@ -30,4 +30,8 @@ programs:
   active:
     desc: 愛美とはるかの2年A組青春アクティ部!
     url: https://www.youtube.com/playlist?list=PLI5zma0g_n8_y5Xk5eFwX8osz4Q2a3cqU
-    label: アクティ部
+    label: アクティ部
+  shimotsukin:
+    desc: 霜月はるかのしもつきんチャンネル
+    url: https://www.youtube.com/c/shimotsukinchannel/videos?view=0&sort=dd&flow=grid
+    label: しもつきん

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rget
 version: !ruby/object:Gem::Version
-  version: 4.11.0
+  version: 4.12.0
 platform: ruby
 authors:
 - Tada, Tadashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-03 00:00:00.000000000 Z
+date: 2021-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -151,7 +151,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 description: Downloading newest radio programs on the web. Supported radio stations
-  are hibiki, onsen, niconico, himalaya, asobi store, stand.fm and youtube playlist.
+  are hibiki, onsen, niconico, himalaya, asobi store, stand.fm and youtube.
 email:
 - t@tdtds.jp
 executables:
@@ -174,7 +174,6 @@ files:
 - bin/rget
 - lib/asobistore.rb
 - lib/dropbox.rb
-- lib/freshlive.rb
 - lib/hibiki.rb
 - lib/himalaya.rb
 - lib/hls.rb

data/lib/freshlive.rb

@@ -1,113 +0,0 @@
-require 'webradio'
-require 'nokogiri'
-require 'json'
-
-class FreshLive < WebRadio
-	def download
-		if URI(@url).path =~ %r|/search/|
-			archive = @url
-		else
-			archive = URI(File.join(@url + '/programs/archive'))
-		end
-
-		each_programs(Nokogiri(URI.open(archive).read)) do |meta|
-			begin
-				serial = meta['data']['title'].scan(/\d+$/).first.to_i
-				src = "#{@label}##{'%02d' % serial}.ts"
-				dst = src.sub(/\.ts$/, @options.mp3 ? '.mp3' : '.mp4')
-				if exist?(dst)
-					puts "#{dst} is existent, skipped."
-					return
-				end
-				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(URI.open(u, 'rb').read)
-						end
-					end
-				end
-				if @options.mp3
-					dst = to_mp3(src)
-				else
-					dst = to_mp4(src)
-				end
-				puts 'done.'
-				move(dst)
-				return
-			rescue OpenURI::HTTPError
-				puts 'try next.'
-				next
-			rescue
-				puts 'fail.'
-				$stderr.puts 'faild to convert .ts => .mp4'
-				return
-			end
-		end
-		puts 'fail.'
-		$stderr.puts 'free program not found.'
-	end
-
-	def dump
-		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(URI.open(@url, &:read)).css('script').first)
-			return {
-				tag => {
-					'desc' => meta['name'],
-					'url' => @url,
-					'label' => tag
-				}
-			}
-		end
-	end
-
-private
-	def each_programs(html)
-		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(URI.open("https://freshlive.tv/proxy/Programs;id=#{id}", &:read))
-		end
-	end
-
-	def ts_list(rate_m3u8)
-		ts_m3u8 = URI.open(rate_m3u8).read.each_line.grep_v(/^#/)[1].chomp
-		URI.open(URI(rate_m3u8) + ts_m3u8).read.each_line.grep_v(/^#/).map{|u|URI(rate_m3u8) + u.chomp}
-	end
-
-	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}'"
-		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