rainbownapkin/fore.st
1
0
Fork 0
Code Issues 13 Pull requests Actions Packages Projects Releases Wiki Activity

Implement YouTube search, minor fixes, remove "Play Next" button

Browse source
This commit is contained in:
calzoneman 2013-04-04 11:39:43 -05:00
parent f7bc601fed
commit 362fd0ab23
7 changed files with 102 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
channel.js
View file

@ -218,7 +218,18 @@ Channel.prototype.unbanIP = function(actor, ip) {
return Database.removeChannelBan(this.name, ip);
}
Channel.prototype.search = function(query) {
Channel.prototype.search = function(query, callback) {
// Search youtube
if(callback) {
if(query.trim() == "") {
return;
}
InfoGetter.getYTSearchResults(query, function(vids) {
callback(vids);
});
return;
}
query = query.toLowerCase();
var results = [];
for(var id in this.library) {
@ -232,6 +243,7 @@ Channel.prototype.search = function(query) {
return (x == y) ? 0 : (x < y ? -1 : 1);
});
return results;
}
@ -678,8 +690,10 @@ Channel.prototype.jumpTo = function(pos) {
}
Channel.prototype.tryJumpTo = function(user, data) {
if(!Rank.hasPermission(user, "jump") &&
this.leader != user) {
if(!Rank.hasPermission(user, "queue") &&
this.leader != user &&
(!this.openqueue ||
this.openqueue && !this.opts.qopen_allow_playnext)) {
return;
}

49
get-info.js
View file

@ -87,8 +87,55 @@ exports.getYTPlaylist = function(id, callback, url) {
timeout: 1000}, callback);
}
exports.searchYT = function(terms, callback) {
getJSON({
host: "gdata.youtube.com",
port: 80,
path: "/feeds/api/videos/-/" + terms.join("/") + "?v=2&alt=json",
method: "GET",
dataType: "jsonp",
timeout: 1000}, callback);
}
exports.getYTSearchResults = function(query, callback) {
var cback = function(res, data) {
if(res != 200) {
return;
}
var vids = [];
try {
for(var i = 0; i < data.feed.entry.length; i++) {
try {
var item = data.feed.entry[i];
var id = item.media$group.yt$videoid.$t;
var title = item.title.$t;
var seconds = item.media$group.yt$duration.seconds;
var media = new Media(id, title, seconds, "yt");
media.thumb = item.media$group.media$thumbnail[0];
vids.push(media);
}
catch(e) {
Logger.errlog.log("getYTSearchResults failed: ");
Logger.errlog.log(e);
}
}
}
catch(e) {
Logger.errlog.log("getYTSearchResults failed: ");
Logger.errlog.log(e);
}
callback(vids);
}
exports.searchYT(query.split(" "), cback);
}
// Look up Soundcloud metadata
// Whoever designed this should rethink it. I"ll submit a feedback
// Whoever designed this should rethink it. I'll submit a feedback
// form on their website.
exports.getSCInfo = function(url, callback) {
const SC_CLIENT = "2e0c82ab5a020f3a7509318146128abd";

2
server.js
View file

@ -9,7 +9,7 @@ The above copyright notice and this permission notice shall be included in all c
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.
*/
const VERSION = "1.0.1";
const VERSION = "1.1.0";
var fs = require("fs");
var Logger = require("./logger.js");

16
user.js
View file

@ -151,9 +151,19 @@ User.prototype.initCallbacks = function() {
this.socket.on("searchLibrary", function(data) {
if(this.channel != null) {
this.socket.emit("librarySearchResults", {
results: this.channel.search(data.query)
});
if(data.yt) {
var callback = function(vids) {
this.socket.emit("librarySearchResults", {
results: vids
});
}.bind(this);
this.channel.search(data.query, callback);
}
else {
this.socket.emit("librarySearchResults", {
results: this.channel.search(data.query)
});
}
}
}.bind(this));

9
www/assets/js/client.js
View file

@ -323,10 +323,17 @@ function searchLibrary() {
}
$("#library_search").click(searchLibrary);
$("#library_query").keydown(function(ev) {
if(ev.key == 13)
if(ev.keyCode == 13)
searchLibrary();
});
$("#youtube_search").click(function() {
socket.emit("searchLibrary", {
query: $("#library_query").val(),
yt: true
});
});
$("#largelayout").click(largeLayout);
$("#hugelayout").click(hugeLayout);
$("#narrowlayout").click(narrowLayout);

14
www/assets/js/functions.js
View file

@ -156,11 +156,17 @@ function formatChatMessage(data) {
function makeQueueEntry(video) {
var li = $("<li />");
li.attr("class", "well");
var title = $("<span />").attr("class", "qe_title").appendTo(li);
if(video.thumb) {
$("<img/>").attr("src", video.thumb.url)
.css("float", "left")
.css("clear", "both")
.appendTo(li);
}
var title = $("<span />").addClass("qe_title").appendTo(li);
title.text(video.title);
var time = $("<span />").attr("class", "qe_time").appendTo(li);
var time = $("<span />").addClass("qe_time").appendTo(li);
time.text(video.duration);
var clear = $("<div />").attr("class", "qe_clear").appendTo(li);
var clear = $("<div />").addClass("qe_clear").appendTo(li);
return li;
}
@ -258,7 +264,7 @@ function addLibraryButtons(li, id) {
var btnNext = $("<button />").attr("class", "btn qe_btn").appendTo(btnstrip);
//$("<i />").attr("class", "icon-play").appendTo(btnNext);
btnNext.text("Next");
if(!CHANNELOPTS.qopen_allow_qnext)
if(!CHANNELOPTS.qopen_allow_qnext && RANK < Rank.Moderator && !LEADER)
btnNext.attr("disabled", true);
var btnEnd = $("<button />").attr("class", "btn qe_btn").appendTo(btnstrip);

8
www/index.html
View file

@ -80,7 +80,6 @@
<button class="btn" id="queue_next">Queue Next</button>
<button class="btn" id="queue_end">Queue @ End</button>
</div>
<button class="btn btn-primary" id="play_next">Play Next</button>
</div>
<button class="btn btn-danger" id="voteskip">Voteskip</button>
<ul id="queue" class="videolist">
@ -89,7 +88,10 @@
</div>
<div class="span6" id="librarydiv">
<input type="text" id="library_query" style="margin:auto;">
<button class="btn" id="library_search">Search Library</button>
<div class="btn-group">
<button class="btn" id="library_search">Search Library</button>
<button class="btn" id="youtube_search">Search YouTube</button>
</div>
<ul id="library" class="videolist">
</ul>
</div>
@ -133,7 +135,7 @@
</label>
<label class="checkbox">
<input type="checkbox" id="opt_qopen_allow_playnext">
Allow anyone to skip to next video
Allow anyone to jump to a video
</label>
</div>
<div class="span5">