Skip to content

Commit 1d1c53f

Browse files
XmaderXmader
committed
v1.18.3 - 紧急debug下载番剧
1 parent d82cdad commit 1d1c53f

File tree

6 files changed

+58
-27
lines changed

6 files changed

+58
-27
lines changed

‎biliTwin.user.js‎

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
// @match *://www.bilibili.com/bangumi/media/md*
1212
// @match *://www.biligame.com/detail/*
1313
// @match *://www.bilibili.com/watchlater/
14-
// @version 1.18.1
14+
// @version 1.18.3
1515
// @author qli5
1616
// @copyright qli5, 2014+, 田生, grepmusic, zheng qian, ryiwamoto, xmader
1717
// @license Mozilla Public License 2.0; http://www.mozilla.org/MPL/2.0/
@@ -1807,13 +1807,23 @@ class BiliMonkey {
18071807
let durls = data.durl;
18081808

18091809
if (!durls) {
1810+
const _zc = window.Gc || window.zc ||
1811+
Object.values(window).filter(
1812+
x => typeof x == "string" && x.includes("[Info]")
1813+
)[0];
1814+
18101815
data = JSON.parse(
1811-
window.Gc.split("\n").filter(
1816+
_zc.split("\n").filter(
18121817
x => x.startsWith("{")
18131818
)[0]
18141819
);
18151820

1816-
durls = data.Y.segments || [data.Y];
1821+
const _data_X = data.Y || data.X ||
1822+
Object.values(data).filter(
1823+
x => typeof x == "object" && Object.prototype.toString.call(x) == "[object Object]"
1824+
)[0];
1825+
1826+
durls = _data_X.segments || [_data_X];
18171827
}
18181828

18191829
// console.log(data)
@@ -2140,13 +2150,13 @@ class BiliMonkey {
21402150

21412151
static get resolutionPreferenceOptions() {
21422152
return [
2143-
['高清 1080P60 (大会员)','116'],
2144-
['高清 1080P+ (大会员)','112'],
2145-
['高清 720P60 (大会员)','74'],
2146-
['高清 1080P','80'],
2147-
['高清 720P','64'],
2148-
['清晰 480P','32'],
2149-
['流畅 360P','16'],
2153+
['高清 1080P60 (大会员)', '116'],
2154+
['高清 1080P+ (大会员)', '112'],
2155+
['高清 720P60 (大会员)', '74'],
2156+
['高清 1080P', '80'],
2157+
['高清 720P', '64'],
2158+
['清晰 480P', '32'],
2159+
['流畅 360P', '16'],
21502160
]
21512161
}
21522162

‎biliTwinBabelCompiled.user.js‎

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
// @match *://www.bilibili.com/bangumi/media/md*
1212
// @match *://www.biligame.com/detail/*
1313
// @match *://www.bilibili.com/watchlater/
14-
// @version 1.18.1
14+
// @version 1.18.3
1515
// @author qli5
1616
// @copyright qli5, 2014+, 田生, grepmusic, zheng qian, ryiwamoto, xmader
1717
// @license Mozilla Public License 2.0; http://www.mozilla.org/MPL/2.0/
@@ -180,7 +180,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
180180
// @match *://www.bilibili.com/bangumi/media/md*
181181
// @match *://www.biligame.com/detail/*
182182
// @match *://www.bilibili.com/watchlater/
183-
// @version 1.18.1
183+
// @version 1.18.3
184184
// @author qli5
185185
// @copyright qli5, 2014+, 田生, grepmusic, zheng qian, ryiwamoto, xmader
186186
// @license Mozilla Public License 2.0; http://www.mozilla.org/MPL/2.0/
@@ -3082,7 +3082,8 @@ var BiliMonkey = function () {
30823082
switch (_context31.prev = _context31.next) {
30833083
case 0:
30843084
return _context31.abrupt('return', this.queryInfoMutex.lockAndAwait(_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee30() {
3085-
var qn, api_url, re, data, durls, flvs, video_format;
3085+
var qn, api_url, re, data, durls, _zc, _data_X, flvs, video_format;
3086+
30863087
return regeneratorRuntime.wrap(function _callee30$(_context30) {
30873088
while (1) {
30883089
switch (_context30.prev = _context30.next) {
@@ -3118,11 +3119,21 @@ var BiliMonkey = function () {
31183119

31193120

31203121
if (!durls) {
3121-
data = JSON.parse(window.Gc.split("\n").filter(function (x) {
3122+
_zc = window.Gc || window.zc || Object.values(window).filter(function (x) {
3123+
return typeof x == "string" && x.includes("[Info]");
3124+
})[0];
3125+
3126+
3127+
data = JSON.parse(_zc.split("\n").filter(function (x) {
31223128
return x.startsWith("{");
31233129
})[0]);
31243130

3125-
durls = data.Y.segments || [data.Y];
3131+
_data_X = data.Y || data.X || Object.values(data).filter(function (x) {
3132+
return (typeof x === 'undefined' ? 'undefined' : _typeof(x)) == "object" && Object.prototype.toString.call(x) == "[object Object]";
3133+
})[0];
3134+
3135+
3136+
durls = _data_X.segments || [_data_X];
31263137
}
31273138

31283139
// console.log(data)

‎package-lock.json‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "bilitwin",
3-
"version": "1.18.2",
3+
"version": "1.18.3",
44
"description": "bilibili/哔哩哔哩:超清FLV下载,FLV合并,原生MP4下载,弹幕ASS下载,MKV打包,播放体验增强,原生appsecret,不借助其他网站",
55
"main": "bilitwin.user.js",
66
"directories": {

‎src/bilitwin.meta.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
// @match *://www.bilibili.com/bangumi/media/md*
1212
// @match *://www.biligame.com/detail/*
1313
// @match *://www.bilibili.com/watchlater/
14-
// @version 1.18.1
14+
// @version 1.18.3
1515
// @author qli5
1616
// @copyright qli5, 2014+, 田生, grepmusic, zheng qian, ryiwamoto, xmader
1717
// @license Mozilla Public License 2.0; http://www.mozilla.org/MPL/2.0/

‎src/biliuserjs/bilimonkey.js‎

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -217,13 +217,23 @@ class BiliMonkey {
217217
let durls = data.durl
218218

219219
if (!durls) {
220+
const _zc = window.Gc || window.zc ||
221+
Object.values(window).filter(
222+
x => typeof x == "string" && x.includes("[Info]")
223+
)[0]
224+
220225
data = JSON.parse(
221-
window.Gc.split("\n").filter(
226+
_zc.split("\n").filter(
222227
x => x.startsWith("{")
223228
)[0]
224229
)
225230

226-
durls = data.Y.segments || [data.Y]
231+
const _data_X = data.Y || data.X ||
232+
Object.values(data).filter(
233+
x => typeof x == "object" && Object.prototype.toString.call(x) == "[object Object]"
234+
)[0]
235+
236+
durls = _data_X.segments || [_data_X]
227237
}
228238

229239
// console.log(data)
@@ -551,13 +561,13 @@ class BiliMonkey {
551561

552562
static get resolutionPreferenceOptions() {
553563
return [
554-
['高清 1080P60 (大会员)','116'],
555-
['高清 1080P+ (大会员)','112'],
556-
['高清 720P60 (大会员)','74'],
557-
['高清 1080P','80'],
558-
['高清 720P','64'],
559-
['清晰 480P','32'],
560-
['流畅 360P','16'],
564+
['高清 1080P60 (大会员)', '116'],
565+
['高清 1080P+ (大会员)', '112'],
566+
['高清 720P60 (大会员)', '74'],
567+
['高清 1080P', '80'],
568+
['高清 720P', '64'],
569+
['清晰 480P', '32'],
570+
['流畅 360P', '16'],
561571
]
562572
}
563573

0 commit comments

Comments
 (0)