bilibili_console 0.0.1 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5524a52ac2c2f6286d1ff24e51d16658eee029b0da65f79655e0ca8a1f99c820
-  data.tar.gz: 965192950c893a795039c810fa623c8c7081f78ff90bd5b7537f26737616ca5b
+  metadata.gz: 3659a8072f4464f548705cf3e73fbc43cd63e1fc8e1bb842ed8c5dfd080cdfe4
+  data.tar.gz: a36d10099d20ed05b8e701dd76b21b2b40b359d929732b46ac4fa31d81e45f3c
 SHA512:
-  metadata.gz: 92699ed8ca0499d5ca0aa6f2def15b0a8707727d1e33a3f9465a79dd317d970f7a4e2d7eaad9da681c9d8e9983fb1809f129518dc0d954d790994001ec4b18b7
-  data.tar.gz: 3565ae71ae71ec48818e0107735674ac1d87c42fd86e913fbe3eb2bc1c21309be83890a570324cbba25af26c581bdaf655216961d188e5e3849971d61e00066d
+  metadata.gz: 378adf197108bf168f2bbe31a95f039ad9f2c9845121d1b1a1c5d3f05173879f328bd63cc6b96aed7bbb8d22deea97c25d18a5626f6e59b589e05eb80b3e57a8
+  data.tar.gz: eeaaa69880ccca7378031f029ef299fc78f3d36f40c36b4473677edeb4d063684335fe32b5fbb6b4681b17063743b8331ad20a597bef3a4ab1eb9edac67f5f59

data/.bundle/config

@@ -1,2 +1,2 @@
----
-BUNDLE_WITHOUT: "production"
+---
+BUNDLE_WITHOUT: "production"

data/.gitignore

@@ -1,3 +1,4 @@
-*.log
-*.gem
-.idea
+*.log
+*.gem
+.idea
+Gemfile.lock

data/Gemfile

@@ -1,10 +1,10 @@
-source 'https://gems.ruby-china.com'
-
-gemspec
-
-gem "rake", "~> 13.0"
-
-gem "rspec", "~> 3.0"
-
-gem "rubocop", "~> 1.7"
-
+source 'https://gems.ruby-china.com'
+
+gemspec
+
+gem "rake", "~> 13.0"
+
+gem "rspec", "~> 3.0"
+
+gem "rubocop", "~> 1.7"
+

data/Gemfile.lock

@@ -1,23 +1,17 @@
 PATH
   remote: .
   specs:
-    bilibili_console (0.0.1)
-      down (~> 5.0)
+    bilibili_console (0.0.3)
       nice_http (~> 1.8.9)
       rqrcode (~> 2.0)
-      ruby-progressbar (~> 1.11.0)
       thor (~> 1.1.0)
 
 GEM
   remote: https://gems.ruby-china.com/
   specs:
-    addressable (2.8.0)
-      public_suffix (>= 2.0.2, < 5.0)
     ast (2.4.2)
     chunky_png (1.4.0)
     diff-lcs (1.4.4)
-    down (5.2.2)
-      addressable (~> 2.5)
     nice_hash (1.17.2)
       string_pattern (~> 2.2, >= 2.2.2)
     nice_http (1.8.9)
@@ -25,7 +19,6 @@ GEM
     parallel (1.20.1)
     parser (3.0.1.1)
       ast (~> 2.4.1)
-    public_suffix (4.0.6)
     rainbow (3.0.0)
     rake (13.0.3)
     regexp_parser (1.8.2)
@@ -66,6 +59,7 @@ GEM
 
 PLATFORMS
   x64-mingw32
+  x86_64-linux
 
 DEPENDENCIES
   bilibili_console!
@@ -74,4 +68,4 @@ DEPENDENCIES
   rubocop (~> 1.7)
 
 BUNDLED WITH
-   2.2.24
+   2.2.31

data/LICENSE

@@ -1,21 +1,21 @@
-MIT License
-
-Copyright (c) 2021 leejoker
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+MIT License
+
+Copyright (c) 2021 leejoker
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.

data/README.md

@@ -1,75 +1,106 @@
-# bilibili_console
-
-#### 介绍
-
-B站命令行客户端Ruby版
-
-#### 软件结构
-
-基于ruby开发，ruby version >= 2.7
-
-#### 安装教程
-
-1. 安装ruby环境，使用[rvm](https://ruby-china.org/wiki/rvm-guide)或[rbenv](https://ruby-china.org/wiki/rbenv-guide)均可
-2. 替换gem源
-3. 进入代码根目录，执行一下操作：
-```shell
-$ gem build bilibili_console.gemspec
-$ gem install bilibili_console-0.0.1.gem
-```
-
-### 使用方法
-
-gem安装完成后即可使用**bili-console**命令
-
-#### 帮助信息
-
-```shell
-$ bili-console help
-```
-
-#### 登录
-
-```shell
-# 执行二维码登录
-$ bili-console login
-```
-
-#### 用户基本信息
-
-```shell
-$ bili-console user
-```
-
-#### bilibili漫画签到
-
-```shell
-# 目前只提供漫画签到的功能
-$ bili-console manga
-```
-
-#### 功能清单
-
-* [x] bilibili漫画签到 
-* [x] B站二维码登录 
-* [x] 查看个人信息
-* [x] 根据bv下载视频
-* [ ] 合并下载的视频
-* [ ] 查看个人收藏夹
-* [ ] 视频检索
-
-
-#### 相关项目
-
-##### Gem依赖
-
-* [down](https://github.com/janko/down/)
-* [nice_http](https://github.com/MarioRuiz/nice_http)
-* [rqrcode](https://github.com/whomwah/rqrcode/)
-* [ruby-progressbar](https://github.com/jfelchner/ruby-progressbar/)
-* [thor](https://github.com/rails/thor)
-
-##### 接口文档
-
-* [bilibili-API-collect](https://github.com/SocialSisterYi/bilibili-API-collect) 感谢易姐的文档支持！
-* [Bilibili-Manga](https://github.com/xkk2333/Bilibili-Manga) 参考了B站漫画的签到接口
+# bilibili_console
+
+#### 1 介绍
+
+B站命令行客户端Ruby版
+
+#### 2 软件结构
+
+基于ruby开发，ruby version >= 2.7
+
+#### 3 安装教程
+
+1. 安装ruby环境，使用[rvm](https://ruby-china.org/wiki/rvm-guide)或[rbenv](https://ruby-china.org/wiki/rbenv-guide)均可
+2. 替换gem源
+3. 进入代码根目录，执行一下操作：
+
+```shell
+$ gem build bilibili_console.gemspec
+$ gem install bilibili_console-0.0.3.gem
+```
+
+### 4 使用方法
+
+gem安装完成后即可使用**bili-console**命令
+
+#### 4.1 帮助信息
+
+```shell
+$ bilic help
+```
+
+#### 4.2 登录
+
+```shell
+# 执行二维码登录
+$ bilic login
+```
+
+#### 4.3 用户基本信息
+
+```shell
+$ bilic user
+```
+
+#### 4.4 下载指定BV视频
+
+```shell
+# 下载全部分P
+$ bilic down bv_id
+
+# 从指定分P开始下载
+$ bilic down -s 1 bv_id
+
+# 从指定分P结束
+$ bilic down -e 10 bv_id
+
+# 下载指定分P
+$ bilic down -p 2 bv_id
+```
+
+#### 4.5 查询收藏
+
+```shell
+# 查询所有收藏
+$ bilic fav
+
+# 从收藏检索
+$ bilic fav --search 检索关键词
+
+# 检索指定收藏夹
+$ bilic fav --page_size 20 --page_num 1 --fav 收藏夹id --all {0 从当前收藏夹检索, 1 从全局检索}
+```
+
+#### 4.6 bilibili漫画签到
+
+```shell
+# 目前只提供漫画签到的功能
+$ bilic manga
+```
+
+#### 5 功能清单
+
+* [x] bilibili漫画签到
+* [x] B站二维码登录
+* [x] 查看个人信息
+* [x] 根据bv下载视频
+* [x] 合并下载的视频
+* [x] 查看个人收藏夹
+* [x] 搜索个人收藏夹
+* [x] 指定分p下载
+* [x] 从指定分p开始下载
+* [x] 下载到指定分P结束
+* [ ] 全局视频检索
+
+#### 6 相关项目
+
+##### Gem依赖
+
+* [nice_http](https://github.com/MarioRuiz/nice_http)
+* [rqrcode](https://github.com/whomwah/rqrcode/)
+* [thor](https://github.com/rails/thor)
+
+##### 接口文档
+
+* [bilibili-API-collect](https://github.com/SocialSisterYi/bilibili-API-collect) 感谢易姐的文档支持！
+* [Bilibili-Manga](https://github.com/xkk2333/Bilibili-Manga) 参考了B站漫画的签到接口

data/Rakefile

@@ -1,11 +1,11 @@
-# frozen_string_literal: true
-
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
-require "bilibili_console"
-
-RSpec::Core::RakeTask.new(:spec)
-
-require "rubocop/rake_task"
-
-RuboCop::RakeTask.new
+# frozen_string_literal: true
+
+require "bundler/gem_tasks"
+require "rspec/core/rake_task"
+require "bilibili_console"
+
+RSpec::Core::RakeTask.new(:spec)
+
+require "rubocop/rake_task"
+
+RuboCop::RakeTask.new

data/bilibili_console.gemspec

@@ -1,21 +1,21 @@
-Gem::Specification.new do |s|
-  s.name = 'bilibili_console'
-  s.version = '0.0.1'
-  s.executables << 'bili-console'
-  s.summary     = 'bilibili console'
-  s.description = 'a console tool for bilibili'
-  s.authors     = ['leejoker']
-  s.email       = '1056650571@qq.com'
-  s.files = `git ls-files -z`.split("\x0").reject do |f|
-    f.match(%r{^(test|spec|features)/})
-  end
-  s.extra_rdoc_files = ['README.md', 'LICENSE']
-  s.homepage = 'https://github.com/leejoker/bilibili-console'
-  s.license = 'MIT'
-  s.required_ruby_version = ['>= 2.7']
-  s.add_dependency 'down', '~> 5.0'
-  s.add_dependency 'nice_http', '~> 1.8.9'
-  s.add_dependency 'rqrcode', '~> 2.0'
-  s.add_dependency 'ruby-progressbar', '~> 1.11.0'
-  s.add_dependency 'thor', '~> 1.1.0'
-end
+require_relative 'lib/bilibili_console/version'
+
+Gem::Specification.new do |s|
+  s.name = 'bilibili_console'
+  s.version = Bilibili::VERSION
+  s.executables << 'bilic'
+  s.summary = 'bilibili console'
+  s.description = 'a console tool for bilibili'
+  s.authors = ['leejoker']
+  s.email = '1056650571@qq.com'
+  s.files = `git ls-files -z`.split("\x0").reject do |f|
+    f.match(%r{^(test|spec|features)/})
+  end
+  s.extra_rdoc_files = %w[README.md LICENSE]
+  s.homepage = 'https://github.com/leejoker/bilibili-console'
+  s.license = 'MIT'
+  s.required_ruby_version = ['>= 2.7']
+  s.add_dependency 'nice_http', '~> 1.8.9'
+  s.add_dependency 'rqrcode', '~> 2.0'
+  s.add_dependency 'thor', '~> 1.1.0'
+end

data/bin/banner.txt

@@ -1,10 +1,10 @@
-  ###################################################################################
-  # ,-----.          ,-----.                             ,--.
-  # |  |) /_ ,-----.'  .--./ ,---. ,--,--,  ,---.  ,---. |  | ,---.
-  # |  .-.  \'-----'|  |    | .-. ||      \(  .-' | .-. ||  || .-. :
-  # |  '--' /       '  '--'\' '-' '|  ||  |.-'  `)' '-' '|  |\   --.
-  # `------'         `-----' `---' `--''--'`----'  `---' `--' `----'
-  #
-  # 欢迎使用 Bilibili-Console
-  # Github: https://github.com/leejoker/bilibili-console
+  ###################################################################################
+  # ,-----.          ,-----.                             ,--.
+  # |  |) /_ ,-----.'  .--./ ,---. ,--,--,  ,---.  ,---. |  | ,---.
+  # |  .-.  \'-----'|  |    | .-. ||      \(  .-' | .-. ||  || .-. :
+  # |  '--' /       '  '--'\' '-' '|  ||  |.-'  `)' '-' '|  |\   --.
+  # `------'         `-----' `---' `--''--'`----'  `---' `--' `----'
+  #
+  # 欢迎使用 Bilibili-Console
+  # Github: https://github.com/leejoker/bilibili-console
   ####################################################################################

data/bin/bilic

@@ -0,0 +1,123 @@
+#!/usr/bin/env ruby
+
+require 'thor'
+require 'bilibili_console'
+
+# bilibili-console command line
+class BiliConsole < Thor
+  def self.exit_on_failure?
+    true
+  end
+
+  desc 'info', 'help content'
+
+  def info
+    banner = File.read(File.expand_path('banner.txt', __dir__))
+    puts <<~HELP
+      #{banner}
+
+      Usage: bilic [arguments]
+        help    [command]          help messages
+        login                      qrcode login
+        user                       user info
+        manga                      bilibili manga checkin
+        down    [-s e p q]         download video
+        fav     [-s m a ps pn]     show user video collections
+    HELP
+  end
+
+  desc 'login', 'login with qrcode'
+
+  def login
+    bc = BilibiliConsole.new
+    puts bc.login
+  end
+
+  desc 'user', 'get user info'
+
+  def user
+    bc = BilibiliConsole.new
+    user = bc.login_user_info
+    puts <<~USER
+      uid: #{user.uid}
+      uname: #{user.uname}
+      level: #{user.level_info[:current_level]}
+    USER
+  end
+
+  desc 'manga', 'checkin bilibili manga'
+
+  def manga_checkin
+    bc = BilibiliConsole.new
+    bc.manga.load_cookie
+    body = bc.manga_checkin
+    if body.code == 'invalid_argument'
+      puts '您已经签到了'
+    else
+      puts '签到成功'
+    end
+  end
+
+  desc 'down', 'download video by bv code'
+  method_option :start, aliases: '-s', desc: 'start page'
+  method_option :end, aliases: '-e', desc: 'end page'
+  method_option :page, aliases: '-p', desc: 'order one page'
+  method_option :qn, aliases: '-q', desc: 'video resolution ratio'
+
+  def download_video(bv_id)
+    bc = BilibiliConsole.new
+    bc.video.load_cookie
+    options_dup = options.dup
+    options_dup[:start] = 1 if options[:start].nil?
+    options_dup[:qn] = '720' if options[:qn].nil?
+    bc.download_video(bv_id, options_dup)
+  end
+
+  desc 'fav', 'show user fav info'
+  method_option :search, aliases: '-s', desc: 'search in fav'
+  method_option :fav, aliases: '-m', desc: 'ordered a fav to do some operations'
+  method_option :page_size, aliases: '-ps', desc: 'page size'
+  method_option :page_num, aliases: '-pn', desc: 'page number'
+  method_option :all, aliases: '-a', desc: 'usr 1 for searching in all fav and 2 for searching in the ordered fav'
+
+  def fav_info
+    if options[:search].nil? && options[:fav].nil?
+      fav_list
+    else
+      options_dup = options.dup
+      fav_search(options_dup)
+    end
+  end
+
+  private
+
+  def fav_list
+    bc = BilibiliConsole.new
+    bc.user_fav_list.list.each do |fav|
+      puts <<~FAV
+          fav_id:         #{fav.fid}
+          fav_name:       #{fav.title}
+          media count:    #{fav.media_count}
+        -----------------------------------------------------------------------
+      FAV
+    end
+  end
+
+  def fav_search(options)
+    bc = BilibiliConsole.new
+    fav = bc.user_fav_list.list[0]
+    user = bc.login_user_info
+    options[:fav] = fav.fid if options[:fav].nil?
+    options[:fav] += user.uid.to_s.slice(-2, 2)
+    bc.list_fav_video(options)&.medias&.each do |media|
+      puts <<~MEDIA
+          title:         #{media.title}
+          intro:         #{media.intro}
+          bv:            #{media.bv_id}
+        -----------------------------------------------------------------------
+      MEDIA
+    end
+  end
+end
+
+BiliConsole.start

data/lib/bilibili_console/api.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+# Copyright (c) 2021 leejoker
+#
+# This software is released under the MIT License.
+# https://opensource.org/licenses/MIT
+
+module Bilibili
+  module Api
+    module Login
+      QRCODE = 'https://passport.bilibili.com/qrcode/getLoginUrl'
+      INFO = 'https://passport.bilibili.com/qrcode/getLoginInfo'
+      USERINFO = 'https://api.bilibili.com/nav'
+    end
+
+    module Fav
+      USER_FAV_LIST = 'https://api.bilibili.com/x/v3/fav/folder/created/list-all'
+      FAV_VIDEO_LIST = 'https://api.bilibili.com/x/v3/fav/resource/list'
+    end
+
+    module Video
+      PAGE_LIST = 'https://api.bilibili.com/x/player/pagelist'
+      PLAY_URL = 'https://api.bilibili.com/x/player/playurl'
+    end
+
+    module Manga
+      CHECK_IN = 'https://manga.bilibili.com/twirp/activity.v1.Activity/ClockIn?platform=android'
+    end
+  end
+end