diff --git a/package.json b/package.json index a6be641..f0d5134 100755 --- a/package.json +++ b/package.json @@ -16,7 +16,7 @@ }, "dependencies": { "auto-launch": "^5", - "battery-level": "^3", + "child_process": "^1.0.2", "dark-mode": "^3.0.0", "electron-settings": "^3" } diff --git a/src/index.html b/src/index.html index 760ecd8..825cab1 100755 --- a/src/index.html +++ b/src/index.html @@ -3,7 +3,7 @@ - Weather + Volta - \ No newline at end of file + diff --git a/src/index.js b/src/index.js index f6199fc..4d34498 100755 --- a/src/index.js +++ b/src/index.js @@ -66,5 +66,5 @@ ipcRenderer.on('launch', (event, checked) => { }) ipcRenderer.on('battery', (event, value) => { - document.getElementById('currentBattery').innerText = `${value}%` + document.getElementById('currentBattery').innerText = `${value}` }) diff --git a/src/main.js b/src/main.js index 0dcfabb..b4c6a47 100755 --- a/src/main.js +++ b/src/main.js @@ -12,6 +12,7 @@ const settings = require('electron-settings') const path = require('path') const AutoLaunch = require('auto-launch') const batteryLevel = require('battery-level') +const exec = require('child_process').exec const al = new AutoLaunch({ name: 'Volta' @@ -148,21 +149,15 @@ function sendMax() { }).show() } +let level = 'checking...'; setInterval(() => { - batteryLevel().then(level => { - level = parseInt(level * 100) - - if (level === lastBattery) return - if (level > lastBattery) charging = true - else charging = false - lastBattery = level - - const limits = settings.get('values', defaultValues) - - if (level <= limits.min) sendMin() - else if (level >= limits.max) sendMax() - else numMax = numMin = 0 - - window.webContents.send('battery', level) - }).catch(() => console.log('Could not get Battery level')) + exec('pmset -g batt | egrep "([0-9]+\%)" -o', function(err, stdout, stderr) { + if (err) { + console.log(error.stack) + console.log('Error code: ' + error.code) + console.log('Signal received: ' + error.signal) + } + level = String(stdout) + }) + window.webContents.send('battery', level) }, 3000)