remove lookbehind assertions for firefox #28

liqi0816 · Apr 2, 2018 · f7838d0 · f7838d0
1 parent bdce423
commit f7838d0
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 3 deletions.
diff --git a/biliTwin.user.js b/biliTwin.user.js
@@ -2245,7 +2245,12 @@ class BiliMonkey {
                         danmuku,
                         name: index[cid].part || index[cid].index,
                         outputName: res.durl[0].url.match(/\d+-\d+(?:\d|-|hd)*(?=\.flv)/) ?
-                            res.durl[0].url.match(/\d+-\d+(?:\d|-|hd)*(?=\.flv)/)[0].replace(/(?<=\d+)-\d+(?=(?:\d|-|hd)*\.flv)/, '')
+                            /***
+                             * see #28
+                             * Firefox lookbehind assertion not implemented https://bugzilla.mozilla.org/show_bug.cgi?id=1225665
+                             * try replace /-\d+(?=(?:\d|-|hd)*\.flv)/ => /(?<=\d+)-\d+(?=(?:\d|-|hd)*\.flv)/ in the future
+                             */
+                            res.durl[0].url.match(/\d+-\d+(?:\d|-|hd)*(?=\.flv)/)[0].replace(/-\d+(?=(?:\d|-|hd)*\.flv)/, '')
                             : res.durl[0].url.match(/\d(?:\d|-|hd)*(?=\.mp4)/) ?
                                 res.durl[0].url.match(/\d(?:\d|-|hd)*(?=\.mp4)/)[0]
                                 : cid,

diff --git a/biliTwinBabelCompiled.user.js b/biliTwinBabelCompiled.user.js
@@ -4441,7 +4441,13 @@ var BiliMonkey = function () {
                                                                 }),
                                                                 danmuku: danmuku,
                                                                 name: index[cid].part || index[cid].index,
-                                                                outputName: res.durl[0].url.match(/\d+-\d+(?:\d|-|hd)*(?=\.flv)/) ? res.durl[0].url.match(/\d+-\d+(?:\d|-|hd)*(?=\.flv)/)[0].replace(/(?<=\d+)-\d+(?=(?:\d|-|hd)*\.flv)/, '') : res.durl[0].url.match(/\d(?:\d|-|hd)*(?=\.mp4)/) ? res.durl[0].url.match(/\d(?:\d|-|hd)*(?=\.mp4)/)[0] : cid,
+                                                                outputName: res.durl[0].url.match(/\d+-\d+(?:\d|-|hd)*(?=\.flv)/) ?
+                                                                /***
+                                                                 * see #28
+                                                                 * Firefox lookbehind assertion not implemented https://bugzilla.mozilla.org/show_bug.cgi?id=1225665
+                                                                 * try replace /-\d+(?=(?:\d|-|hd)*\.flv)/ => /(?<=\d+)-\d+(?=(?:\d|-|hd)*\.flv)/ in the future
+                                                                 */
+                                                                res.durl[0].url.match(/\d+-\d+(?:\d|-|hd)*(?=\.flv)/)[0].replace(/-\d+(?=(?:\d|-|hd)*\.flv)/, '') : res.durl[0].url.match(/\d(?:\d|-|hd)*(?=\.mp4)/) ? res.durl[0].url.match(/\d(?:\d|-|hd)*(?=\.mp4)/)[0] : cid,
                                                                 cid: cid,
                                                                 res: res
                                                             });

diff --git a/src/biliuserjs/bilimonkey.js b/src/biliuserjs/bilimonkey.js
@@ -697,7 +697,12 @@ class BiliMonkey {
                         danmuku,
                         name: index[cid].part || index[cid].index,
                         outputName: res.durl[0].url.match(/\d+-\d+(?:\d|-|hd)*(?=\.flv)/) ?
-                            res.durl[0].url.match(/\d+-\d+(?:\d|-|hd)*(?=\.flv)/)[0].replace(/(?<=\d+)-\d+(?=(?:\d|-|hd)*\.flv)/, '')
+                            /***
+                             * see #28
+                             * Firefox lookbehind assertion not implemented https://bugzilla.mozilla.org/show_bug.cgi?id=1225665
+                             * try replace /-\d+(?=(?:\d|-|hd)*\.flv)/ => /(?<=\d+)-\d+(?=(?:\d|-|hd)*\.flv)/ in the future
+                             */
+                            res.durl[0].url.match(/\d+-\d+(?:\d|-|hd)*(?=\.flv)/)[0].replace(/-\d+(?=(?:\d|-|hd)*\.flv)/, '')
                             : res.durl[0].url.match(/\d(?:\d|-|hd)*(?=\.mp4)/) ?
                                 res.durl[0].url.match(/\d(?:\d|-|hd)*(?=\.mp4)/)[0]
                                 : cid,