aboutsummaryrefslogtreecommitdiffstats
path: root/src/client
diff options
context:
space:
mode:
authorRblSb <msrblsb@gmail.com>2020-02-29 14:01:12 +0300
committerRblSb <msrblsb@gmail.com>2020-02-29 14:01:12 +0300
commit2ade04273717807096a07b6eb132b7677917392d (patch)
tree1598ad62bcb1f3c42b37edb7383df2704005bee5 /src/client
parentec7e4b5ad120828f1464cf4186287d4928b462a8 (diff)
Get youtube video title/duration with api
Diffstat (limited to 'src/client')
-rw-r--r--src/client/IPlayer.hx3
-rw-r--r--src/client/Main.hx17
-rw-r--r--src/client/Player.hx8
-rw-r--r--src/client/players/Raw.hx18
-rw-r--r--src/client/players/Youtube.hx71
5 files changed, 85 insertions, 32 deletions
diff --git a/src/client/IPlayer.hx b/src/client/IPlayer.hx
index a20b22b..4f29512 100644
--- a/src/client/IPlayer.hx
+++ b/src/client/IPlayer.hx
@@ -1,9 +1,10 @@
package client;
+import Types.VideoData;
import Types.VideoItem;
interface IPlayer {
- function getRemoteDuration(url:String, callback:(duration:Float)->Void):Void;
+ function getVideoData(url:String, callback:(data:VideoData)->Void):Void;
function loadVideo(item:VideoItem):Void;
function removeVideo():Void;
function play():Void;
diff --git a/src/client/Main.hx b/src/client/Main.hx
index d3271e9..c74a600 100644
--- a/src/client/Main.hx
+++ b/src/client/Main.hx
@@ -12,7 +12,9 @@ import js.Browser;
import js.Browser.document;
import js.lib.Date;
import Client.ClientData;
-import Types;
+import Types.VideoData;
+import Types.Config;
+import Types.WsEvent;
using StringTools;
using ClientTools;
@@ -156,23 +158,20 @@ class Main {
url = '$protocol//$host:$port$url';
}
if (!url.startsWith("http")) url = '$protocol//$url';
- var name = url.substr(url.lastIndexOf('/') + 1);
- final matchName = ~/^(.+)\./;
- if (matchName.match(name)) name = matchName.matched(1);
- else name = Lang.get("rawVideo");
- player.getRemoteDuration(url, (duration:Float) -> {
- if (duration == 0) {
+ player.getVideoData(url, (data:VideoData) -> {
+ if (data.duration == 0) {
serverMessage(4, Lang.get("addVideoError"));
return;
}
+ if (data.title == null) data.title = Lang.get("rawVideo");
send({
type: AddVideo, addVideo: {
item: {
url: url,
- title: name,
+ title: data.title,
author: personal.name,
- duration: duration,
+ duration: data.duration,
isTemp: isTemp
},
atEnd: atEnd
diff --git a/src/client/Player.hx b/src/client/Player.hx
index 7bd2f4e..4327e6c 100644
--- a/src/client/Player.hx
+++ b/src/client/Player.hx
@@ -5,6 +5,7 @@ import js.Browser.document;
import client.Main.ge;
import client.players.Raw;
import client.players.Youtube;
+import Types.VideoData;
import Types.VideoItem;
using StringTools;
@@ -80,11 +81,12 @@ class Player {
this.player = player;
}
- public function getRemoteDuration(url:String, callback:(duration:Float)->Void):Void {
+ public function getVideoData(url:String, callback:(data:VideoData)->Void):Void {
+ // TODO P2 reuse player objects
if (Youtube.isYoutube(url)) {
- new Youtube(main, this).getRemoteDuration(url, callback);
+ new Youtube(main, this).getVideoData(url, callback);
} else {
- new Raw(main, this).getRemoteDuration(url, callback);
+ new Raw(main, this).getVideoData(url, callback);
}
}
diff --git a/src/client/players/Raw.hx b/src/client/players/Raw.hx
index 1e5d245..44a33f2 100644
--- a/src/client/players/Raw.hx
+++ b/src/client/players/Raw.hx
@@ -5,6 +5,7 @@ import js.html.Element;
import js.html.VideoElement;
import js.Browser.document;
import client.Main.ge;
+import Types.VideoData;
import Types.VideoItem;
class Raw implements IPlayer {
@@ -19,17 +20,24 @@ class Raw implements IPlayer {
this.player = player;
}
- public function getRemoteDuration(src:String, callback:(duration:Float)->Void):Void {
+ public function getVideoData(url:String, callback:(data:VideoData)->Void):Void {
+ var title = url.substr(url.lastIndexOf('/') + 1);
+ final matchName = ~/^(.+)\./;
+ if (matchName.match(title)) title = matchName.matched(1);
+ else title = Lang.get("rawVideo");
+
final video = document.createVideoElement();
- video.src = src;
- // TODO catch errors on AddVideo and getRemoteVideoDuration
+ video.src = url;
video.onerror = e -> {
if (playerEl.contains(video)) playerEl.removeChild(video);
- callback(0);
+ callback({duration: 0});
}
video.onloadedmetadata = () -> {
if (playerEl.contains(video)) playerEl.removeChild(video);
- callback(video.duration);
+ callback({
+ duration: video.duration,
+ title: title
+ });
}
Utils.prepend(playerEl, video);
}
diff --git a/src/client/players/Youtube.hx b/src/client/players/Youtube.hx
index cba3fc4..3e84950 100644
--- a/src/client/players/Youtube.hx
+++ b/src/client/players/Youtube.hx
@@ -1,10 +1,13 @@
package client.players;
+import haxe.Json;
+import haxe.Http;
import js.html.Element;
import js.Browser.document;
import client.Main.ge;
import js.youtube.Youtube as YtInit;
import js.youtube.YoutubePlayer;
+import Types.VideoData;
import Types.VideoItem;
using StringTools;
@@ -13,6 +16,9 @@ class Youtube implements IPlayer {
static final matchId = ~/v=([A-z0-9_-]+)/;
static final matchShort = ~/youtu.be\/([A-z0-9_-]+)/;
static final matchEmbed = ~/embed\/([A-z0-9_-]+)/;
+ static final apiUrl = "https://www.googleapis.com/youtube/v3/videos";
+ static final urlTitleDuration = "?part=snippet,contentDetails&fields=items(snippet/title,contentDetails/duration)";
+ static final apiKey = "AIzaSyDTk1OPRI9cDkAK_BKsBcv10DQCHse-QaA";
final main:Main;
final player:Player;
final playerEl:Element = ge("#ytapiplayer");
@@ -26,17 +32,10 @@ class Youtube implements IPlayer {
}
public static function isYoutube(url:String):Bool {
- if (url.contains("youtu.be/")) {
- return matchShort.match(url);
- }
- if (url.contains("youtube.com/embed/")) {
- return matchEmbed.match(url);
- }
- if (!url.contains("youtube.com/")) return false;
- return matchId.match(url);
+ return extractVideoId(url) != "";
}
- function extractVideoId(url:String):String {
+ static function extractVideoId(url:String):String {
if (url.contains("youtu.be/")) {
matchShort.match(url);
return matchShort.matched(1);
@@ -45,13 +44,54 @@ class Youtube implements IPlayer {
matchEmbed.match(url);
return matchEmbed.matched(1);
}
- matchId.match(url);
+ if (!matchId.match(url)) return "";
return matchId.matched(1);
}
- public function getRemoteDuration(url:String, callback:(duration:Float)->Void):Void {
+ final matchHours = ~/([0-9]+)H/;
+ final matchMinutes = ~/([0-9]+)M/;
+ final matchSeconds = ~/([0-9]+)S/;
+
+ function convertTime(duration:String):Float {
+ var total = 0;
+ final hours = matchHours.match(duration);
+ final minutes = matchMinutes.match(duration);
+ final seconds = matchSeconds.match(duration);
+ if (hours) total += Std.parseInt(matchHours.matched(1)) * 3600;
+ if (minutes) total += Std.parseInt(matchMinutes.matched(1)) * 60;
+ if (seconds) total += Std.parseInt(matchSeconds.matched(1));
+ return total;
+ }
+
+ public function getVideoData(url:String, callback:(data:VideoData)->Void):Void {
+ final id = extractVideoId(url);
+ final url = '$apiUrl$urlTitleDuration&id=$id&key=$apiKey';
+ final http = new Http(url);
+ http.onData = data -> {
+ final json = Json.parse(data);
+ if (json.error != null) {
+ getRemoteDataFallback(url, callback);
+ return;
+ }
+ final item = json.items[0];
+ if (item == null) {
+ callback({duration: 0});
+ return;
+ }
+ final title:String = item.snippet.title;
+ final duration:String = item.contentDetails.duration;
+ callback({
+ duration: convertTime(duration),
+ title: title
+ });
+ }
+ http.onError = msg -> getRemoteDataFallback(url, callback);
+ http.request();
+ }
+
+ function getRemoteDataFallback(url:String, callback:(data:VideoData)->Void):Void {
if (!YtInit.isLoadedAPI) {
- YtInit.init(() -> getRemoteDuration(url, callback));
+ YtInit.init(() -> getRemoteDataFallback(url, callback));
return;
}
final video = document.createDivElement();
@@ -67,12 +107,15 @@ class Youtube implements IPlayer {
events: {
onReady: e -> {
if (playerEl.contains(video)) playerEl.removeChild(video);
- callback(youtube.getDuration());
+ callback({
+ duration: youtube.getDuration()
+ });
},
onError: e -> {
+ // TODO message error codes
trace('Error ${e.data}');
if (playerEl.contains(video)) playerEl.removeChild(video);
- callback(0);
+ callback({duration: 0});
}
}
});
send patches to the email below
yukais@pinapelz.com
include the subject [PATCH repo_name]
pinapelz.com
homepage