specter/CyTube
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Improve URL parsing

Browse source
This commit is contained in:
calzoneman 2014-08-13 13:49:32 -05:00
parent fae1609a50
commit 735b2fcd07
1 changed files with 27 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
www/js/util.js
View file

@ -1171,6 +1171,16 @@ function playlistMove(from, after, cb) {
}
}
function extractQueryParam(query, param) {
var params = {};
query.split("&").forEach(function (kv) {
kv = kv.split("=");
params[kv[0]] = kv[1];
});
return params[param];
}
function parseMediaLink(url) {
if(typeof url != "string") {
return {
@ -1196,28 +1206,28 @@ function parseMediaLink(url) {
}
var m;
if((m = url.match(/youtube\.com\/watch\?v=([^&#]+)/))) {
if((m = url.match(/youtube\.com\/watch\?([^#]+)/))) {
return {
id: extractQueryParam(m[1], "v"),
type: "yt"
};
}
if((m = url.match(/youtu\.be\/([^\?&#]+)/))) {
return {
id: m[1],
type: "yt"
};
}
if((m = url.match(/youtu\.be\/([^&#]+)/))) {
if((m = url.match(/youtube\.com\/playlist\?([^#]+)/))) {
return {
id: m[1],
type: "yt"
};
}
if((m = url.match(/youtube\.com\/playlist\?list=([^&#]+)/))) {
return {
id: m[1],
id: extractQueryParam(m[1], "list"),
type: "yp"
};
}
if((m = url.match(/twitch\.tv\/([^&#]+)/))) {
if((m = url.match(/twitch\.tv\/([^\?&#]+)/))) {
return {
id: m[1],
type: "tw"
@ -1231,42 +1241,42 @@ function parseMediaLink(url) {
};
}
if((m = url.match(/livestream\.com\/([^&#]+)/))) {
if((m = url.match(/livestream\.com\/([^\?&#]+)/))) {
return {
id: m[1],
type: "li"
};
}
if((m = url.match(/ustream\.tv\/([^&#]+)/))) {
if((m = url.match(/ustream\.tv\/([^\?&#]+)/))) {
return {
id: m[1],
type: "us"
};
}
if((m = url.match(/vimeo\.com\/([^&#]+)/))) {
if((m = url.match(/vimeo\.com\/([^\?&#]+)/))) {
return {
id: m[1],
type: "vi"
};
}
if((m = url.match(/dailymotion\.com\/video\/([^&#]+)/))) {
if((m = url.match(/dailymotion\.com\/video\/([^\?&#]+)/))) {
return {
id: m[1],
type: "dm"
};
}
if((m = url.match(/imgur\.com\/a\/([^&#]+)/))) {
if((m = url.match(/imgur\.com\/a\/([^\?&#]+)/))) {
return {
id: m[1],
type: "im"
};
}
if((m = url.match(/soundcloud\.com\/([^&#]+)/))) {
if((m = url.match(/soundcloud\.com\/([^\?&#]+)/))) {
return {
id: url,
type: "sc"