From 0e339fc88d6f26ff4f150ed56615fc673a0b85ec Mon Sep 17 00:00:00 2001
From: Ondrej Zara <ondrej.zara@gmail.com>
Date: Sun, 14 Apr 2019 18:09:42 +0200
Subject: [PATCH] streaming

---
 app/app.css     |  1 +
 app/css/yt.less |  1 +
 app/js/yt.js    | 16 +++++++++++++---
 index.js        | 25 ++++++++++++-------------
 4 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/app/app.css b/app/app.css
index 59819e9..cc85feb 100644
--- a/app/app.css
+++ b/app/app.css
@@ -635,6 +635,7 @@ nav ul li.active {
 #yt .go {
   width: 96px;
   height: 96px;
+  justify-content: center;
 }
 #yt .go:disabled {
   position: relative;
diff --git a/app/css/yt.less b/app/css/yt.less
index fe88962..4a5b4c6 100644
--- a/app/css/yt.less
+++ b/app/css/yt.less
@@ -7,6 +7,7 @@
 	.go {
 		width: 96px;
 		height: 96px;
+		justify-content: center;
 
 		&:disabled {
 			position: relative;
diff --git a/app/js/yt.js b/app/js/yt.js
index e4e6134..a15eb04 100644
--- a/app/js/yt.js
+++ b/app/js/yt.js
@@ -5,6 +5,11 @@ import * as ui from "./lib/ui.js";
 import * as conf from "./conf.js";
 
 let node;
+const decoder = new TextDecoder("utf-8");
+
+function decodeChunk(byteArray) {
+	return decoder.decode(byteArray);
+}
 
 async function onClick(e) {
 	let url = prompt("Please enter a YouTube URL:");
@@ -19,11 +24,16 @@ async function onClick(e) {
 	let body = new URLSearchParams();
 	body.set("url", url);
 	let response = await fetch("/youtube", {method:"POST", body});
-	let text = await response.text();
+
+	let reader = response.body.getReader();
+	while (true) {
+		let { done, value } = await reader.read();
+		if (done) { break; }
+		p.textContent += decodeChunk(value);
+	}
+	reader.releaseLock();
 
 	button.disabled = false;
-	p.textContent = text;
-
 	if (response.status == 200) {
 		mpd.command(`update ${mpd.escape(conf.ytPath)}`);
 	}
diff --git a/index.js b/index.js
index dd862a7..7db577c 100644
--- a/index.js
+++ b/index.js
@@ -2,7 +2,13 @@ const static = require("node-static");
 const app = new static.Server("./app");
 const port = Number(process.argv[2]) || 8080;
 
+const cmd = "youtube-dl";
+//const cmd = "./test.sh";
+
 function downloadYoutube(url, response) {
+	response.setHeader("Content-Type", "text/plain"); // necessary for firefox to read by chunks
+//	response.setHeader("Content-Type", "text/plain; charset=utf-8");
+
 	// FIXME create directory
 	console.log("YouTube downloading", url);
 	let args = [
@@ -10,12 +16,10 @@ function downloadYoutube(url, response) {
 		"-o", `${__dirname}/_youtube/%(title)s-%(id)s.%(ext)s`,
 		url
 	]
-	let child = require("child_process").spawn("youtube-dl", args);
-	let stdOut = "";
-	let stdErr = "";
+	let child = require("child_process").spawn(cmd, args);
 
-	child.stdout.setEncoding("utf8").on("data", chunk => stdOut += chunk);
-	child.stderr.setEncoding("utf8").on("data", chunk => stdErr += chunk);
+	child.stdout.setEncoding("utf8").on("data", chunk => response.write(chunk));
+	child.stderr.setEncoding("utf8").on("data", chunk => response.write(chunk));
 
 	child.on("error", error => {
 		console.log(error);
@@ -24,14 +28,9 @@ function downloadYoutube(url, response) {
 	});
 
 	child.on("close", code => {
-		if (code == 0) {
-			console.log("OK");
-			response.end(stdOut);
-		} else {
-			console.log(code, stdOut, stdErr);
-			response.writeHead(500);
-			response.end(stdErr);
+		if (code != 0) { // fixme
 		}
+		response.end();
 	});
 }
 
@@ -60,4 +59,4 @@ function onRequest(request, response) {
 
 let httpServer = require("http").createServer(onRequest).listen(port);
 require("ws2mpd").ws2mpd(httpServer, `http://localhost:${port}`);
-require("ws2mpd").logging(false);
+//require("ws2mpd").logging(false);