Skip to content

Commit

Permalink
pretty extension names for peer status
Browse files Browse the repository at this point in the history
  • Loading branch information
Karl Anderson committed Dec 10, 2017
1 parent 0b29ce2 commit dac6c63
Show file tree
Hide file tree
Showing 3 changed files with 45 additions and 41 deletions.
8 changes: 6 additions & 2 deletions src/info.js
View file
Expand Up @@ -33,24 +33,28 @@ Info.prototype.peerStatusAction = function(peer, status) {
};

Info.prototype.peerStatusStrings = function(peerStatuses, filterStatuses) {
var self = this;
if (filterStatuses === undefined) { filterStatuses = [] }

return Object.keys(peerStatuses).filter(
// filter out keys not matching defaultExtensions
function(key) {
// filter out keys not matching defaultExtensions
return Object.keys(defaultExtensions).some(
function foo(element) { return key.includes(element); })
}
).filter(
// filter out entries with statuses in filterStatuses
function(key) { return !(filterStatuses.indexOf(peerStatuses[key].status) >= 0); }
).sort(
// sort by timestamp
function(x, y) { return peerStatuses[y].timestamp - peerStatuses[x].timestamp; }
).map(
// format into pretty strings
function(key) {
formatTimestamp = function(dateString) {
return moment(dateString).format('LLL');
}
return key + ' ' + peerStatuses[key].status + ' ' + formatTimestamp(peerStatuses[key].timestamp);
return self.prettyExtensionString(key) + ' ' + peerStatuses[key].status + ' ' + formatTimestamp(peerStatuses[key].timestamp);
});
};

Expand Down
46 changes: 23 additions & 23 deletions src/test/test_client.js
View file
Expand Up @@ -124,14 +124,14 @@ describe('main', function() {
testSays(client,
'to',
["Peer statuses:",
"610 null December 31, 1969 4:00 PM",
"630 null December 31, 1969 4:00 PM",
"655 null December 31, 1969 4:00 PM",
"667 null December 31, 1969 4:00 PM",
"668 null December 31, 1969 4:00 PM",
"669 null December 31, 1969 4:00 PM",
"670 null December 31, 1969 4:00 PM",
"680 null December 31, 1969 4:00 PM"],
"610(crossclinton) null December 31, 1969 4:00 PM",
"630(ypsi) null December 31, 1969 4:00 PM",
"655(taylor st) null December 31, 1969 4:00 PM",
"667(oskar indoors) null December 31, 1969 4:00 PM",
"668(oskar curbside) null December 31, 1969 4:00 PM",
"669(oskar office) null December 31, 1969 4:00 PM",
"670(r2d2) null December 31, 1969 4:00 PM",
"680(xnor) null December 31, 1969 4:00 PM"],
this.clock);
});
});
Expand All @@ -143,14 +143,14 @@ describe('main', function() {
testSays(client,
'to',
["Peer statuses:",
"610 null December 31, 1969 4:00 PM",
"630 null December 31, 1969 4:00 PM",
"655 null December 31, 1969 4:00 PM",
"667 null December 31, 1969 4:00 PM",
"668 null December 31, 1969 4:00 PM",
"669 null December 31, 1969 4:00 PM",
"670 null December 31, 1969 4:00 PM",
"680 null December 31, 1969 4:00 PM"],
"610(crossclinton) null December 31, 1969 4:00 PM",
"630(ypsi) null December 31, 1969 4:00 PM",
"655(taylor st) null December 31, 1969 4:00 PM",
"667(oskar indoors) null December 31, 1969 4:00 PM",
"668(oskar curbside) null December 31, 1969 4:00 PM",
"669(oskar office) null December 31, 1969 4:00 PM",
"670(r2d2) null December 31, 1969 4:00 PM",
"680(xnor) null December 31, 1969 4:00 PM"],
this.clock);
});
});
Expand All @@ -169,13 +169,13 @@ describe('main', function() {
testSays(client,
'to',
["Peer statuses:",
"670 Unreachable December 31, 1969 4:08 PM",
"669 Unreachable December 31, 1969 4:06 PM",
"610 null December 31, 1969 4:00 PM",
"630 null December 31, 1969 4:00 PM",
"655 null December 31, 1969 4:00 PM",
"667 null December 31, 1969 4:00 PM",
"680 null December 31, 1969 4:00 PM"],
"670(r2d2) Unreachable December 31, 1969 4:08 PM",
"669(oskar office) Unreachable December 31, 1969 4:06 PM",
"610(crossclinton) null December 31, 1969 4:00 PM",
"630(ypsi) null December 31, 1969 4:00 PM",
"655(taylor st) null December 31, 1969 4:00 PM",
"667(oskar indoors) null December 31, 1969 4:00 PM",
"680(xnor) null December 31, 1969 4:00 PM"],
this.clock);
});
});
Expand Down
32 changes: 16 additions & 16 deletions src/test/test_info.js
View file
Expand Up @@ -25,14 +25,14 @@ describe('main', function() {
JSON.stringify(info.peerStatus()),
JSON.stringify(
[ 'Peer statuses:',
"610 null December 31, 1969 4:00 PM",
'630 null December 31, 1969 4:00 PM',
'655 null December 31, 1969 4:00 PM',
'667 null December 31, 1969 4:00 PM',
'668 null December 31, 1969 4:00 PM',
'669 null December 31, 1969 4:00 PM',
'670 null December 31, 1969 4:00 PM',
'680 null December 31, 1969 4:00 PM' ]));
"610(crossclinton) null December 31, 1969 4:00 PM",
'630(ypsi) null December 31, 1969 4:00 PM',
'655(taylor st) null December 31, 1969 4:00 PM',
'667(oskar indoors) null December 31, 1969 4:00 PM',
'668(oskar curbside) null December 31, 1969 4:00 PM',
'669(oskar office) null December 31, 1969 4:00 PM',
'670(r2d2) null December 31, 1969 4:00 PM',
'680(xnor) null December 31, 1969 4:00 PM' ]));
});
});
describe('populated', function() {
Expand All @@ -52,14 +52,14 @@ describe('main', function() {
JSON.stringify(info.peerStatus()),
JSON.stringify(
['Peer statuses:',
'670 Registered December 31, 1969 4:06 PM',
'669 Unreachable December 31, 1969 4:04 PM',
'610 null December 31, 1969 4:00 PM',
'630 null December 31, 1969 4:00 PM',
'655 null December 31, 1969 4:00 PM',
'667 null December 31, 1969 4:00 PM',
'668 Registered December 31, 1969 4:00 PM',
'680 null December 31, 1969 4:00 PM']));
'670(r2d2) Registered December 31, 1969 4:06 PM',
'669(oskar office) Unreachable December 31, 1969 4:04 PM',
'610(crossclinton) null December 31, 1969 4:00 PM',
'630(ypsi) null December 31, 1969 4:00 PM',
'655(taylor st) null December 31, 1969 4:00 PM',
'667(oskar indoors) null December 31, 1969 4:00 PM',
'668(oskar curbside) Registered December 31, 1969 4:00 PM',
'680(xnor) null December 31, 1969 4:00 PM']));
});
});
});
Expand Down

0 comments on commit dac6c63

Please sign in to comment.