v1.1 release

Author: ChickenDevs

.github/ISSUE_TEMPLATE/bug_report.md

@@ -6,6 +6,6 @@ labels: bug
 
 **Please describe the bug:** (eg. the stop button on the webcast config page shuts down the pi instead)
 
-**Expected Behavior(if applicable):** (eg. it shuts down instead)
+**Expected Behavior(if applicable):** (eg. stop the stream)
 
-**Current Behavior(if applicable):** (eg. it should stop the broadcast)
+**Current Behavior(if applicable):** (eg. shuts down the pi)

code/services/webcast-api.service

@@ -0,0 +1,11 @@
+[Unit]
+Description=API for the Webcast Pi Manager
+Wants=network.target
+
+[Service]
+ExecStartPre=/bin/sleep 3
+ExecStart=/etc/webcast/api/app.py
+Restart=always
+
+[Install]
+WantedBy=multi-user.target

code/services/webcast-monitor.service

@@ -0,0 +1,10 @@
+[Unit]
+Description=Auto-Start on Broadcast Change
+
+[Service]
+ExecStart=/etc/webcast/webcast-monitor.py
+WorkingDirectory=/etc/webcast
+KillMode=process
+
+[Install]
+WantedBy=default.target

code/services/webcast-monitor.timer

@@ -0,0 +1,9 @@
+[Unit]
+Description=Check for changed webcast
+
+[Timer]
+OnStartupSec=1s
+OnUnitActiveSec=5m
+
+[Install]
+WantedBy=timers.target

code/webcast.service code/services/webcast.service

@@ -0,0 +1,98 @@
+#!/usr/bin/python3
+
+from flask import Flask, abort, Response, request
+app = Flask(__name__)
+
+import os
+import json
+import pam
+
+from functools import wraps
+def auth(f):
+    @wraps(f)
+    def pred(*args, **kwargs):
+        if request.authorization:
+            if pam.authenticate(request.authorization.username, request.authorization.password):
+                return f(*args, **kwargs)
+        return abort(401)
+    return pred
+
+def pi_stopped(f):
+    @wraps(f)
+    def pred(*args, **kwargs):
+        if request.method == "POST":
+            # if len(os.popen('ps -e | grep ffmpeg').read()) > 0:
+            import random
+            if random.randint(0,2) == 1:
+                return abort(404)
+        return f(*args, **kwargs)
+    return pred
+
+@app.route('/auth')
+@auth
+def authenticate():
+    return {}
+
+import psutil
+import time
+@app.route('/pi/stats')
+@auth
+def pi_stats():
+    net = psutil.net_io_counters()
+    return {'timestamp': time.time(), 'cpu': psutil.cpu_percent(), 'memory': psutil.virtual_memory().percent, 'net_sent': net.bytes_sent, 'net_recv': net.bytes_recv}
+
+
+@app.route('/webcast/stop')
+@auth
+def webcast_stop():
+    os.system('sudo pkill ffmpeg')
+    os.system('sudo systemctl stop webcast.timer')
+    output = os.popen('sudo systemctl status webcast.service').read()
+    return {'response': output}
+
+@app.route('/webcast/start')
+@auth
+def webcast_start():
+    os.system('sudo systemctl start webcast.timer')
+    output = os.popen('sudo systemctl status webcast.service').read()
+    return {'response': output}
+
+
+@app.route('/webcast/restart')
+@auth
+def webcast_restart():
+    os.system('sudo pkill ffmpeg')
+    os.system('sudo systemctl restart webcast.service')
+    output = os.popen('sudo systemctl status webcast.service').read()
+    return {'response': output}
+
+@app.route('/webcast/status')
+@auth
+def webcast_status():
+    output = os.popen('sudo systemctl status webcast.service').read()
+    return {'response': output}
+
+
+@app.route('/webcast/settings', methods=['GET', 'POST'])
+@auth
+@pi_stopped
+def webcast_settings():
+    with open('/etc/webcast/webcast.conf') as f:
+        conf = json.load(f)
+
+    if request.method == 'GET':
+        return conf
+    elif request.method == 'POST':
+        req_json = request.get_json()
+
+        for key, val in req_json.items():
+            if key in conf.keys():
+                conf[key] = val
+            else:
+                return abort(400)
+        with open('/etc/webcast/webcast.conf', 'w') as f:
+            json.dump(conf, f)
+        return conf
+
+if __name__ == "__main__":
+    app.run(host="0.0.0.0", port=5000)

code/webcast.timer code/services/webcast.timer

@@ -0,0 +1,31 @@
+#!/usr/bin/python3
+
+import json
+from os import path, system
+import requests
+
+try:
+    with open('/etc/webcast/webcast.key') as f:
+        old_key = f.read()
+except FileNotFoundError:
+    old_key = ''
+
+if not path.isfile('/etc/webcast/webcast.conf'):
+    exit(1)
+
+with open('/etc/webcast/webcast.conf') as f:
+    config = json.load(f)
+
+if config.get('auto', 'false') != 'true':
+    exit(1)
+
+url = config.get('url')
+xml = requests.get(url).text
+
+_, key = xml.split('<stream>')
+key, _ = key.split('</stream>')
+
+if key != old_key:
+    system(f'echo {key} > /etc/webcast/webcast.key')
+    system('sudo systemctl start webcast.timer')
+

code/webcast/api/app.py

@@ -1,9 +1,12 @@
 #!/bin/bash
-sudo cp code/webcast.* /etc/systemd/system
+sudo cp code/services/* /etc/systemd/system
 sudo cp -r code/webcast /etc
 sudo chown -R webcast:webcast /etc/webcast
-chmod 664 /etc/webcast/webcast.conf
-chmod 775 /etc/webcast/webcast.py
+chmod 644 /etc/webcast/webcast.conf /etc/webcast/webcast.key
+chmod 775 /etc/webcast/webcast.py /etc/webcast/webcast-monitor.py
+chmod 775 -R /etc/webcast/api
 sudo cp -r code/webcastconfig /usr/share/cockpit
 sudo systemctl daemon-reload
-sudo systemctl enable webcast.timer
+sudo systemctl enable --now webcast.timer
+sudo systemctl enable --now webcast-api.service
+sudo systemctl enable --now webcast-monitor.service