X-Git-Url: https://git.wh0rd.org/?p=chrome-ext%2Fmusic-player-client.git;a=blobdiff_plain;f=main.js;h=1466bded59d7192b0a094b2c4bea70254d47cb39;hp=1de6b6a4c18e8f254be18dbcc6acb6971c9220ef;hb=650b9e7b55fa66426318c67b20f6c0cf82faac27;hpb=4ed31ba857752d2d550dde24200a751574ffce8f

diff --git a/main.js b/main.js
index 1de6b6a..1466bde 100644
--- a/main.js
+++ b/main.js
@@ -11,6 +11,13 @@ function TcpClientSender(tcpclient) {
 TcpClientSender.prototype.send = function(data, cb) {
 	this.tcpclient.sendMessage(data, cb);
 }
+TcpClientSender.prototype.poll = function() {
+	this.tcpclient.poll();
+}
+TcpClientSender.prototype.reconnect = function() {
+	this.tcpclient.disconnect();
+	this.tcpclient.connect();
+}
 
 function tramp_mpc_recv(data) {
 	mpc.recv(data);
@@ -53,9 +60,25 @@ window.onload = function() {
 	});
 };
 
+window.onkeypress = function(e) {
+	switch (e.keyCode) {
+	case 49: // 1
+		show_page('controls');
+		break;
+	case 50: // 1
+		show_page('metadata');
+		break;
+	case 51: // 1
+		show_page('playlist');
+		break;
+	case 52: // 1
+		show_page('options');
+		break;
+	}
+};
+
 function mpc_refresh() {
 	mpc.status();
-	mpc.currentsong();
 }
 
 function mpc_connect(host, port) {
@@ -91,6 +114,7 @@ function tramp_mpc_consume() {
 	mpc.consume(val);
 	setToggleButton(this, val);
 }
+function tramp_mpc_deleteid() { mpc.deleteid(this.title); }
 function tramp_mpc_next() { mpc.next(); }
 function tramp_mpc_pause() { mpc.pause(); }
 function tramp_mpc_play() { mpc.play(); }
@@ -133,6 +157,15 @@ function show_page(page) {
 	if (typeof(page) != 'string')
 		page = this.id.split('.')[1];
 
+	switch (page) {
+	case 'playlist':
+		mpc.playlistinfo();
+		// Fallthrough.
+	case 'metadata':
+		mpc.currentsong();
+		break;
+	}
+
 	var eles = document.getElementsByClassName('main');
 	for (var i = 0; i < eles.length; ++i) {
 		var ele = eles[i];
@@ -180,16 +213,21 @@ function update_sync_settings() {
 }
 
 function init_ui(local_keys, sync_keys, options) {
+	var ele, i;
+
 	/* Setup footer */
+	i = 1;
 	[
-		'controls', 'metadata', 'options',
+		'controls', 'metadata', 'playlist', 'options',
 	].forEach(function(id) {
-		document.getElementById('tab.' + id).onclick = show_page;
+		var ele = document.getElementById('tab.' + id);
+		ele.onclick = show_page;
+		ele.title = id + ' [' + i + ']';
+		++i;
 	});
 
 	/* Setup control tab */
 	ui_mpc_status = document.getElementById('status');
-	ui_mpc_metadata = document.getElementById('metadata');
 	[
 		'consume', 'next', 'pause', 'play', 'previous', 'random', 'repeat',
 		'seekcur', 'setvol', 'single', 'stop',
@@ -197,8 +235,21 @@ function init_ui(local_keys, sync_keys, options) {
 		var ele = window['ui_mpc_' + id] = document.getElementById(id);
 		ele.onchange = ele.onclick = window['tramp_mpc_' + id];
 		ele.title = id;
+		if (ele.accessKey)
+			ele.title += ' [' + ele.accessKey + ']'
+	});
+	window['ui_mpc_currtime'] = document.getElementById('currtime');
+
+	/* Setup metadata tab */
+	[
+		'album', 'artist', 'date', 'file', 'title',
+	].forEach(function(id) {
+		window['ui_mpc_metadata_' + id] = document.getElementById('metadata.' + id);
 	});
 
+	/* Setup playlist tab */
+	window['ui_mpc_playlist'] = document.getElementById('playlist');
+
 	/* Setup options tab */
 	document.getElementById('connect').onclick = mpc_connect;
 	local_keys.forEach(function(id) {
@@ -213,6 +264,29 @@ function init_ui(local_keys, sync_keys, options) {
 	});
 }
 
+function pretty_time(time) {
+	var sec, min, hrs, ret = '';
+	time = parseInt(time);
+	sec = time % 60;
+	min = parseInt((time / 60) % 60);
+	hrs = parseInt((time / 3600) % 3600);
+	if (hrs)
+		ret = hrs + ':' + ("00" + min).substr(-2) + ':';
+	else
+		ret = min + ':';
+	return ret + ("00" + sec).substr(-2);
+}
+
+function playlist_del() {
+	mpc.deleteid(this.song_id);
+	this.parentNode.remove();
+}
+
+function playlist_play() {
+	mpc.playid(this.song_id);
+	this.parentNode.style.fontWeight = 'bold';
+}
+
 function update_ui(state, cmd) {
 	if (typeof(state) == 'string') {
 		ui_mpc_status.innerText = ({
@@ -235,22 +309,79 @@ function update_ui(state, cmd) {
 		return;
 	}
 
-	if ('file' in state) {
-		// Hack: should be a real object.
-		ui_mpc_metadata.innerText = state['file'];
-		return;
+	/* Update the metadata tab only when things have changed. */
+	var currentsong;
+	if ('Currentsong' in state) {
+		currentsong = state.Currentsong;
+		if (ui_mpc_metadata_file.lastUpdate != state.Currentsong.lastUpdate) {
+			ui_mpc_metadata_album.innerText = currentsong.Album;
+			ui_mpc_metadata_artist.innerText = currentsong.Artist;
+			ui_mpc_metadata_title.innerText = currentsong.Title;
+			ui_mpc_metadata_date.innerText = currentsong.Date;
+			ui_mpc_metadata_file.innerText = currentsong.file;
+		}
 	}
 
-	var time;
-	if ('time' in state)
+	/* Update the playlist tab only when things have changed. */
+	if ('Playlist' in state && ui_mpc_playlist.lastUpdate != state.Playlist.lastUpdate) {
+		var playlist = state.Playlist;
+
+		ui_mpc_playlist.innerHTML = '';
+		playlist.forEach(function(song) {
+			var cell, row = ui_mpc_playlist.insertRow(-1);
+			if (currentsong && song.Pos == currentsong.Pos)
+				row.style.fontWeight = 'bold';
+
+			cell = row.insertCell(-1);
+			cell.id = 'playlist_del';
+			cell.innerHTML = '&#164;';
+			cell.song_id = song.Id;
+			cell.title = 'delete';
+			cell.onclick = playlist_del;
+
+			cell = row.insertCell(-1);
+			cell.innerText = song.Pos;
+			cell.style.textAlign = 'right';
+			cell.song_id = song.Id;
+			cell.title = 'play';
+			cell.onclick = playlist_play;
+
+			if ('Artist' in song) {
+				row.insertCell(-1).innerText = song.Artist;
+				row.insertCell(-1).innerText = song.Album;
+				row.insertCell(-1).innerText = song.Title;
+			} else {
+				cell = row.insertCell(-1);
+				cell.innerText = song.file;
+				cell.colSpan = 3;
+			}
+			row.insertCell(-1).innerText = pretty_time(song.Time);
+		});
+
+		ui_mpc_playlist.lastUpdate = playlist.lastUpdate;
+	}
+
+	/* Update the status tab. */
+	var time, percent;
+	if ('time' in state) {
 		// When stopped, there is no time field at all.
 		time = state.time.split(':');
-	else
+		percent = Math.floor((0.0 + time[0]) * 100 / (0.0 + time[1]));
+	} else {
 		time = [0, 0];
-	window['ui_mpc_seekcur'].max = time[1];
-	window['ui_mpc_seekcur'].value = time[0];
+		percent = 0;
+	}
+	ui_mpc_seekcur.max = time[1];
+	ui_mpc_seekcur.value = time[0];
+	ui_mpc_seekcur.title = 'seekcur (' + percent + '%)';
+	ui_mpc_currtime.innerText = [pretty_time(time[0]), pretty_time(time[1]), percent + '%'].join(' / ');
+
+	ui_mpc_setvol.title = 'setvol';
+	if ('volume' in state) {
+		ui_mpc_setvol.value = state.volume;
+		ui_mpc_setvol.title += ' (' + state.volume + '%)';
+	}
 
-	window['ui_mpc_setvol'].value = state.volume;
 	[
 		'consume', 'random', 'repeat', 'single',
 	].forEach(function(id) {