bilibili_console 0.0.1 → 0.0.3

data/lib/bilibili_console/http/response_body.rb

@@ -1,28 +1,28 @@
-# frozen_string_literal: true
-
-# Copyright (c) 2021 leejoker
-#
-# This software is released under the MIT License.
-# https://opensource.org/licenses/MIT
-
-require_relative 'http'
-
-# response body
-module BiliHttp
-  # response body
-  class ResponseBody
-    attr_accessor :code, :message, :ts, :data, :status
-
-    def initialize(json)
-      @code = json[:code]
-      @message = json[:message]
-      @ts = json[:ts]
-      @status = json[:status]
-      @data = json[:data]
-    end
-
-    def to_s
-      "code: #{@code}, message: #{@message}, ts: #{@ts}, data: #{@data}, status: #{@status}"
-    end
-  end
-end
+# frozen_string_literal: true
+
+# Copyright (c) 2021 leejoker
+#
+# This software is released under the MIT License.
+# https://opensource.org/licenses/MIT
+
+require_relative 'http'
+
+# response body
+module BiliHttp
+  # response body
+  class ResponseBody
+    attr_accessor :code, :message, :ts, :data, :status
+
+    def initialize(json)
+      @code = json[:code]
+      @message = json[:message]
+      @ts = json[:ts]
+      @status = json[:status]
+      @data = json[:data]
+    end
+
+    def to_s
+      "code: #{@code}, message: #{@message}, ts: #{@ts}, data: #{@data}, status: #{@status}"
+    end
+  end
+end

data/lib/bilibili_console/login.rb

@@ -1,102 +1,103 @@
-# frozen_string_literal: true
-
-# Copyright (c) 2021 leejoker
-#
-# This software is released under the MIT License.
-# https://opensource.org/licenses/MIT
-
-require_relative 'http/http'
-require_relative 'base'
-require 'rqrcode'
-require 'json'
-
-# login module
-module Bilibili
-  include BiliHttp
-  # bilibili user info
-  class UserInfo
-    attr_accessor :face, :level_info, :uid, :money, :moral, :uname, :vip_type
-
-    def initialize(json)
-      return if json.nil?
-
-      @face = json[:face]
-      @level_info = json[:level_info]
-      @uid = json[:mid]
-      @money = json[:money]
-      @moral = json[:moral]
-      @uname = json[:moral]
-      @vip_type = json[:vipType]
-    end
-
-    def to_json(*opt)
-      {
-        face: @face,
-        level_info: @level_info,
-        uid: @uid,
-        money: @money,
-        moral: @moral,
-        uname: @uname,
-        vip_type: @vip_type
-      }.to_json(*opt)
-    end
-  end
-
-  # login class
-  class Login < BilibiliBase
-    attr_accessor :url, :oauth_key
-
-    def login_url
-      data = get_jsonl('https://passport.bilibili.com/qrcode/getLoginUrl')
-      @url = data[:url]
-      @oauth_key = data[:oauthKey]
-    end
-
-    def show_qrcode
-      qr = RQRCode::QRCode.new(@url)
-      pic = qr.as_ansi(
-        light: "\033[47m", dark: "\033[40m",
-        fill_character: '  ',
-        quiet_zone_size: 1
-      )
-      puts pic
-    end
-
-    def login_user_info
-      set_http_cookie
-      data = get_jsona('https://api.bilibili.com/nav')
-      if data.code != '-101'
-        Bilibili::UserInfo.new(data)
-      else
-        puts 'Cookie已失效'
-        clean_cookie
-        login_user_info
-      end
-    end
-
-    def login
-      login_url
-      show_qrcode
-      print '已完成扫码？[y/n]'
-      over = $stdin.gets.chomp
-      return nil unless over == 'y'
-
-      post_form_jsonl('https://passport.bilibili.com/qrcode/getLoginInfo', { oauthKey: @oauth_key })
-      puts 'Login Success !!!'
-      save_cookie
-      'success'
-    end
-
-    private
-
-    def set_http_cookie
-      cookies = @http_client.login_http.cookies
-      if cookies.nil? || cookies.empty?
-        login
-        @http_client.api_http.cookies = @http_client.login_http.cookies
-      else
-        @http_client.api_http.cookies = cookies
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+# Copyright (c) 2021 leejoker
+#
+# This software is released under the MIT License.
+# https://opensource.org/licenses/MIT
+
+require_relative 'http/http'
+require_relative 'base'
+require_relative 'api'
+require 'rqrcode'
+require 'json'
+
+# login module
+module Bilibili
+  include BiliHttp
+  # bilibili user info
+  class UserInfo
+    attr_accessor :face, :level_info, :uid, :money, :moral, :uname, :vip_type
+
+    def initialize(json)
+      return if json.nil?
+
+      @face = json[:face]
+      @level_info = json[:level_info]
+      @uid = json[:mid]
+      @money = json[:money]
+      @moral = json[:moral]
+      @uname = json[:moral]
+      @vip_type = json[:vipType]
+    end
+
+    def to_json(*opt)
+      {
+        face: @face,
+        level_info: @level_info,
+        uid: @uid,
+        money: @money,
+        moral: @moral,
+        uname: @uname,
+        vip_type: @vip_type
+      }.to_json(*opt)
+    end
+  end
+
+  # login class
+  class Login < BilibiliBase
+    attr_accessor :url, :oauth_key
+
+    def login_url
+      data = get_jsonl(Api::Login::QRCODE)
+      @url = data[:url]
+      @oauth_key = data[:oauthKey]
+    end
+
+    def show_qrcode
+      qr = RQRCode::QRCode.new(@url)
+      pic = qr.as_ansi(
+        light: "\033[47m", dark: "\033[40m",
+        fill_character: '  ',
+        quiet_zone_size: 1
+      )
+      puts pic
+    end
+
+    def login_user_info
+      set_http_cookie
+      data = get_jsona(Api::Login::USERINFO)
+      if data.code != '-101'
+        Bilibili::UserInfo.new(data)
+      else
+        puts 'Cookie已失效'
+        clean_cookie
+        login_user_info
+      end
+    end
+
+    def login
+      login_url
+      show_qrcode
+      print '已完成扫码？[y/n]'
+      over = $stdin.gets.chomp
+      return nil unless over == 'y'
+
+      post_form_jsonl(Api::Login::INFO, { oauthKey: @oauth_key })
+      puts 'Login Success !!!'
+      save_cookie
+      'success'
+    end
+
+    private
+
+    def set_http_cookie
+      cookies = @http_client.login_http.cookies
+      if cookies.nil? || cookies.empty?
+        login
+        @http_client.api_http.cookies = @http_client.login_http.cookies
+      else
+        @http_client.api_http.cookies = cookies
+      end
+    end
+  end
+end

data/lib/bilibili_console/manga.rb

@@ -1,24 +1,24 @@
-# frozen_string_literal: true
-
-# Copyright (c) 2021 leejoker
-#
-# This software is released under the MIT License.
-# https://opensource.org/licenses/MIT
-
-require_relative 'http/http'
-
-# video module
-module Bilibili
-  include BiliHttp
-
-  # bilibili video interfaces
-  class Manga < BilibiliBase
-    def check_in
-      cur_header = {
-        'User-Agent': 'Mozilla/5.0 BiliDroid/6.4.0 (bbcallen@gmail.com) os/android model/M1903F11I mobi_app/android build/6040500 channel/bili innerVer/6040500 osVer/9.0.0 network/2'
-      }
-      post_jsonm('https://manga.bilibili.com/twirp/activity.v1.Activity/ClockIn?platform=android',
-                 cur_header, { 'platform' => 'android' })
-    end
-  end
-end
+# frozen_string_literal: true
+
+# Copyright (c) 2021 leejoker
+#
+# This software is released under the MIT License.
+# https://opensource.org/licenses/MIT
+
+require_relative 'http/http'
+require_relative 'api'
+
+# video module
+module Bilibili
+  include BiliHttp
+
+  # bilibili video interfaces
+  class Manga < BilibiliBase
+    def check_in
+      cur_header = {
+        'User-Agent': 'Mozilla/5.0 BiliDroid/6.4.0 (bbcallen@gmail.com) os/android model/M1903F11I mobi_app/android build/6040500 channel/bili innerVer/6040500 osVer/9.0.0 network/2'
+      }
+      post_jsonm(Api::Manga::CHECK_IN, cur_header, { 'platform' => 'android' })
+    end
+  end
+end

data/lib/bilibili_console/version.rb

@@ -1,10 +1,10 @@
-# frozen_string_literal: true
-
-# Copyright (c) 2021 10344742
-#
-# This software is released under the MIT License.
-# https://opensource.org/licenses/MIT
-
-module Bilibili
-  VERSION = '0.0.1'
-end
+# frozen_string_literal: true
+
+# Copyright (c) 2021 10344742
+#
+# This software is released under the MIT License.
+# https://opensource.org/licenses/MIT
+
+module Bilibili
+  VERSION = '0.0.3'
+end

data/lib/bilibili_console/video.rb

@@ -1,123 +1,193 @@
-# frozen_string_literal: true
-
-# Copyright (c) 2021 leejoker
-#
-# This software is released under the MIT License.
-# https://opensource.org/licenses/MIT
-
-require_relative 'http/http'
-require 'down'
-require 'fileutils'
-require 'ruby-progressbar'
-
-# video module
-module Bilibili
-  include BiliHttp
-  # video page list
-  class PageInfo
-    attr_accessor :cid, :page, :from, :part, :duration, :vid, :weblink
-
-    def initialize(json)
-      return if json.nil?
-
-      @cid = json[:cid]
-      @page = json[:page]
-      @from = json[:from]
-      @part = json[:part]
-      @duration = json[:duration]
-      @vid = json[:vid]
-      @weblink = json[:weblink]
-    end
-
-    def to_json(*opt)
-      {
-        cid: @cid,
-        page: @page,
-        from: @from,
-        part: @part,
-        duration: @duration,
-        vid: @vid,
-        weblink: @weblink
-      }.to_json(*opt)
-    end
-  end
-
-  # bilibili video interfaces
-  class Video < BilibiliBase
-    def video_page_list(bv_id)
-      return nil if bv_id.nil?
-
-      url = "https://api.bilibili.com/x/player/pagelist?bvid=#{bv_id}"
-      datas = get_jsona(url)
-      return nil if datas.nil?
-
-      datas.map do |d|
-        Bilibili::PageInfo.new(d)
-      end
-    end
-
-    def get_video_url(bv_id, cid, video_qn = '720')
-      qn = BilibiliBase.video_qn[video_qn]
-      url = "https://api.bilibili.com/x/player/playurl?bvid=#{bv_id}&cid=#{cid}&qn=#{qn}&fnval=0&fnver=0&fourk=1"
-      data = get_jsona(url)
-      data[:durl]
-    end
-
-    def video_url_list(bv_id, video_qn = '720')
-      result = []
-      page_list = video_page_list(bv_id)
-      return nil if page_list.nil?
-
-      page_list.each do |page|
-        get_video_url(bv_id, page.cid, video_qn).each do |durl|
-          order = durl[:order] < 10 ? "0#{durl[:order]}" : durl[:order]
-          result << { 'name': "#{page.part}_#{order}.flv", 'url': durl[:url].to_s }
-        end
-      end
-      result
-    end
-
-    def download_video_by_bv(bv_id, video_qn = '720')
-      urls = video_url_list(bv_id, video_qn)
-      return nil if urls.empty?
-
-      download_path = "#{File.expand_path(@options['download_path'].to_s, __dir__)}/#{bv_id}/"
-      urls.each do |durl|
-        download_file(durl[:url], download_path, durl[:name])
-      end
-    end
-
-    private
-
-    def download_file(url, dir, filename)
-      progressbar = ProgressBar.create
-      total_size = 0
-      headers = generate_headers
-      FileUtils.mkdir_p(dir) unless Dir.exist?(dir)
-      puts "开始下载文件： #{filename}"
-      Down::NetHttp.download(url,
-                             destination: "#{dir}#{filename}",
-                             headers: headers,
-                             content_length_proc: proc { |size| total_size = size },
-                             progress_proc: proc { |cursize| progressbar.progress = cursize.to_f / total_size * 100.0 })
-    end
-
-    def create_cookie_str(cookies)
-      cookies = cookies['/']
-      cookies_to_set_str = ''
-      cookies.each do |key, value|
-        cookies_to_set_str += "#{key}=#{value}; "
-      end
-      cookies_to_set_str
-    end
-
-    def generate_headers
-      headers = BiliHttp.headers
-      {
-        'User-Agent' => headers[:"User-Agent"],
-        'Referer' => headers[:Referer],
-        'Cookie' => create_cookie_str(load_cookie)
-      }
-    end
-  end
-end
+# frozen_string_literal: true
+
+# Copyright (c) 2021 leejoker
+#
+# This software is released under the MIT License.
+# https://opensource.org/licenses/MIT
+
+require_relative 'http/http'
+require_relative 'api'
+require 'fileutils'
+
+# video module
+module Bilibili
+  include BiliHttp
+  # video page list
+  class PageInfo
+    attr_accessor :cid, :page, :from, :part, :duration, :vid, :weblink
+
+    def initialize(json)
+      return if json.nil?
+
+      @cid = json[:cid]
+      @page = json[:page]
+      @from = json[:from]
+      @part = json[:part]
+      @duration = json[:duration]
+      @vid = json[:vid]
+      @weblink = json[:weblink]
+    end
+
+    def to_json(*opt)
+      {
+        cid: @cid,
+        page: @page,
+        from: @from,
+        part: @part,
+        duration: @duration,
+        vid: @vid,
+        weblink: @weblink
+      }.to_json(*opt)
+    end
+  end
+
+  # bilibili video interfaces
+  class Video < BilibiliBase
+    def video_page_list(bv_id)
+      return nil if bv_id.nil?
+
+      url = "#{Api::Video::PAGE_LIST}?bvid=#{bv_id}"
+      datas = get_jsona(url)
+      return nil if datas.nil?
+
+      datas.map do |d|
+        Bilibili::PageInfo.new(d)
+      end
+    end
+
+    def get_video_url(bv_id, cid, video_qn = '720')
+      qn = BilibiliBase.video_qn[video_qn]
+      url = "#{Api::Video::PLAY_URL}?bvid=#{bv_id}&cid=#{cid}&qn=#{qn}&fnval=0&fnver=0&fourk=1"
+      data = get_jsona(url)
+      data[:durl]
+    end
+
+    def video_url_list(bv_id, video_qn = '720')
+      result = []
+      page_list = video_page_list(bv_id)
+      return nil if page_list.nil?
+
+      page_list.each do |page|
+        get_video_url(bv_id, page.cid, video_qn).each do |down_url|
+          order = down_url[:order] < 10 ? "0#{down_url[:order]}" : down_url[:order]
+          result << { 'name': "#{page.part}_#{order}.flv", 'url': down_url[:url].to_s, 'prefix': page.part,
+                      'order': "#{page.page}#{order}", 'bv': bv_id.to_s }
+        end
+      end
+      result
+    end
+
+    def download_video_by_bv(bv_id, options)
+      urls = video_url_list(bv_id, options[:qn])
+      return nil if urls.empty?
+
+      urls = page_slice(urls, options[:start], options[:end], options[:page])
+      download_path = "#{File.expand_path(@options['download_path'].to_s, __dir__)}/#{bv_id}/"
+      url_array = []
+      urls.map { |url| download_file(url, download_path) }.each_with_index do |u, i|
+        same_part = same_part?(u, i)
+        url_array << u[:file_path]
+        combine_media(url_array, "#{download_path}#{u[:prefix]}.flv") unless same_part
+      end
+    end
+
+    private
+
+    def page_slice(urls, start_page, end_page, page)
+      if page.nil?
+        start_page = start_page.to_i - 1
+        if end_page.nil?
+          urls.slice(start_page, urls.size - start_page)
+        elsif start_page < end_page.to_i
+          urls.slice(start_page, end_page.to_i)
+        else
+          raise 'start should not less than or equals to end'
+        end
+      else
+        [] << urls[page.to_i - 1]
+      end
+    end
+
+    def next?(array, index)
+      !array[index + 1].nil?
+    end
+
+    def same_part?(array, idx)
+      next?(array, idx) && array[idx][:prefix] == array[idx + 1][:prefix]
+    end
+
+    def download_file(url, dir)
+      file_path = check_path(dir, url[:name])
+      url[:file_path] = file_path
+      puts "开始下载文件到： #{file_path}, 视频地址：#{url[:url]}"
+      headers = generate_headers
+      wget_download(url[:url], headers['User-Agent'], headers['Referer'], headers['Cookie'], file_path)
+      dest_file_exist?(file_path)
+      url
+    end
+
+    def check_path(dir, filename)
+      FileUtils.mkdir_p(dir) unless Dir.exist?(dir)
+      "#{dir}#{filename}"
+    end
+
+    def create_cookie_str(cookies)
+      cookie_array = cookies['/'].map do |key, value|
+        "#{key}=#{value}; "
+      end
+      cookie_array.join
+    end
+
+    def generate_headers
+      headers = BiliHttp.headers
+      {
+        'User-Agent' => headers[:"User-Agent"],
+        'Referer' => headers[:Referer],
+        'Cookie' => create_cookie_str(load_cookie)
+      }
+    end
+
+    def combine_media(files, dest)
+      return if files.size.zero?
+
+      if files.size == 1
+        FileUtils.mv(files[0], dest)
+        files.clear
+        return
+      end
+
+      return if files.select! { |file| File.exist?(file) }.size.zero?
+
+      `ffmpeg -i concat:"#{files.join('|')}" -c copy #{dest}`
+      files.clear
+    end
+
+    def dest_file_exist?(dest)
+      if File.exist?(dest)
+        local = File.new(dest).size
+        raise 'file size is zero' if local.zero?
+
+        true
+      else
+        false
+      end
+    end
+
+    def wget_file_size(command)
+      result = `#{command} -o -`
+      hash = {}
+      result.split("\n").filter { |n| n.include?(':') }.each do |line|
+        a = line.split(':')
+        hash[a[0].strip] = a[1].strip
+      end
+      hash['Content-Length'].to_i
+    end
+
+    def wget_download(url, user_agent, referer, cookie, dest)
+      config_path = File.expand_path((@options['config_path']).to_s, __dir__)
+      File.write("#{config_path}/cookie", cookie) unless File.exist?("#{config_path}/cookie")
+      command = "wget '#{url}' --referer '#{referer}' --user-agent '#{user_agent}' --load-cookie='#{config_path}/cookie' "
+      `#{command} -c -O "#{dest}"`
+    end
+  end
+end