From 31985a3e95d3857f79335a459f3478918ce52450 Mon Sep 17 00:00:00 2001 From: Dario Ernst Date: Sat, 16 Apr 2016 20:55:29 +0200 Subject: [PATCH 1/2] Make seeking work --- server/server.js | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/server/server.js b/server/server.js index 935128e..3d5c455 100644 --- a/server/server.js +++ b/server/server.js @@ -5,6 +5,7 @@ var FS = require("q-io/fs"); // CONNECTIONS AND STUFF +var fifoPath = '/home/daddel9/.mpv-fifo'; var log = bunyan.createLogger({name: 'MpvRemote'}); // SETUP @@ -21,8 +22,15 @@ server.get(/\/client\/?.*/, restify.serveStatic({ // Mockup Methods server.get('/seek/:time', function (req, res, next) { log.info("Seeking "+req.params['time']+" now."); - res.send({'success':true}); - return; + return FS.write( fifoPath, '{ "command": ["seek", "10"] }\n' ) + .then(function () { + log.info("wrote seek 10 to "+fifoPath); + res.send({'success':true}); + return next(false); + }, function(reason) { + log.info("failed because "+reason); + }); + log.info("after then"); }); server.get('/seek/:time/:mode', function (req, res, next) { log.info("Seeking "+req.params['time']+" with mode "+req.params['mode']+" now."); From 275df5e051af40e51c102e804d36b60277603169 Mon Sep 17 00:00:00 2001 From: Dario Ernst Date: Sat, 16 Apr 2016 21:08:56 +0200 Subject: [PATCH 2/2] Try api design, orz --- server/server.js | 33 +++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/server/server.js b/server/server.js index 3d5c455..34474b8 100644 --- a/server/server.js +++ b/server/server.js @@ -20,18 +20,27 @@ server.get(/\/client\/?.*/, restify.serveStatic({ // Mockup Methods -server.get('/seek/:time', function (req, res, next) { - log.info("Seeking "+req.params['time']+" now."); - return FS.write( fifoPath, '{ "command": ["seek", "10"] }\n' ) - .then(function () { - log.info("wrote seek 10 to "+fifoPath); - res.send({'success':true}); - return next(false); - }, function(reason) { - log.info("failed because "+reason); - }); - log.info("after then"); -}); +// /seek/:time — seeks relative +// /seek/:time/:mode — seeks with mode, modes [relative|absolute|absolute-percent|relative-percent|exact|keyframes] +// /seek-chapter/:where — seeks to prev (where=-x) or next (where=+x) chapter +// /volume/:amount — increases (amount=+x) or decreases (amount=-x) volume +// /progress — show osd progress +// /playpause — toggles playing +// /muteunmute — toggles muting + +// server.get('/seek/:time', function (req, res, next) { +// log.info("Seeking "+req.params['time']+" now."); +// return FS.write( fifoPath, '{ "command": ["seek", "10"] }\n' ) +// .then(function () { +// log.info("wrote seek 10 to "+fifoPath); +// res.send({'success':true}); +// return next(false); +// }, function(reason) { +// log.info("failed because "+reason); +// }); +// log.info("after then"); +// }); + server.get('/seek/:time/:mode', function (req, res, next) { log.info("Seeking "+req.params['time']+" with mode "+req.params['mode']+" now."); res.send({'success':true});