cupcakearmy/volta
1
0
Fork 0
mirror of https://github.com/cupcakearmy/volta.git synced 2024-12-22 16:06:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6 from daaanny90/battery-level

Browse Source 
Battery level
This commit is contained in:
Nicco 2020-03-07 16:16:59 +01:00 committed by GitHub
commit a44773188d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -16,7 +16,7 @@
}, },
"dependencies": { "dependencies": {
"auto-launch": "^5", "auto-launch": "^5",
"battery-level": "^3", "child_process": "^1.0.2",
"dark-mode": "^3.0.0", "dark-mode": "^3.0.0",
"electron-settings": "^3" "electron-settings": "^3"
} }

4
src/index.css
View File

@ -23,10 +23,10 @@ body,
#app { #app {
color: #3B252C; color: #3B252C;
font-family: 'Source Sans Pro', sans-serif; font-family: 'Source Sans Pro', sans-serif;
height: 100%;
width: 100%; width: 100%;
padding: 0; padding: 0;
margin: 0; margin: 0;
border-radius: 8px;
} }
#app.dark { #app.dark {
@ -54,9 +54,7 @@ hr {
#app .link { #app .link {
color: #3F8EFC; color: #3F8EFC;
/* color: inherit; */
font-size: 1em; font-size: 1em;
/* font-weight: normal; */
cursor: pointer; cursor: pointer;
} }

3
src/index.html
View File

@ -3,7 +3,7 @@
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<title>Weather</title> <title>Volta</title>
<link rel="stylesheet" href="./index.css" charset="utf-8"> <link rel="stylesheet" href="./index.css" charset="utf-8">
<link rel="stylesheet" href="./vendor/nouislider.min.css" charset="utf-8"> <link rel="stylesheet" href="./vendor/nouislider.min.css" charset="utf-8">
<script charset="utf-8" src="./vendor/nouislider.min.js"> <script charset="utf-8" src="./vendor/nouislider.min.js">
@ -20,7 +20,6 @@
<div class="title">Current: <div class="title">Current:
<span id="currentBattery"></span> <span id="currentBattery"></span>
</div> </div>
<small>Note: Due to limits in the implementation the actual battery value may differ from the one given by the OS</small>
<hr/> <hr/>
<div id="settings"> <div id="settings">

17
src/main.js
View File

@ -11,7 +11,7 @@ const {
const settings = require('electron-settings') const settings = require('electron-settings')
const path = require('path') const path = require('path')
const AutoLaunch = require('auto-launch') const AutoLaunch = require('auto-launch')
const batteryLevel = require('battery-level') const exec = require('child_process').exec
const al = new AutoLaunch({ const al = new AutoLaunch({
name: 'Volta' name: 'Volta'
@ -94,6 +94,7 @@ const createWindow = () => {
} }
}) })
window.loadURL(`file://${path.join(__dirname, 'index.html')}`) window.loadURL(`file://${path.join(__dirname, 'index.html')}`)
window.setVisibleOnAllWorkspaces(true)
window.on('blur', () => { window.on('blur', () => {
if (!window.webContents.isDevToolsOpened()) window.hide() if (!window.webContents.isDevToolsOpened()) window.hide()
@ -148,11 +149,16 @@ function sendMax() {
}).show() }).show()
} }
let level = '--';
setInterval(() => { setInterval(() => {
batteryLevel().then(level => { exec('pmset -g batt | egrep "([0-9]+\%)" -o', function(err, stdout, stderr) {
level = parseInt(level * 100) if (err) {
console.log(error.stack)
if (level === lastBattery) return console.log('Error code: ' + error.code)
console.log('Signal received: ' + error.signal)
}
level = parseInt(stdout)
})
if (level > lastBattery) charging = true if (level > lastBattery) charging = true
else charging = false else charging = false
lastBattery = level lastBattery = level
@ -164,5 +170,4 @@ setInterval(() => {
else numMax = numMin = 0 else numMax = numMin = 0
window.webContents.send('battery', level) window.webContents.send('battery', level)
}).catch(() => console.log('Could not get Battery level'))
}, 3000) }, 3000)