bilibili_console 0.0.1 → 0.0.3

data/lib/bilibili_console/base.rb

@@ -1,109 +1,109 @@
-# 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 'fileutils'
-require 'json'
-
-# bilibili base
-module Bilibili
-  include BiliHttp
-  # base class
-  class BilibiliBase
-    attr_accessor :http_client, :options
-
-    class << self
-      attr_accessor :video_qn
-    end
-
-    def initialize(http_client)
-      @http_client = http_client
-      create_request_methods
-      @options = {
-        'config_path' => '~/.bc', 'config_file' => '~/.bc/config.json',
-        'cookie_file' => '~/.bc/cookie.txt', 'download_path' => '~/.bc/download'
-      }
-      BilibiliBase.video_qn = {
-        '240' => 6, '360' => 16, '480' => 32, '720' => 64, '720P60' => 74, '1080' => 80,
-        '1080+' => 112, '1080P60' => 116, '4K' => 120, 'HDR' => 125
-      }
-    end
-
-    def save_cookie
-      check_config_path
-
-      @http_client.api_http.cookies = @http_client.login_http.cookies
-      json_str = @http_client.login_http.cookies.to_json
-      write_cookie(json_str)
-    end
-
-    def load_cookie
-      return {} unless File.exist?(cookie_path)
-
-      json_str = File.read(cookie_path)
-      return {} if json_str.nil? || json_str.empty?
-
-      JSON.parse(json_str)
-    end
-
-    def clean_cookie
-      File.open(cookie_path, 'w') do |file|
-        file.write('{}')
-      end
-    end
-
-    private
-
-    def check_config_path
-      FileUtils.mkdir_p(config_path) unless Dir.exist?(config_path)
-    end
-
-    def write_cookie(cookie)
-      File.open(cookie_path, 'w') do |file|
-        file.write(cookie)
-      end
-    end
-
-    def create_request_methods
-      methods = %w[login_http api_http manga_http]
-      methods.each do |method|
-        define_get_json_method(method)
-        define_post_form_json_method(method)
-        define_post_json_method(method)
-      end
-    end
-
-    def define_get_json_method(method_name)
-      new_method_name = "get_json#{method_name[0]}"
-      BilibiliBase.define_method(new_method_name) do |url|
-        @http_client.get_json(@http_client.instance_variable_get("@#{method_name}"), url)
-      end
-    end
-
-    def define_post_form_json_method(method_name)
-      new_method_name = "post_form_json#{method_name[0]}"
-      BilibiliBase.define_method(new_method_name) do |url, params|
-        @http_client.post_form_json(@http_client.instance_variable_get("@#{method_name}"), url, params)
-      end
-    end
-
-    def define_post_json_method(method_name)
-      new_method_name = "post_json#{method_name[0]}"
-      BilibiliBase.define_method(new_method_name) do |url, headers, req_body|
-        @http_client.post_json(@http_client.instance_variable_get("@#{method_name}"), url, headers, req_body)
-      end
-    end
-
-    def config_path
-      File.expand_path(@options['config_path'].to_s, __dir__)
-    end
-
-    def cookie_path
-      File.expand_path(@options['cookie_file'].to_s, __FILE__)
-    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 'fileutils'
+require 'json'
+
+# bilibili base
+module Bilibili
+  include BiliHttp
+  # base class
+  class BilibiliBase
+    attr_accessor :http_client, :options
+
+    class << self
+      attr_accessor :video_qn
+    end
+
+    def initialize(http_client)
+      @http_client = http_client
+      create_request_methods
+      @options = {
+        'config_path' => '~/.bc', 'config_file' => '~/.bc/config.json',
+        'cookie_file' => '~/.bc/cookie.txt', 'download_path' => '~/.bc/download'
+      }
+      BilibiliBase.video_qn = {
+        '240' => 6, '360' => 16, '480' => 32, '720' => 64, '720P60' => 74, '1080' => 80,
+        '1080+' => 112, '1080P60' => 116, '4K' => 120, 'HDR' => 125
+      }
+    end
+
+    def save_cookie
+      check_config_path
+
+      @http_client.api_http.cookies = @http_client.login_http.cookies
+      json_str = @http_client.login_http.cookies.to_json
+      write_cookie(json_str)
+    end
+
+    def load_cookie
+      return {} unless File.exist?(cookie_path)
+
+      json_str = File.read(cookie_path)
+      return {} if json_str.nil? || json_str.empty?
+
+      JSON.parse(json_str)
+    end
+
+    def clean_cookie
+      File.open(cookie_path, 'w') do |file|
+        file.write('{}')
+      end
+    end
+
+    private
+
+    def check_config_path
+      FileUtils.mkdir_p(config_path) unless Dir.exist?(config_path)
+    end
+
+    def write_cookie(cookie)
+      File.open(cookie_path, 'w') do |file|
+        file.write(cookie)
+      end
+    end
+
+    def create_request_methods
+      methods = %w[login_http api_http manga_http]
+      methods.each do |method|
+        define_get_json_method(method)
+        define_post_form_json_method(method)
+        define_post_json_method(method)
+      end
+    end
+
+    def define_get_json_method(method_name)
+      new_method_name = "get_json#{method_name[0]}"
+      BilibiliBase.define_method(new_method_name) do |url|
+        @http_client.get_json(@http_client.instance_variable_get("@#{method_name}"), url)
+      end
+    end
+
+    def define_post_form_json_method(method_name)
+      new_method_name = "post_form_json#{method_name[0]}"
+      BilibiliBase.define_method(new_method_name) do |url, params|
+        @http_client.post_form_json(@http_client.instance_variable_get("@#{method_name}"), url, params)
+      end
+    end
+
+    def define_post_json_method(method_name)
+      new_method_name = "post_json#{method_name[0]}"
+      BilibiliBase.define_method(new_method_name) do |url, headers, req_body|
+        @http_client.post_json(@http_client.instance_variable_get("@#{method_name}"), url, headers, req_body)
+      end
+    end
+
+    def config_path
+      File.expand_path(@options['config_path'].to_s, __dir__)
+    end
+
+    def cookie_path
+      File.expand_path(@options['cookie_file'].to_s, __FILE__)
+    end
+  end
+end

data/lib/bilibili_console/fav.rb

@@ -1,147 +1,154 @@
-# 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 'json'
-
-# video module
-module Bilibili
-  include BiliHttp
-  # fav list
-  class FavList
-    attr_accessor :count, :list, :season
-
-    def initialize(data)
-      return if data.nil?
-
-      @count = data[:count]
-      @season = data[:season]
-      @list = generate_fav_list(data[:list])
-    end
-
-    def generate_fav_list(data_list)
-      data = []
-      if !data_list.nil? && !data_list.empty?
-        data_list.each do |obj|
-          data << Bilibili::FavInfo.new(obj)
-        end
-      end
-      data
-    end
-
-    def to_json(*opt)
-      {
-        count: @count,
-        list: @list,
-        season: @season
-      }.to_json(*opt)
-    end
-  end
-
-  # bilibili fav info
-  class FavInfo
-    attr_accessor :id, :fid, :uid, :attr, :title, :fav_state, :media_count
-
-    def initialize(json)
-      return if json.nil?
-
-      @id = json[:id]
-      @fid = json[:fid]
-      @uid = json[:mid]
-      @attr = json[:attr]
-      @title = json[:title]
-      @fav_state = json[:fav_state]
-      @media_count = json[:media_count]
-    end
-
-    def to_json(*opt)
-      {
-        id: @id,
-        fid: @fid,
-        uid: @uid,
-        attr: @attr,
-        title: @title,
-        fav_state: @fav_state,
-        media_count: @media_count
-      }.to_json(*opt)
-    end
-  end
-
-  # fav media list
-  class FavResourceList
-    attr_accessor :info, :medias
-
-    def initialize(json)
-      return if json.nil?
-
-      @info = Bilibili::FavInfo.new(json[:info])
-      @medias = generate_media_list(json[:medias])
-    end
-
-    def generate_media_list(medias)
-      data = []
-      if !medias.nil? && !medias.empty?
-        medias.each do |media|
-          data << Bilibili::FavMediaInfo.new(media)
-        end
-      end
-      data
-    end
-
-    def to_json(*opt)
-      {
-        info: @info,
-        medias: @medias
-      }.to_json(*opt)
-    end
-  end
-
-  # fav media info
-  class FavMediaInfo
-    attr_accessor :id, :type, :title, :intro, :page, :bv_id
-
-    def initialize(json)
-      return if json.nil?
-
-      @id = json[:id]
-      @type = json[:type]
-      @title = json[:title]
-      @intro = json[:intro]
-      @page = json[:page]
-      @bv_id = json[:bv_id]
-    end
-
-    def to_json(*opt)
-      {
-        id: @id,
-        type: @type,
-        title: @title,
-        intro: @intro,
-        page: @page,
-        bv_id: @bv_id
-      }.to_json(*opt)
-    end
-  end
-
-  # bilibili video interfaces
-  class Fav < BilibiliBase
-    # list user fav folders
-    def list_user_fav_video(user_info)
-      url = "https://api.bilibili.com/x/v3/fav/folder/created/list-all?up_mid=#{user_info.uid}&type=2"
-      data = get_jsona(url)
-      Bilibili::FavList.new(data)
-    end
-
-    # list user fav folder videos by page
-    def list_fav_video(media_id, page_num = 1, page_size = 10, keyword = nil)
-      keyword = "&keyword=#{keyword}" unless keyword.nil?
-      url = "https://api.bilibili.com/x/v3/fav/resource/list?media_id=#{media_id}&pn=#{page_num}&ps=#{page_size}#{keyword}&platform=web"
-      data = get_jsona(url)
-      Bilibili::FavResourceList.new(data)
-    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 'json'
+require 'cgi'
+
+# video module
+module Bilibili
+  include BiliHttp
+  # fav list
+  class FavList
+    attr_accessor :count, :list, :season
+
+    def initialize(data)
+      return if data.nil?
+
+      @count = data[:count]
+      @season = data[:season]
+      @list = generate_fav_list(data[:list])
+    end
+
+    def generate_fav_list(data_list)
+      data = []
+      if !data_list.nil? && !data_list.empty?
+        data_list.each do |obj|
+          data << Bilibili::FavInfo.new(obj)
+        end
+      end
+      data
+    end
+
+    def to_json(*opt)
+      {
+        count: @count,
+        list: @list,
+        season: @season
+      }.to_json(*opt)
+    end
+  end
+
+  # bilibili fav info
+  class FavInfo
+    attr_accessor :id, :fid, :uid, :attr, :title, :fav_state, :media_count
+
+    def initialize(json)
+      return if json.nil?
+
+      @id = json[:id]
+      @fid = json[:fid]
+      @uid = json[:mid]
+      @attr = json[:attr]
+      @title = json[:title]
+      @fav_state = json[:fav_state]
+      @media_count = json[:media_count]
+    end
+
+    def to_json(*opt)
+      {
+        id: @id,
+        fid: @fid,
+        uid: @uid,
+        attr: @attr,
+        title: @title,
+        fav_state: @fav_state,
+        media_count: @media_count
+      }.to_json(*opt)
+    end
+  end
+
+  # fav media list
+  class FavResourceList
+    attr_accessor :info, :medias
+
+    def initialize(json)
+      return if json.nil?
+
+      @info = Bilibili::FavInfo.new(json[:info])
+      @medias = generate_media_list(json[:medias])
+    end
+
+    def generate_media_list(medias)
+      data = []
+      if !medias.nil? && !medias.empty?
+        medias.each do |media|
+          data << Bilibili::FavMediaInfo.new(media)
+        end
+      end
+      data
+    end
+
+    def to_json(*opt)
+      {
+        info: @info,
+        medias: @medias
+      }.to_json(*opt)
+    end
+  end
+
+  # fav media info
+  class FavMediaInfo
+    attr_accessor :id, :type, :title, :intro, :page, :bv_id
+
+    def initialize(json)
+      return if json.nil?
+
+      @id = json[:id]
+      @type = json[:type]
+      @title = json[:title]
+      @intro = json[:intro]
+      @page = json[:page]
+      @bv_id = json[:bv_id]
+    end
+
+    def to_json(*opt)
+      {
+        id: @id,
+        type: @type,
+        title: @title,
+        intro: @intro,
+        page: @page,
+        bv_id: @bv_id
+      }.to_json(*opt)
+    end
+  end
+
+  # bilibili video interfaces
+  class Fav < BilibiliBase
+    # list user fav folders
+    def list_user_fav_video(user_info)
+      url = "#{Api::Fav::USER_FAV_LIST}?up_mid=#{user_info.uid}&type=2"
+      data = get_jsona(url)
+      Bilibili::FavList.new(data)
+    end
+
+    # list user fav folder videos by page
+    def list_fav_video(options)
+      options[:page_num] = 1 if options[:page_num].nil?
+      options[:page_size] = 10 if options[:page_size].nil?
+      options[:all] = 1 if options[:all].nil?
+      unless options[:search].nil?
+        options[:search] = "&keyword=#{CGI.escape(options[:search])}&order=mtime&type=#{options[:all]}&tid=0&jsonp=jsonp"
+      end
+      url = "#{Api::Fav::FAV_VIDEO_LIST}?media_id=#{options[:fav]}&pn=#{options[:page_num]}&ps=#{options[:page_size]}#{options[:search]}&platform=web"
+      data = get_jsona(url)
+      Bilibili::FavResourceList.new(data)
+    end
+  end
+end

data/lib/bilibili_console/http/http.rb

@@ -1,75 +1,75 @@
-# frozen_string_literal: true
-
-# Copyright (c) 2021 leejoker
-#
-# This software is released under the MIT License.
-# https://opensource.org/licenses/MIT
-
-require 'net/http'
-require 'nice_http'
-require_relative 'response_body'
-
-# bilibili client http module
-module BiliHttp
-  class << self
-    attr_accessor :headers
-  end
-
-  # bilibili http client
-  class HttpClient
-    attr_accessor :login_http, :api_http, :manga_http
-
-    def initialize
-      BiliHttp.headers = {
-        'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.124 Safari/537.36 Edg/91.0.864.64',
-        'Referer': 'https://www.bilibili.com'
-      }
-    end
-
-    # get method
-    def get_json(http, url)
-      json_data(get(http, url))
-    end
-
-    def get(http, url)
-      request = {
-        headers: BiliHttp.headers,
-        path: URI(url).request_uri
-      }
-      http.get(request).data
-    end
-
-    # post method with form data
-    def post_form_json(http, url, params)
-      custom_headers = BiliHttp.headers.clone
-      custom_headers['Content-Type'] = 'application/x-www-form-urlencoded'
-      request = {
-        headers: custom_headers,
-        path: URI(url).request_uri,
-        data: params
-      }
-      json_data(http.post(request).data)
-    end
-
-    # post method with json body
-    def post_json(http, url, headers, req_body)
-      headers = BiliHttp.headers.clone if headers.nil? || headers.empty?
-      headers['Content-Type'] = 'application/json' unless req_body.nil? || req_body.empty?
-      request = {
-        headers: headers,
-        path: URI(url).request_uri
-      }
-      request.merge!({ data: req_body }) unless req_body.nil? || req_body.empty?
-      json_data(http.post(request).data)
-    end
-
-    def json_data(data)
-      body = BiliHttp::ResponseBody.new(data.json)
-      if body.data.nil?
-        body
-      else
-        body.data
-      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 'net/http'
+require 'nice_http'
+require_relative 'response_body'
+
+# bilibili client http module
+module BiliHttp
+  class << self
+    attr_accessor :headers
+  end
+
+  # bilibili http client
+  class HttpClient
+    attr_accessor :login_http, :api_http, :manga_http
+
+    def initialize
+      BiliHttp.headers = {
+        'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.124 Safari/537.36 Edg/91.0.864.64',
+        'Referer': 'https://www.bilibili.com'
+      }
+    end
+
+    # get method
+    def get_json(http, url)
+      json_data(get(http, url))
+    end
+
+    def get(http, url)
+      request = {
+        headers: BiliHttp.headers,
+        path: URI(url).request_uri
+      }
+      http.get(request).data
+    end
+
+    # post method with form data
+    def post_form_json(http, url, params)
+      custom_headers = BiliHttp.headers.clone
+      custom_headers['Content-Type'] = 'application/x-www-form-urlencoded'
+      request = {
+        headers: custom_headers,
+        path: URI(url).request_uri,
+        data: params
+      }
+      json_data(http.post(request).data)
+    end
+
+    # post method with json body
+    def post_json(http, url, headers, req_body)
+      headers = BiliHttp.headers.clone if headers.nil? || headers.empty?
+      headers['Content-Type'] = 'application/json' unless req_body.nil? || req_body.empty?
+      request = {
+        headers: headers,
+        path: URI(url).request_uri
+      }
+      request.merge!({ data: req_body }) unless req_body.nil? || req_body.empty?
+      json_data(http.post(request).data)
+    end
+
+    def json_data(data)
+      body = BiliHttp::ResponseBody.new(data.json)
+      if body.data.nil?
+        body
+      else
+        body.data
+      end
+    end
+  end
+end