Comparing version 0.2.3 to 0.3.0
@@ -27,3 +27,3 @@ "use strict"; | ||
return (entry.priority >= this.minPriority && | ||
Boolean(regexes.find((reg) => reg.test(entry.message)))); | ||
Boolean(regexes.find((reg) => Boolean(entry.messages.find((message) => reg.test(message)))))); | ||
}; | ||
@@ -30,0 +30,0 @@ } |
@@ -20,3 +20,4 @@ "use strict"; | ||
parseMessages(messages) { | ||
return messages.map((rawMessage) => { | ||
return messages | ||
.map((rawMessage) => { | ||
const timeMatch = rawMessage.match(AndroidParser.timeRegex); | ||
@@ -36,7 +37,20 @@ if (!timeMatch) { | ||
tag: tag.trim() || 'unknown', | ||
message: rawMessage | ||
.slice(timeMatch[0].length + headerMatch[0].length) | ||
.trim(), | ||
messages: [ | ||
rawMessage | ||
.slice(timeMatch[0].length + headerMatch[0].length) | ||
.trim(), | ||
], | ||
}; | ||
}); | ||
}) | ||
.reduce((acc, entry) => { | ||
if (acc.length > 0 && | ||
acc[acc.length - 1].date.getTime() === entry.date.getTime() && | ||
acc[acc.length - 1].tag === entry.tag && | ||
acc[acc.length - 1].pid === entry.pid && | ||
acc[acc.length - 1].priority === entry.priority) { | ||
acc[acc.length - 1].messages.push(...entry.messages); | ||
return acc; | ||
} | ||
return [...acc, entry]; | ||
}, []); | ||
} | ||
@@ -43,0 +57,0 @@ } |
@@ -24,3 +24,5 @@ "use strict"; | ||
} | ||
const output = ansi_fragments_1.container(ansi_fragments_1.modifier('dim', parseDate(entry.date)), ansi_fragments_1.pad(1), ansi_fragments_1.color(priorityColor, ansi_fragments_1.modifier(priorityModifier, `${constants_1.Priority.toLetter(entry.priority)} |`)), ansi_fragments_1.pad(1), ansi_fragments_1.modifier('bold', ansi_fragments_1.color(priorityColor, ansi_fragments_1.modifier(priorityModifier, entry.tag))), ansi_fragments_1.pad(1), ansi_fragments_1.color(priorityColor, ansi_fragments_1.modifier(priorityModifier, '▶︎')), ansi_fragments_1.pad(1), ansi_fragments_1.color(priorityColor, ansi_fragments_1.modifier(priorityModifier, entry.message))).build(); | ||
const output = ansi_fragments_1.container(ansi_fragments_1.modifier('dim', parseDate(entry.date)), ansi_fragments_1.pad(1), ansi_fragments_1.color(priorityColor, ansi_fragments_1.modifier(priorityModifier, `${constants_1.Priority.toLetter(entry.priority)} |`)), ansi_fragments_1.pad(1), ansi_fragments_1.modifier('bold', ansi_fragments_1.color(priorityColor, ansi_fragments_1.modifier(priorityModifier, entry.tag))), ansi_fragments_1.pad(1), ansi_fragments_1.color(priorityColor, ansi_fragments_1.modifier(priorityModifier, '▶︎')), ansi_fragments_1.pad(1), ansi_fragments_1.color(priorityColor, ansi_fragments_1.modifier(priorityModifier, entry.messages[0])), ansi_fragments_1.ifElse(entry.messages.length > 1, ansi_fragments_1.container(...entry.messages | ||
.slice(1) | ||
.map((line, index, arr) => ansi_fragments_1.container(ansi_fragments_1.pad(1, '\n'), ansi_fragments_1.pad(entry.tag.length + 16), ansi_fragments_1.color(priorityColor, ansi_fragments_1.modifier(priorityColor === 'none' ? 'dim' : 'none', `${index === arr.length - 1 ? '└' : '│'} `)), ansi_fragments_1.color(priorityColor, ansi_fragments_1.modifier(priorityModifier, line))))), '')).build(); | ||
return `${output}\n`; | ||
@@ -27,0 +29,0 @@ } |
@@ -6,3 +6,3 @@ export declare type Entry = { | ||
tag: string; | ||
message: string; | ||
messages: string[]; | ||
}; | ||
@@ -9,0 +9,0 @@ export interface IParser { |
{ | ||
"name": "logkitty", | ||
"version": "0.2.3", | ||
"version": "0.3.0", | ||
"description": "Display pretty Logcat logs without Android Studio with intuitive Command Line Interface.", | ||
@@ -5,0 +5,0 @@ "keywords": [ |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
41351
466