thordinary/ macropad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added state_cmd for checking state, state_expect for expected output (using exit code if none specified)

This commit is contained in:
Thord Johansson 2022-11-29 23:23:42 +01:00
parent db94af4b24
commit af6b62ccae
2 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
main.py
View File

@ -1,14 +1,28 @@
from flask import Flask, render_template, request from flask import Flask, render_template, request
from os import system from os import system
import subprocess
app = Flask(__name__) app = Flask(__name__)
def check_app_states(apps): def check_app_states(apps):
for app in apps: for app in apps:
if 'check_cmd' in app: if not 'default' in app:
exitcode = system(app['check_cmd']) app['default'] = False
app['default'] = app['default'] if exitcode == 0 else False if 'state_cmd' in app and len(app['state_cmd']) > 0:
if 'state_expect' in app:
try:
result = subprocess.run(app['state_cmd'], shell=True, check=True)
print(result)
if result.stdout == app['state_expect']:
app['default'] = not app['default'] if result.stdout == app['state_expect'] else app['default']
except subprocess.CalledProcessError:
continue # continue with default, current state could not be determined
else:
exitcode = system(app['state_cmd'])
if exitcode == 0:
app['default'] = not app['default'] if exitcode == 0 else app['default']
return apps
@app.route("/") @app.route("/")
def index(): def index():
@ -46,19 +60,19 @@ def index():
}, },
{ {
'name': 'toggle', 'name': 'toggle',
'text_on': '🔊', 'text_on': 'file exist',
'text_off': '🔇', 'text_off': 'file gone',
'default': False, 'default': False,
'cmd_on': 'touch ~/testfile.tmp', 'cmd_on': 'touch ~/testfile.tmp',
'cmd_off': 'rm ~/testfile.tmp', 'cmd_off': 'rm ~/testfile.tmp',
'check_cmd': '~/check_if_file_exists.sh', 'state_cmd': 'test -f ~/testfile.tmp',
'cooldown': 1000, 'cooldown': 1000,
'show_cooldown': False 'show_cooldown': False
} }
] ]
} }
check_app_states(templateData) templateData['apps'] = check_app_states(templateData['apps'])
return render_template('index.html', **templateData) return render_template('index.html', **templateData)

2
static/widgets.js
View File

@ -20,8 +20,10 @@ function addApplet(config)
let a = $("<a>"); let a = $("<a>");
let obj = fn(a, cfg); let obj = fn(a, cfg);
a.addClass("block"); a.addClass("block");
a.append(obj); a.append(obj);
$("#blocks").append(a); $("#blocks").append(a);
if('cmd' in cfg) if('cmd' in cfg)