Even more work on cyberware

src/nightserver.py

@@ -130,8 +130,18 @@ def setFitness():
 
 # Cyberware management
 cyberware = []
-newCyberwareTemplate = { "uuid": None, "name": None, "hotpluggable": False, "lastMalfunction": None, "frontendAwknowledge": False, "canSet": [], "battery": None }
+newCyberwareTemplate = { "uuid": None, "name": None, "hotpluggable": False, "lastMalfunction": None, "canSet": [], "battery": None, "messages": [] }
-
+# Messages: { Title, Message, Progress }
+#  Title, Message, and Progress are all technically optional. It's up to the frontend to make heads or tails of what's happening.
+#  Typically, if Progress == None: No progress bar, will show up in the Top Message section on NightUI
+#             if Message  == None: No message
+#             if Title    == None: No title.
+#
+#            Typical layout for such messages:
+#             _____________________________________________________
+#            | ICON   This is a title!
+#            | ICON   This is a message!
+#            | ICON   [=======                                    ]
 
 # This makes the system aware of a new piece of hardware.
 # While, for the most part, not required due to the design of this project,
@@ -181,20 +191,40 @@ def removeCyberware():
 		return 'Incorrect usage.\nUsage: { uuid: STRING }\n', 400
 	return 'UUID Invalid\n', 400
 
-# Returns: { uuid: STRING, name: STRING, hotpluggable: BOOL, lastMalfunction: STRING, frontendAwknowledge: BOOL }
+# Returns: { name: STRING, hotpluggable: STRING lastMalfunction: STRING, battery: INT, messages: ARRAY }
 # uuid:               Unique identifier of the hardware
 # name:               Human-readable name
 # hotpluggable:       Hardware can be removed during runtime.
 # lastMalfunction:    A string with information on the last malfunction.
-# frontendAwknowlege: A tool for the frontend to keep track of whether it's aware of the hardware.
-# TODO: If this method is to exist, it needs to return everything WITHOUT UUID's.
 @app.route('/api/cyberware')
 def getCyberware():
-	return 'Not implemented', 501
+	returnArr = []
 
-	#if not authenticate(json['uuid'], '/api/cyberware'):
+	for c in cyberware:
-	#		return 'Forbidden.', 403
+		returnArr.append({ 'name': c['name'], 'hotpluggable': c['hotpluggable'], 'lastMalfunction': c['lastMalfunction'], 'battery': c['battery'] })
-	#return jsonify(cyberware)
+
+	resetMalfunctions()
+
+	return jsonify(returnArr), 200
+
+@app.route('/api/cyberware/malfunctions')
+def getCyberwareMalfunctions():
+	returnArr = []
+
+	for c in cyberware:
+		if c['lastMalfunction'] != None:
+			returnArr.append({ 'name': c['name'], 'lastMalfunction': c['lastMalfunction'] })
+
+	return jsonify(returnArr), 200
+
+@app.route('/api/cyberware/messages')
+def getCyberwareMessages():
+	returnArr = []
+
+	for c in cyberware:
+		if c['messages'] != None:
+			returnArr.append({ 'name': c['name'], 'messages': c['messages'] })
+	return jsonify(returnArr), 200
 
 @app.route('/api/cyberware/get', methods=['POST'])
 def getCyberwareSpecific():
@@ -245,6 +275,11 @@ def setCyberwareBattery():
 		return 'Incorrect usage.\nUsage: { battery: INT, uuid: STRING }\n', 400
 	return 'UUID Invalid\n', 400
 
+@app.route('/api/cyberware/reset_malfunction')
+def resetAllCyberwareMalfunction():
+	for c in cyberware:
+		c['lastMalfunction'] = None
+
 # Arguments { uuid: STRING }
 @app.route('/api/cyberware/reset_malfunction', methods=['POST'])
 def resetCyberwareMalfunction():