jono/sdrplay-fm-radio
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

feature/9129_error_message_display #2

Merged
jono merged 2 commits from feature/9129_error_message_display into main 2023-06-15 15:07:22 +09:30
Conversation 0 Commits 2 Files Changed 1 +19 -10
1 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit cb08de3688 - Show all commits

29
microservice.py
View File

@ -34,8 +34,9 @@ def report():
return jsonify(j) return jsonify(j)
except: except Exception as e:
return "Shat the bed", 500 error_message = {"error_message": e.message}
return jsonify(error_message), 500
@app.route('/radio/report') @app.route('/radio/report')
@ -79,7 +80,8 @@ def connect(radio):
return "", 200 return "", 200
except Exception as e: except Exception as e:
radios.pop(radio) radios.pop(radio)
return str(e), 500 error_message = {"error_message": e.message}
return jsonify(error_message), 500
return "Radio device not found", 400 return "Radio device not found", 400
@ -106,7 +108,8 @@ def disconnect(radio):
radios.pop(radio) radios.pop(radio)
return "", 200 return "", 200
else: else:
return "Radio not connected", 400 error_message = {"error_message": "Radio not connected"}
return jsonify(error_message), 400
@app.route('/radio/<radio>/configure/<frequency>') @app.route('/radio/<radio>/configure/<frequency>')
def configure(radio, frequency): def configure(radio, frequency):
@ -134,7 +137,8 @@ def configure(radio, frequency):
if radio in radios: if radio in radios:
return jsonify(radios[radio].configure(frequency)) return jsonify(radios[radio].configure(frequency))
else: else:
return "Radio not connected", 400 error_message = {"error_message": "Radio not connected"}
return jsonify(error_message), 400
@app.route('/radio/<radio>/start') @app.route('/radio/<radio>/start')
def start_stream(radio): def start_stream(radio):
@ -153,7 +157,8 @@ def start_stream(radio):
radios[radio].start_stream() radios[radio].start_stream()
return "", 200 return "", 200
except Exception as e: except Exception as e:
return str(e), 400 error_message = {"error_message": e.message}
return jsonify(error_message), 400
@app.route('/radio/<radio>/end') @app.route('/radio/<radio>/end')
def end_stream(radio): def end_stream(radio):
@ -170,7 +175,8 @@ def end_stream(radio):
radios[radio].end_stream() radios[radio].end_stream()
return "", 200 return "", 200
except Exception as e: except Exception as e:
return str(e), 400 error_message = {"error_message": e.message}
return jsonify(error_message), 400
@app.route('/radio/<radio>/info') @app.route('/radio/<radio>/info')
def radio_info(radio): def radio_info(radio):
@ -191,7 +197,8 @@ def radio_info(radio):
try: try:
return jsonify(radios[radio].get_info()) return jsonify(radios[radio].get_info())
except Exception as e: except Exception as e:
return str(e), 400 error_message = {"error_message": e.message}
return error_message, 400
tubes = {} tubes = {}
@ -222,7 +229,8 @@ def start_tuuube_stream(id):
tubes[id].start_stream() tubes[id].start_stream()
return "", 200 return "", 200
except Exception as e: except Exception as e:
return str(e), 400 error_message = {"error_message": e.message}
return jsonify(error_message), 400
@app.route('/tuuube/<id>/end') @app.route('/tuuube/<id>/end')
def end_tuuube_stream(id): def end_tuuube_stream(id):
@ -239,7 +247,8 @@ def end_tuuube_stream(id):
tubes[id].end_stream() tubes[id].end_stream()
return "", 200 return "", 200
except Exception as e: except Exception as e:
return str(e), 400 error_message = {"error_message": e.message}
return jsonify(error_message), 400