Tidy up node-red-nodes

This commit is contained in:
dceejay
2015-04-10 11:56:17 +01:00
parent 4dc2db2f95
commit e56029b3e3
10 changed files with 24 additions and 489 deletions

View File

@@ -1,80 +0,0 @@
<!--
Copyright 2013 IBM Corp.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<script type="text/x-red" data-template-name="mpd out">
<div class="form-row">
<label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
<input type="text" id="node-input-name" placeholder="Name">
</div>
<div class="form-tips">Expects a msg.payload with a valid mpc command.</div>
</script>
<script type="text/x-red" data-help-name="mpd out">
<p>MPD music control output node.</p>
<p>Expects <b>msg.payload</b> to be a valid mpc command. Currently only simple commands that expect no reply are supported. play, pause, next, previous, stop, etc.</p>
</script>
<script type="text/javascript">
RED.nodes.registerType('mpd out',{
category: 'advanced-output',
color:"#ffcc66",
defaults: {
name: {value:""}
},
inputs:1,
outputs:0,
icon: "music.png",
align: "right",
label: function() {
return this.name||"mpd";
},
labelStyle: function() {
return this.name?"node_label_italic":"";
}
});
</script>
<script type="text/x-red" data-template-name="mpd in">
<div class="form-row">
<label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
<input type="text" id="node-input-name" placeholder="Name">
</div>
<div class="form-tips">Creates a msg.payload object with Artist, Album, Title, Genre and Date.</div>
</script>
<script type="text/x-red" data-help-name="mpd in">
<p>MPD music control input node.</p>
<p>Creates a <b>msg.payload</b> object containing Artist, Album, Track, Genre and Date.</p>
</script>
<script type="text/javascript">
RED.nodes.registerType('mpd in',{
category: 'advanced-input',
color:"#ffcc66",
defaults: {
name: {value:""}
},
inputs:0,
outputs:1,
icon: "music.png",
label: function() {
return this.name||"mpd";
},
labelStyle: function() {
return this.name?"node_label_italic":"";
}
});
</script>

View File

@@ -1,102 +0,0 @@
/**
* Copyright 2013 IBM Corp.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
**/
module.exports = function(RED) {
"use strict";
var util = require("util");
var exec = require('child_process').exec;
var komponist = require('komponist');
var mpc = null;
exec("which mpd",function(err,stdout,stderr) {
if (stdout.indexOf('mpd') == -1) {
throw 'Error: Cannot find "mpd" command. Please install MPD.';
}
});
exec("netstat -an | grep LISTEN | grep 6600",function(err,stdout,stderr) {
if (stdout.indexOf('6600') == -1) {
throw '[69-mpd.js] Error: MPD daemon not listening on port 6600. Please start MPD.';
}
komponist.createConnection(6600, 'localhost', function(err, client) {
if (err) { node.error("MPD: Failed to connect to MPD server"); }
mpc = client;
});
});
function MPDOut(n) {
RED.nodes.createNode(this,n);
var node = this;
node.mpc = mpc;
if (mpc != null) {
this.on("input", function(msg) {
try {
//node.mpc.command(msg.payload);
node.mpc.command(msg.payload, msg.param, function(err, results) {
if (err) { node.log("error: "+err); }
//else { console.log(results); }
});
} catch (err) { node.log("error: "+err); }
});
node.mpc.on('error', function(err) {
node.log("error: "+err);
});
}
else { node.warn("MPD not running"); }
}
RED.nodes.registerType("mpd out",MPDOut);
function MPDIn(n) {
RED.nodes.createNode(this,n);
var node = this;
node.mpc = mpc;
var oldMsg = "";
if (mpc != null) {
getSong();
var getSong = function() {
node.mpc.currentsong(function(err, info) {
if (err) { node.log(err); }
else {
var msg = {payload:{},topic:"music"};
msg.payload.Artist = info.Artist;
msg.payload.Album = info.Album;
msg.payload.Title = info.Title;
msg.payload.Genre = info.Genre;
msg.payload.Date = info.Date;
if (JSON.stringify(msg) != oldMsg) {
node.send(msg);
oldMsg = JSON.stringify(msg);
}
}
});
}
node.mpc.on('changed', function(system) {
getSong();
});
this.on("close", function() {
// node.mpc.command("stop");
});
}
else { node.warn("MPD not running"); }
}
RED.nodes.registerType("mpd in",MPDIn);
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB