Changeset 16865 for lang/javascript/userscripts

Timestamp:

07/30/08 16:17:46 (4 months ago)

Author:

kotas

Message:

• More accurate inspection for the end of playing video.
  
• Added "full-screen" feature.
  
• Fixed failure on getting relative videos.
  
• Published the playlist controller in the global namespace.
  

Files:

• lang/javascript/userscripts/niconicoplaylist.user.js (modified) (16 diffs)

lang/javascript/userscripts/niconicoplaylist.user.js

@@ -11 +11 @@
 
         var NicoNicoPlaylist = {
-                version: "1.10",
+                version: "1.11",
                 getUserAgent: function () {
                         return "NicoNicoPlaylist/" + NicoNicoPlaylist.version + " Greasemonkey";
@@ -42 +42 @@
                 WATCH_URL:           "http://www.nicovideo.jp/watch/",
                 GETRELATION_API_URL: "http://www.nicovideo.jp/api/getrelation?page=1&sort=p&order=d&video="
+        };
+
+        NicoNico.Player = function () { this.initialize.apply(this, arguments); };
+        NicoNico.Player.prototype = {
+                initialize: function (id) {
+                        this.player = (typeof id != "string") ? id : document.getElementById(id);
+                },
+                isReady: function () {
+                        return (this.player && this.player.ext_getStatus &&
+                                this.player.ext_getStatus() !== undefined);
+                },
+                getStatus: function () {
+                        return this.player.ext_getStatus();
+                },
+                isFullScreen: function () {
+                        return (this.player.ext_getVideoSize == "fit");
+                },
+                setFullScreen: function (full) {
+                        this.player.ext_setVideoSize(full ? "fit" : "normal");
+                        return this;
+                }
         };
 
@@ -81 +102 @@
                                                 if (!tags) return false;
                                                 for (var i = 0, len = tags.length; i < len; i++) {
-                                                        var m = tags[i].match(NicoNico.WATCH_PAGE_REGEXP);
+                                                        var m;
+                                                        m = tags[i].match(/<url>([^<]+)<\/url>/);
+                                                        if (!m) continue;
+                                                        m = m[1].match(NicoNico.WATCH_PAGE_REGEXP);
                                                         if (!m) continue;
                                                         var videoId = m[1];
 
-                                                        m = tags[i].match(/<title>(.+?)<\/title>/);
+                                                        m = tags[i].match(/<title>([^<]+)<\/title>/);
                                                         if (!m) continue;
                                                         var title = m[1];
@@ -194 +218 @@
                         this.random = GM_getValue("random_" + this.playlist.id) || false;
                         this.loop = GM_getValue("loop_" + this.playlist.id) || false;
+                        this.fullScreen = GM_getValue("fullScreen_" + this.playlist.id) || false;
                         this.pinned = GM_getValue("pinned_" + this.playlist.id) || false;
-                        this.hidingTimer = null;
+                        this.container = null;
+                        this.opened = false;
+                        this.closeTimer = null;
                         this.update();
                 },
@@ -208 +235 @@
                 isWatchPage: function () {
                         return this.getPageVideoId() != false;
+                },
+                pushVideo: function (videoId, title) {
+                        var video = new Video(videoId, title);
+                        this.playlist.push(video);
+                        this.playlist.save();
+                        this.update();
+                },
+                pushVideos: function (videos) {
+                        for (var i = 0, len = videos.length; i < len; i++) {
+                                var video = new Video(videos[i].id, videos[i].title);
+                                this.playlist.push(video);
+                        }
+                        this.playlist.save();
+                        this.update();
                 },
                 pushThisVideo: function () {
@@ -217 +258 @@
                                 if (!a || !a.tagName || a.tagName.toUpperCase() != "A") return;
                                 var title = a.innerHTML;
-                                var video = new Video(videoId, title);
-                                this.playlist.push(video);
-                                this.playlist.save();
-                                this.update();
+                                this.pushVideo(videoId, title);
                         }
                 },
                 pushAllVideos: function () {
                         var as = document.getElementsByTagName("a");
+                        var videos = [];
                         for (var i = 0, len = as.length; i < len; i++) {
                                 var a = as[i];
@@ -230 +269 @@
                                 var m;
                                 if (m = a.href.match(NicoNico.WATCH_PAGE_REGEXP)) {
-                                        if (/\bvideo\b/.test(a.className)) {
-                                                var video = new Video(m[1], a.innerHTML);
-                                                this.playlist.push(video);
+                                        if (/\bvideo\b(?!.*\bnoadd\b)/.test(a.className)) {
+                                                videos.push({ id: m[1], title: a.innerHTML });
                                         }
                                 }
@@ -242 +280 @@
                                 var thisVideo = new Video(videoId);
                                 thisVideo.getRelatedVideos(function (videoId, title) {
-                                        var video = new Video(videoId, title);
-                                        self.playlist.push(video);
+                                        videos.push({ id: videoId, title: title });
                                 }, function () {
-                                        self.playlist.save();
-                                        self.update();
+                                        self.pushVideos(videos);
                                 });
                         } else {
-                                this.playlist.save();
-                                this.update();
+                                this.pushVideos(videos);
                         }
                 },
@@ -299 +334 @@
                         GM_setValue("pinned_" + this.playlist.id, this.pinned);
 
-                        if (this.hidingTimer) {
-                                clearTimeout(this.hidingTimer);
-                                this.hidingTimer = null;
+                        if (this.closeTimer) {
+                                clearTimeout(this.closeTimer);
+                                this.closeTimer = null;
                         }
                 },
@@ -311 +346 @@
                         this.loop = loop;
                         GM_setValue("loop_" + this.playlist.id, this.loop);
+                },
+                setFullScreen: function (fullScreen) {
+                        this.fullScreen = fullScreen;
+                        GM_setValue("fullScreen_" + this.playlist.id, this.fullScreen);
+                },
+                open: function () {
+                        if (this.container) {
+                                this.opened = true;
+                                this.container.className = "playlist-controller";
+                        }
+                },
+                close: function () {
+                        if (this.container) {
+                                this.opened = false;
+                                this.container.className = "playlist-controller closed";
+                        }
+                },
+                closeLater: function (msec) {
+                        var self = this;
+                        this.cancelClosing();
+                        this.closeTimer = setTimeout(function () {
+                                self.closeTimer = null;
+                                self.close();
+                        }, msec || 500);
+                },
+                cancelClosing: function () {
+                        if (this.closeTimer) {
+                                clearTimeout(this.closeTimer);
+                                this.closeTimer = null;
+                        }
                 },
                 update: function () {
@@ -320 +385 @@
                                 box = document.createElement("div");
                                 box.id = "playlistcontroller_" + this.playlist.id;
-                                box.className = "playlist-controller hiding";
-
-                                Util.observe(box, "mouseover", function () {
-                                        box.className = "playlist-controller";
-                                        if (self.hidingTimer) {
-                                                clearTimeout(self.hidingTimer);
-                                                self.hidingTimer = null;
+                                box.className = "playlist-controller" + (this.opened ? "" : " closed");
+
+                                Util.observe(box, "mousemove", function (ev) {
+                                        if (!self.opened) {
+                                                self.open();
+                                        } else {
+                                                self.cancelClosing();
                                         }
                                 });
                                 Util.observe(box, "mouseout", function (ev) {
-                                        if (self.pinned) return;
-                                        var el = ev.target || ev.srcElement;
-                                        if (el != box) return;
-                                        self.hidingTimer = setTimeout(function () {
-                                                self.hidingTimer = null;
-                                                box.className = "playlist-controller hiding";
-                                        }, 500);
+                                        if (!self.opened || self.pinned) return;
+                                        if (box != ev.target && box != ev.srcElement) return;
+                                        self.closeLater();
                                 });
                                 document.body.appendChild(box);
@@ -350 +411 @@
                                 box.innerHTML = "";
                         }
+                        this.container = box;
 
                         var header = document.createElement("div");
@@ -359 +421 @@
                                 title: "プレイリストを閉じる",
                                 className: "playlist-window-button playlist-window-button-close",
-                                click: function () { box.className = "playlist-controller hiding"; }
+                                click: function () { self.close(); }
                         });
                         this.__addLinkButton(header, {
@@ -506 +568 @@
 
                         this.__addCheckBox(footer, {
+                                id: "playlist-" + this.playlist.id + "-checkbox-full",
+                                caption: "最大化",
+                                className: "playlist-checkbox-full",
+                                click: function () { self.setFullScreen(this.checked); },
+                                checked: this.fullScreen
+                        });
+                        this.__addCheckBox(footer, {
                                 id: "playlist-" + this.playlist.id + "-checkbox-random",
                                 caption: "ランダム",
@@ -626 +695 @@
         var playlist = new PlayList();
         var controller = new PlayListController(playlist);
-
-        var player = document.getElementById('flvplayer');
-        if (player) {
-                var lastPos = null;
-                var endTimer = setInterval(function () {
-                        var total = player.GetVariable("ContentLength");
-                        if (!total) return;
-                        var pos   = player.GetVariable("LastVpos");
-                        if ((total - pos) <= 5 && lastPos == pos) {
-                                clearInterval(endTimer);
-                                controller.playNext();
-                        }
-                        lastPos = pos;
-                }, 1000);
+        w.gm_playlistController = controller;
+
+        var playerElem = document.getElementById('flvplayer');
+        if (playerElem) {
+                var player = new NicoNico.Player(playerElem);
+                (function (next) {
+                        var t = setInterval(function () {
+                                if (player.isReady()) {
+                                        clearInterval(t);
+                                        if (controller.fullScreen) {
+                                                player.setFullScreen(true);
+                                        }
+                                        next();
+                                }
+                        }, 100);
+                })(function () {
+                        var t = setInterval(function() {
+                                if (player.getStatus() == "end") {
+                                        clearInterval(t);
+                                        controller.playNext();
+                                }
+                        }, 1000);
+                });
         }
 
@@ -656 +734 @@
                         overflow: hidden;
                 }
-                .playlist-controller.hiding {
+                .playlist-controller.closed {
                         left: -395px;
                 }