GlcoinCore/blitz_api
1
0
Fork 0
mirror of https://github.com/fusion44/blitz_api.git synced 2026-08-13 11:52:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix: send new app status message after uninstall

Browse source 
refs #184
This commit is contained in:
fusion44 2023-02-05 18:51:18 +01:00
parent e8bb5afd08
commit aff77c8d77
No known key found for this signature in database
1 changed files with 24 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

36
app/apps/impl/raspiblitz.py
View file

@ -1,6 +1,5 @@
import asyncio
import json
import logging
import os
import random
from typing import List
@ -8,6 +7,7 @@ from typing import List
from decouple import config
from fastapi import HTTPException, status
from fastapi.encoders import jsonable_encoder
from loguru import logger as logging
from app.api.utils import SSE, broadcast_sse_msg, call_sudo_script, parse_key_value_text
from app.apps.impl.apps_base import AppsBase
@ -222,17 +222,17 @@ class RaspiBlitzApps(AppsBase):
# logging to console
if stdout:
logging.info(f"[stdout]\n{stdout.decode()}")
logging.debug(f"[stdout]\n{stdout.decode()}")
else:
logging.error(f"NO [stdout]")
logging.debug(f"NO [stdout]")
if stderr:
logging.error(f"[stderr]\n{stderr.decode()}")
logging.debug(f"[stderr]\n{stderr.decode()}")
else:
logging.error(f"NO [stderr]")
logging.debug(f"NO [stderr]")
# create log file
logFileName = f"/var/cache/raspiblitz/temp/install.{app_id}.log"
logging.info(f"WRITING LONG FILE: {logFileName}")
logging.info(f"WRITING LOG FILE: {logFileName}")
with open(logFileName, "w", encoding="utf-8") as f:
f.write(f"API triggered script: {cmd}\n")
f.write(f"###### STDOUT #######\n")
@ -243,10 +243,10 @@ class RaspiBlitzApps(AppsBase):
f.write(stderr.decode())
# sending final feedback event
logging.info(f"SENDING RESULT EVENT ...")
logging.debug(f"SENDING RESULT EVENT ...")
if stdout:
stdoutData = parse_key_value_text(stdout.decode())
logging.info(f"PARSED STDOUT DATA: {stdoutData}")
logging.debug(f"PARSED STDOUT DATA: {stdoutData}")
# when there is a defined error message (if multiple it wil lbe the last one)
if "error" in stdoutData:
logging.error(
@ -296,7 +296,7 @@ class RaspiBlitzApps(AppsBase):
# if install was running
elif mode == "on":
if updatedAppData["installed"]:
logging.info(f"WIN - install was effective")
logging.info(f"WIN - install of {app_id} was effective")
await broadcast_sse_msg(
SSE.INSTALL_APP,
{
@ -309,9 +309,9 @@ class RaspiBlitzApps(AppsBase):
},
)
else:
logging.error(f"FAIL - was not installed")
logging.warning(f"DEBUG - updatedAppData: {updatedAppData}")
logging.warning(f"DEBUG - params: {params}")
logging.error(f"FAIL - {app_id} was not installed")
logging.debug(f"updatedAppData: {updatedAppData}")
logging.debug(f"params: {params}")
await broadcast_sse_msg(
SSE.INSTALL_APP,
{
@ -321,3 +321,15 @@ class RaspiBlitzApps(AppsBase):
"details": "install was not effective",
},
)
elif mode == "off":
await broadcast_sse_msg(SSE.INSTALLED_APP_STATUS, [updatedAppData])
if not updatedAppData["installed"]:
logging.info(f"WIN - uninstall of {app_id} was effective")
return
logging.error(f"FAIL - {app_id} was not uninstalled")
logging.debug(f"updatedAppData: {updatedAppData}")
logging.debug(f"params: {params}")
return