Skip to content

Commit

Permalink
Fixed formatting issues with suggestions from @stephen in stephen#88
Browse files Browse the repository at this point in the history 
* fixed indents to two spaces
* changed formatting of string concatination
* slight change of error messages
  • Loading branch information
@iona5
iona5 committed Jan 17, 2015
1 parent 7a56565 commit 8758266
Showing 1 changed file with 115 additions and 115 deletions.
230 changes: 115 additions & 115 deletions lib/main.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,90 +16,90 @@ flags.parse();

var setupSonos = function(device, model) {

if (model === 'BR100' || model === 'ANVIL') return; // ignore Sonos Bridge and Sub device

device.getZoneAttrs(function(err, zoneAttrs) {
if (err) throw err;

var deviceName = zoneAttrs.CurrentZoneName;

console.log('Setting up AirSonos for', deviceName, '{' + device.host + ':' + device.port + '}');

var airplayServer = new NodeTunes({
serverName: deviceName + ' (AirSonos)',
verbose: flags.get('verbose'),
controlTimeout: flags.get('timeout')
});

var clientName = 'AirSonos';
airplayServer.on('clientNameChange', function(name) {
clientName = 'AirSonos @ ' + name;
});

airplayServer.on('error', function(err) {
if (err.code === 415) {
console.error('Warning!', err.message);
console.error('AirSonos currently does not support codecs used by applications such as iTunes or AirFoil.');
console.error('Progress on this issue: https://github.com/stephen/nodetunes/issues/1');
} else {
console.error('Unknown error:');
console.error(err);
}
})

airplayServer.on('clientConnected', function(audioStream) {

portastic.find({
min : 8000,
max : 8050,
retrieve: 1
}, function(err, port) {
if (err) throw err;

var icecastServer = new Nicercast(audioStream, {
name: 'AirSonos @ ' + deviceName
});

airplayServer.on('metadataChange', function(metadata) {
if (metadata.minm)
icecastServer.setMetadata(metadata.minm + (metadata.asar ? ' - ' + metadata.asar : '') + (metadata.asal ? ' (' + metadata.asal + ')' : ''));
});

airplayServer.on('clientDisconnected', function() {
icecastServer.stop();
});

icecastServer.start(port);

device.play({
uri: 'x-rincon-mp3radio://' + ip.address() + ':' + port + '/listen.m3u',
metadata: '<?xml version="1.0"?>' +
'<DIDL-Lite xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:upnp="urn:schemas-upnp-org:metadata-1-0/upnp/" xmlns:r="urn:schemas-rinconnetworks-com:metadata-1-0/" xmlns="urn:schemas-upnp-org:metadata-1-0/DIDL-Lite/">' +
'<item id="R:0/0/49" parentID="R:0/0" restricted="true">' +
'<dc:title>' + clientName + '</dc:title>' +
'<upnp:class>object.item.audioItem.audioBroadcast</upnp:class>' +
'<desc id="cdudn" nameSpace="urn:schemas-rinconnetworks-com:metadata-1-0/">SA_RINCON65031_</desc>' +
'</item>' +
'</DIDL-Lite>'
});

});
});

airplayServer.on('clientDisconnected', function() {
device.stop(function() {});
});

airplayServer.on('volumeChange', function(vol) {
vol = 100 - Math.floor(-1 * (Math.max(vol, -30) / 30) * 100);
device.setVolume(vol, function() {
// ?
});
});

airplayServer.start();

});
if (model === 'BR100' || model === 'ANVIL') return; // ignore Sonos Bridge and Sub device

device.getZoneAttrs(function(err, zoneAttrs) {
if (err) throw err;

var deviceName = zoneAttrs.CurrentZoneName;

console.log('Setting up AirSonos for', deviceName, '{' + device.host + ':' + device.port + '}');

var airplayServer = new NodeTunes({
serverName: deviceName + ' (AirSonos)',
verbose: flags.get('verbose'),
controlTimeout: flags.get('timeout')
});

var clientName = 'AirSonos';
airplayServer.on('clientNameChange', function(name) {
clientName = 'AirSonos @ ' + name;
});

airplayServer.on('error', function(err) {
if (err.code === 415) {
console.error('Warning!', err.message);
console.error('AirSonos currently does not support codecs used by applications such as iTunes or AirFoil.');
console.error('Progress on this issue: https://github.com/stephen/nodetunes/issues/1');
} else {
console.error('Unknown error:');
console.error(err);
}
})

airplayServer.on('clientConnected', function(audioStream) {

portastic.find({
min : 8000,
max : 8050,
retrieve: 1
}, function(err, port) {
if (err) throw err;

var icecastServer = new Nicercast(audioStream, {
name: 'AirSonos @ ' + deviceName
});

airplayServer.on('metadataChange', function(metadata) {
if (metadata.minm)
icecastServer.setMetadata(metadata.minm + (metadata.asar ? ' - ' + metadata.asar : '') + (metadata.asal ? ' (' + metadata.asal + ')' : ''));
});

airplayServer.on('clientDisconnected', function() {
icecastServer.stop();
});

icecastServer.start(port);

device.play({
uri: 'x-rincon-mp3radio://' + ip.address() + ':' + port + '/listen.m3u',
metadata: '<?xml version="1.0"?>' +
'<DIDL-Lite xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:upnp="urn:schemas-upnp-org:metadata-1-0/upnp/" xmlns:r="urn:schemas-rinconnetworks-com:metadata-1-0/" xmlns="urn:schemas-upnp-org:metadata-1-0/DIDL-Lite/">' +
'<item id="R:0/0/49" parentID="R:0/0" restricted="true">' +
'<dc:title>' + clientName + '</dc:title>' +
'<upnp:class>object.item.audioItem.audioBroadcast</upnp:class>' +
'<desc id="cdudn" nameSpace="urn:schemas-rinconnetworks-com:metadata-1-0/">SA_RINCON65031_</desc>' +
'</item>' +
'</DIDL-Lite>'
});

});
});

airplayServer.on('clientDisconnected', function() {
device.stop(function() {});
});

airplayServer.on('volumeChange', function(vol) {
vol = 100 - Math.floor(-1 * (Math.max(vol, -30) / 30) * 100);
device.setVolume(vol, function() {
// ?
});
});

airplayServer.start();

});
};

if (flags.get('version')) {
Expand All @@ -113,37 +113,37 @@ if (flags.get('version')) {
diag();

} else if (flags.get('devices').length > 0) {
var deviceArguments = flags.get('devices');
for(var i = 0; i < deviceArguments.length ; i++) {
var deviceArg = deviceArguments[i];
// set up a domain to catch errors from setting up individual
// devices. For example it catches the timeout when non-existing IPs
// are entered.
var setupDomain = require('domain').create();
setupDomain.on('error', function(err) {
console.error('error on setting up device "'+deviceArg+'": '+err);
});
var sonosDevice;
// Check if the argument contains a port specifier
var ipPortSplit = deviceArg.split(':');
if (ipPortSplit.length > 1) {
sonosDevice = new sonos.Sonos(ipPortSplit[0], ipPortSplit[1]);
} else {
sonosDevice = new sonos.Sonos(deviceArg);
}
// run the setup in a domain so we can catch errors for each device
// individually:
setupDomain.run(function() {
setupSonos(sonosDevice, 'Sonos'+i);
});
}

var deviceArguments = flags.get('devices');
for(var i = 0; i < deviceArguments.length; i++) {

var deviceArg = deviceArguments[i];

// set up a domain to catch errors from setting up individual
// devices. For example it catches the timeout when non-existing IPs
// are entered.
var setupDomain = require('domain').create();
setupDomain.on('error', function(err) {
console.error('Error on setting up device "' + deviceArg + '": ' + err);
});

var sonosDevice;

// Check if the argument contains a port specifier
var ipPortSplit = deviceArg.split(':');
if (ipPortSplit.length > 1) {
sonosDevice = new sonos.Sonos(ipPortSplit[0], ipPortSplit[1]);
} else {
sonosDevice = new sonos.Sonos(deviceArg);
}

// run the setup in a domain so we can catch errors for each device
// individually:
setupDomain.run(function() {
setupSonos(sonosDevice, 'Sonos' + i);
});
}

} else {

console.log('Searching for Sonos devices on network...');
Expand Down

0 comments on commit 8758266

Please sign in to comment.