handle case if device config doesnt exists

This commit is contained in:
DasMoorhuhn 2024-07-07 11:53:06 +02:00
parent d7b3303e50
commit 7415bb8112
4 changed files with 18 additions and 3 deletions

2
.idea/misc.xml generated
View File

@ -3,5 +3,5 @@
<component name="Black"> <component name="Black">
<option name="sdkName" value="Python 3.12 (autopicture-v3)" /> <option name="sdkName" value="Python 3.12 (autopicture-v3)" />
</component> </component>
<component name="ProjectRootManager" version="2" project-jdk-name="Python 3.10" project-jdk-type="Python SDK" /> <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.12 (autopicture-v3)" project-jdk-type="Python SDK" />
</project> </project>

View File

@ -30,8 +30,8 @@ def log_to_json(devices):
"battery_percent": data_obj.battery_percent, "battery_percent": data_obj.battery_percent,
"battery_volt": data_obj.battery_volt, "battery_volt": data_obj.battery_volt,
"rssi": dev.rssi, "rssi": dev.rssi,
"name": from_config.name, "name": from_config.name if from_config is not None else "Unknown",
"room": from_config.room "room": from_config.room if from_config is not None else "Unknown"
} }
data.append(measurements) data.append(measurements)

View File

@ -35,12 +35,26 @@ if [ "$?" != 0 ]; then
exit 1 exit 1
fi fi
check_for_devices_config() {
if [ ! -f devices.yml ]; then
touch devices.yml
echo 'devices:
- mac: A4:C1:38:00:00:00
name: "my_room"
room: "my_room"' >> devices.yml
fi
}
docker_run() { docker_run() {
sudo killall -9 bluetoothd > /dev/null 2>&1 sudo killall -9 bluetoothd > /dev/null 2>&1
echo Killing old container... echo Killing old container...
docker stop $CONTAINER_NAME > /dev/null 2>&1 docker stop $CONTAINER_NAME > /dev/null 2>&1
docker container rm $CONTAINER_NAME > /dev/null 2>&1 docker container rm $CONTAINER_NAME > /dev/null 2>&1
check_for_devices_config
COMMAND="docker run $BACKGROUND" COMMAND="docker run $BACKGROUND"
COMMAND="$COMMAND --cap-add=SYS_ADMIN" COMMAND="$COMMAND --cap-add=SYS_ADMIN"
COMMAND="$COMMAND --cap-add=NET_ADMIN" COMMAND="$COMMAND --cap-add=NET_ADMIN"
@ -49,6 +63,7 @@ docker_run() {
COMMAND="$COMMAND --restart=on-failure" COMMAND="$COMMAND --restart=on-failure"
COMMAND="$COMMAND --volume=/var/run/dbus/:/var/run/dbus/" COMMAND="$COMMAND --volume=/var/run/dbus/:/var/run/dbus/"
COMMAND="$COMMAND --volume=$VOLUME:/src/data" COMMAND="$COMMAND --volume=$VOLUME:/src/data"
COMMAND="$COMMAND --volume=$PWD/devices.yml:/src/devices.yml"
if [ "$INTERACTIVE" = true ]; then if [ "$INTERACTIVE" = true ]; then
COMMAND="$COMMAND --interactive" COMMAND="$COMMAND --interactive"