Changeset 1534780

Timestamp:

11/16/2016 04:30:17 AM (9 years ago)

Author:

0xbbc

Message:

Extended support for bilibili param

Location:

dplayer-for-wp

Files:

• tags/1.1.4 (copied) (copied from dplayer-for-wp/trunk)
• tags/1.1.4/dplayer-admin.php (copied) (copied from dplayer-for-wp/trunk/dplayer-admin.php)
• tags/1.1.4/dplayer.php (copied) (copied from dplayer-for-wp/trunk/dplayer.php) (3 diffs)
• tags/1.1.4/js/DPlayer.min.js (copied) (copied from dplayer-for-wp/trunk/js/DPlayer.min.js)
• tags/1.1.4/js/DPlayer.min.js.map (copied) (copied from dplayer-for-wp/trunk/js/DPlayer.min.js.map)
• tags/1.1.4/js/plugin (copied) (copied from dplayer-for-wp/trunk/js/plugin)
• tags/1.1.4/readme.txt (copied) (copied from dplayer-for-wp/trunk/readme.txt) (3 diffs)
• trunk/dplayer.php (modified) (3 diffs)
• trunk/readme.txt (modified) (3 diffs)

dplayer-for-wp/tags/1.1.4/dplayer.php

@@ -3 +3 @@
 * Plugin Name: DPlayer for WordPress
 * Description: Wow, such a lovely HTML5 danmaku video player comes to WordPress
-* Version: 1.1.3
+* Version: 1.1.4
 * Author: 0xBBC
 * Author URI: https://blog.0xbbc.com/
@@ -48 +48 @@
     }
     
+    public static function dplayer_bilibili_url_handler($bilibili_url) {
+        $aid = 0;
+        $page = 1;
+        $is_bilibili = false;
+        if (preg_match('/^[\d]+$/', $bilibili_url)) {
+            $aid = $bilibili_url;
+            $is_bilibili = true;
+        } else {
+            $parsed = parse_url($bilibili_url);
+            if ($parsed['host'] === 'www.bilibili.com') {
+                preg_match('/^\/video\/av([\d]+)(?:\/index_([\d]+)\.html)?/', $parsed['path'], $path_match);
+                if ($path_match) {
+                    $is_bilibili = true;
+                    $aid = $path_match[1];
+                    $page = $path_match[2] == null ? 1 : $path_match[2];
+                    preg_match('/^page=([\d]+)$/', $parsed['fragment'], $page_match);
+                    if ($page_match) $page = $page_match[1];
+                }
+            }
+        }
+
+        if ($is_bilibili) {
+            if ($page == 1) {
+                return array(get_option( 'kblog_danmaku_url', '' ).'bilibili?aid='.$aid);
+            } else {
+                $cid = -1;
+                $json_response = @json_decode(gzdecode(file_get_contents('http://www.bilibili.com/widget/getPageList?aid='.$aid)), true);
+                if ($json_response) {
+                    foreach ($json_response as $page_info) {
+                        if ($page_info['page'] == $page) {
+                            $cid = $page_info['cid'];
+                            break;
+                        }
+                    }
+                }
+                
+                if ($cid != -1) {
+                    return array(get_option( 'kblog_danmaku_url', '' ).'bilibili?cid='.$cid);
+                }
+            }
+        }
+        return null;
+    }
+    
     public static function dplayer_load($atts = [], $content = null, $tag = '') {
         // normalize attribute keys, lowercase
@@ -88 +132 @@
             'api' => get_option( 'kblog_danmaku_url', '' ),
         );
-        if ($atts['bilibili']) $danmaku['addition'] = array(get_option( 'kblog_danmaku_url', '' ).'bilibili?aid='.$atts['bilibili']);
+        
+        if ($atts['bilibili']) $danmaku['addition'] = DPlayer::dplayer_bilibili_url_handler($atts['bilibili']);
         $data['danmaku'] = ($atts['danmu'] != 'false') ? $danmaku : null;
 

dplayer-for-wp/tags/1.1.4/readme.txt

@@ -4 +4 @@
 Requires at least: 3.0.1
 Tested up to: 4.6.1
-Stable tag: 1.1.3
+Stable tag: 1.1.4
 License: GPLv3
 License URI: http://www.gnu.org/licenses/gpl-3.0.html
@@ -23 +23 @@
 Parameter 'preload', preload mode, 'auto', 'metatdata' or 'none'. Optional and default metadata.
 Parameter 'hotkey', enable builtin hotkey? including left, right and Space. Optional and default true.
-Parameter 'bilibili', bilibili视频AV号. Additional danmaku from bilibili
+Parameter 'bilibili', bilibili视频AV号 或者 完整的bilibili视频链接. Additional danmaku from bilibili
 Parameter 'danmu', should DPlayer load danmaku. Default false and it's optional.
 
@@ -39 +39 @@
 
 == Changelog ==
+
+= 1.1.4 =
+* Extended support for bilibili param, now you can use either
+- bilibili='23333'
+- bilibili='http://www.bilibili.com/video/av2333333/index_233.html#page=2333'
+to load additional danmaku. 
+
+This plugin will give you exactly the danma that you need, which means, 
+
+If you give the original URL to the bilibili video, this plugin will identify the URL format, load the right danmaku. In this example, 'http://www.bilibili.com/video/av2333333/index_23333#page=233' is given. And the plugin knows that aid is 2333333 and your requested page is 2333. (According to bilibili, 'index_233.html#page=2333' means that you starts at page 233 but currently you're watching page 2333)
 
 = 1.1.3 =

dplayer-for-wp/trunk/dplayer.php

@@ -3 +3 @@
 * Plugin Name: DPlayer for WordPress
 * Description: Wow, such a lovely HTML5 danmaku video player comes to WordPress
-* Version: 1.1.3
+* Version: 1.1.4
 * Author: 0xBBC
 * Author URI: https://blog.0xbbc.com/
@@ -48 +48 @@
     }
     
+    public static function dplayer_bilibili_url_handler($bilibili_url) {
+        $aid = 0;
+        $page = 1;
+        $is_bilibili = false;
+        if (preg_match('/^[\d]+$/', $bilibili_url)) {
+            $aid = $bilibili_url;
+            $is_bilibili = true;
+        } else {
+            $parsed = parse_url($bilibili_url);
+            if ($parsed['host'] === 'www.bilibili.com') {
+                preg_match('/^\/video\/av([\d]+)(?:\/index_([\d]+)\.html)?/', $parsed['path'], $path_match);
+                if ($path_match) {
+                    $is_bilibili = true;
+                    $aid = $path_match[1];
+                    $page = $path_match[2] == null ? 1 : $path_match[2];
+                    preg_match('/^page=([\d]+)$/', $parsed['fragment'], $page_match);
+                    if ($page_match) $page = $page_match[1];
+                }
+            }
+        }
+
+        if ($is_bilibili) {
+            if ($page == 1) {
+                return array(get_option( 'kblog_danmaku_url', '' ).'bilibili?aid='.$aid);
+            } else {
+                $cid = -1;
+                $json_response = @json_decode(gzdecode(file_get_contents('http://www.bilibili.com/widget/getPageList?aid='.$aid)), true);
+                if ($json_response) {
+                    foreach ($json_response as $page_info) {
+                        if ($page_info['page'] == $page) {
+                            $cid = $page_info['cid'];
+                            break;
+                        }
+                    }
+                }
+                
+                if ($cid != -1) {
+                    return array(get_option( 'kblog_danmaku_url', '' ).'bilibili?cid='.$cid);
+                }
+            }
+        }
+        return null;
+    }
+    
     public static function dplayer_load($atts = [], $content = null, $tag = '') {
         // normalize attribute keys, lowercase
@@ -88 +132 @@
             'api' => get_option( 'kblog_danmaku_url', '' ),
         );
-        if ($atts['bilibili']) $danmaku['addition'] = array(get_option( 'kblog_danmaku_url', '' ).'bilibili?aid='.$atts['bilibili']);
+        
+        if ($atts['bilibili']) $danmaku['addition'] = DPlayer::dplayer_bilibili_url_handler($atts['bilibili']);
         $data['danmaku'] = ($atts['danmu'] != 'false') ? $danmaku : null;
 

dplayer-for-wp/trunk/readme.txt

@@ -4 +4 @@
 Requires at least: 3.0.1
 Tested up to: 4.6.1
-Stable tag: 1.1.3
+Stable tag: 1.1.4
 License: GPLv3
 License URI: http://www.gnu.org/licenses/gpl-3.0.html
@@ -23 +23 @@
 Parameter 'preload', preload mode, 'auto', 'metatdata' or 'none'. Optional and default metadata.
 Parameter 'hotkey', enable builtin hotkey? including left, right and Space. Optional and default true.
-Parameter 'bilibili', bilibili视频AV号. Additional danmaku from bilibili
+Parameter 'bilibili', bilibili视频AV号 或者 完整的bilibili视频链接. Additional danmaku from bilibili
 Parameter 'danmu', should DPlayer load danmaku. Default false and it's optional.
 
@@ -39 +39 @@
 
 == Changelog ==
+
+= 1.1.4 =
+* Extended support for bilibili param, now you can use either
+- bilibili='23333'
+- bilibili='http://www.bilibili.com/video/av2333333/index_233.html#page=2333'
+to load additional danmaku. 
+
+This plugin will give you exactly the danma that you need, which means, 
+
+If you give the original URL to the bilibili video, this plugin will identify the URL format, load the right danmaku. In this example, 'http://www.bilibili.com/video/av2333333/index_23333#page=233' is given. And the plugin knows that aid is 2333333 and your requested page is 2333. (According to bilibili, 'index_233.html#page=2333' means that you starts at page 233 but currently you're watching page 2333)
 
 = 1.1.3 =