diff --git a/argos@pew.worldwidemann.com/utilities.js b/argos@pew.worldwidemann.com/utilities.js index 5cb795f..c685a62 100644 --- a/argos@pew.worldwidemann.com/utilities.js +++ b/argos@pew.worldwidemann.com/utilities.js @@ -72,12 +72,13 @@ function parseFilename(filename) { function parseLine(lineString) { let line = {}; - let separatorIndex = lineString.indexOf("|"); + let separatedLine = GLib.regex_split_simple("(?= 0) { + if (separatedLine.length > 0) { let attributes = []; try { - attributes = GLib.shell_parse_argv(lineString.substring(separatorIndex + 1))[1]; + attributes = GLib.shell_parse_argv(separatedLine.join('|'))[1]; } catch (error) { log("Unable to parse attributes for line '" + lineString + "': " + error); } @@ -93,12 +94,6 @@ function parseLine(lineString) { line[name] = value; } } - - line.text = lineString.substring(0, separatorIndex); - - } else { - // Line has no attributes - line.text = lineString; } let leadingDashes = line.text.search(/[^-]/);