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.css b/src/index.css index 2861382..01495cf 100755 --- a/src/index.css +++ b/src/index.css @@ -23,10 +23,10 @@ body, #app { color: #3B252C; font-family: 'Source Sans Pro', sans-serif; - height: 100%; width: 100%; padding: 0; margin: 0; + border-radius: 8px; } #app.dark { @@ -54,9 +54,7 @@ hr { #app .link { color: #3F8EFC; - /* color: inherit; */ font-size: 1em; - /* font-weight: normal; */ cursor: pointer; } 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/main.js b/src/main.js index 0dcfabb..b5ccb04 100755 --- a/src/main.js +++ b/src/main.js @@ -11,7 +11,7 @@ const { 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' @@ -94,6 +94,7 @@ const createWindow = () => { } }) window.loadURL(`file://${path.join(__dirname, 'index.html')}`) + window.setVisibleOnAllWorkspaces(true) window.on('blur', () => { if (!window.webContents.isDevToolsOpened()) window.hide() @@ -148,21 +149,25 @@ function sendMax() { }).show() } +let level = '--'; setInterval(() => { - batteryLevel().then(level => { - level = parseInt(level * 100) + 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 = parseInt(stdout) + }) + if (level > lastBattery) charging = true + else charging = false + lastBattery = level - if (level === lastBattery) return - if (level > lastBattery) charging = true - else charging = false - lastBattery = level + const limits = settings.get('values', defaultValues) - const limits = settings.get('values', defaultValues) + if (level <= limits.min) sendMin() + else if (level >= limits.max) sendMax() + else numMax = numMin = 0 - 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')) + window.webContents.send('battery', level) }, 3000)