From 54968816167d1bfc5bd8678e1fb18282ecf25989 Mon Sep 17 00:00:00 2001 From: mmcwilliams Date: Mon, 1 Jan 2018 00:19:07 -0500 Subject: [PATCH] Improve parser to ignore stanzas that are commented out or not formatted by this program. --- lib/wifi/index.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/wifi/index.js b/lib/wifi/index.js index 0b937b8..cd7b8dd 100644 --- a/lib/wifi/index.js +++ b/lib/wifi/index.js @@ -23,19 +23,19 @@ function parseConfig (str) { const lines = str.split('\n') let network = {} for (let line of lines) { - if (line.indexOf('network={') !== -1) { + if (line.substring(0, 9) === 'network={') { network = {} network.raw = line - } else if (line.indexOf('ssid=') !== -1) { + } else if (network.raw && line.indexOf('ssid=') !== -1) { network.ssid = line.replace('ssid=', '').trim().replace(quoteRe, '') if (network.raw) { network.raw += '\n' + line } - } else if (line.indexOf('}') !== -1) { + } else if (network.raw && line.substring(0, 1) === '}') { network.raw += '\n' + line networks.push(network) network = {} - } else if (network.ssid) { + } else if (network.raw) { network.raw += '\n' + line } }