Don't re-add + log MCI cache if already cached. Also fix wording :)

This commit is contained in:
Bryan Ashby 2016-09-01 23:57:57 -06:00
parent 470897eadc
commit 82533eae2d
1 changed files with 5 additions and 3 deletions

View File

@ -49,7 +49,7 @@ function getFontNameFromSAUCE(sauce) {
function sliceAtEOF(data, eofMarker) { function sliceAtEOF(data, eofMarker) {
let eof = data.length; let eof = data.length;
const stopPos = Math.max(data.length - (256), 0); // 256 = 2 * sizeof(SAUCE) const stopPos = Math.max(data.length - (256), 0); // 256 = 2 * sizeof(SAUCE)
for(let i = eof - 1; i > stopPos; i--) { for(let i = eof - 1; i > stopPos; i--) {
if(eofMarker === data[i]) { if(eofMarker === data[i]) {
eof = i; eof = i;
@ -256,16 +256,17 @@ function display(client, art, options, cb) {
let mciMap; let mciMap;
const mciCprQueue = []; const mciCprQueue = [];
let artHash; let artHash;
let mciMapFromCache;
function completed() { function completed() {
if(cprListener) { if(cprListener) {
client.removeListener('cursor position report', cprListener); client.removeListener('cursor position report', cprListener);
} }
if(!options.disableMciCache) { if(!options.disableMciCache && !mciMapFromCache) {
// cache our MCI findings... // cache our MCI findings...
client.mciCache[artHash] = mciMap; client.mciCache[artHash] = mciMap;
client.log.trace( { artHash : artHash, mciMap : mciMap }, 'Added MCI map from cache'); client.log.trace( { artHash : artHash, mciMap : mciMap }, 'Added MCI map to cache');
} }
ansiParser.removeAllListeners(); // :TODO: Necessary??? ansiParser.removeAllListeners(); // :TODO: Necessary???
@ -288,6 +289,7 @@ function display(client, art, options, cb) {
} }
if(mciMap) { if(mciMap) {
mciMapFromCache = true;
client.log.trace( { artHash : artHash, mciMap : mciMap }, 'Loaded MCI map from cache'); client.log.trace( { artHash : artHash, mciMap : mciMap }, 'Loaded MCI map from cache');
} else { } else {
// no cached MCI info // no cached MCI info