build

.gitlab-ci.yml

@@ -8,5 +8,6 @@ build-job:       # This job runs in the build stage, which runs first.
     - column=":"
     - echo "${flow_id}"
     - curl -X POST https://kestra.sectorq.eu/api/v1/executions/webhook/jaydee/ansible-all/${flow_id} -d '{"tag":["mqtt-srv"],"target":["morefine.home.lan"]}' -H "Content-Type${column} application/json"
+    - rm -rf /home/gitlab-runner/builds/1fLwHSKm2/0/jaydee/mqtt_srv.tmp/.gitlab-runner.ext.conf
   rules:
     - if: '$CI_COMMIT_MESSAGE =~ /build/'

mqtt_srv.py

@@ -691,9 +691,26 @@ def on_message(client, userdata, msg):
             else:
                 writeLog("Linux Vol Control")
                 if myObj['target'] == "start":
-                    myCmd =f'sudo XDG_RUNTIME_DIR=/run/user/1000 -u jd amixer set Master 20%'
+                    writeLog("Getting sound status")
+                    #myCmd = "sudo XDG_RUNTIME_DIR=/run/user/1000 -u jd amixer sget Master | awk -F'[][]' '/Left:/ { print $2 }'"
+                    myCmd = "sudo XDG_RUNTIME_DIR=/run/user/1000 -u jd amixer sget Master"
+                    writeLog(myCmd)
+                    output = subprocess.Popen(myCmd, shell=True)
+                    cmd = """sudo XDG_RUNTIME_DIR=/run/user/1000 -u jd amixer sget Master | awk -F'[][]' '/Left:/ { print $2 }'"""
+
+                    result = subprocess.run(
+                        cmd,
+                        shell=True,
+                        capture_output=True,
+                        text=True
+                    )
+                    os.environ["MQTT_SRV_CUR_VOLUME"] = result.stdout.strip()
+                    writeLog(f"Status of volume {os.environ["MQTT_SRV_CUR_VOLUME"]}")
+                    myCmd = f'sudo XDG_RUNTIME_DIR=/run/user/1000 -u jd amixer set Master 20%'
+                    
+
                 else:
-                    myCmd =f'sudo XDG_RUNTIME_DIR=/run/user/1000 -u jd amixer set Master 100%'
+                    myCmd =f'sudo XDG_RUNTIME_DIR=/run/user/1000 -u jd amixer set Master {os.environ["MQTT_SRV_CUR_VOLUME"] }'
                 # try:
                 #     #percent = 20
                 #     #output = subprocess.run(["pactl", "set-sink-volume", "@DEFAULT_SINK@", f"{percent}%"], check=True)
@@ -1278,8 +1295,8 @@ else:
                         payload[m] = 0
                 client.publish( "home-assistant/" + host + "/hwstats", payload=json.dumps(payload), qos=0, retain=True)     
             
-        writeLog(FILE_TIMESTAMP)
+        # writeLog(FILE_TIMESTAMP)
-        writeLog(mtime)
+        # writeLog(mtime)
         if FILE_TIMESTAMP != mtime:
             writeLog("Script updated ! restarting...")
             #os.execv(sys.executable, ['python'] + sys.argv)