Changeset - 632c4f992443
[Not reviewed]
default
0 1 0
Dennis Fink - 10 years ago 2015-07-08 22:23:53

decode early
1 file changed with 2 insertions and 2 deletions:
0 comments (0 inline, 0 general)
spaceapi/sensors.py
Show inline comments
 
@@ -29,67 +29,67 @@ def set_value(data, key):
 
        subkey = get_identification_key(data)
 
    except ValueError:
 
        return abort(400)
 

	
 
    try:
 
        index = fuzzy_list_find(active_json['sensors'][key],
 
                                subkey, data[subkey])
 
        active_json['sensors'][key][index].update(data)
 
    except ValueError:
 
        active_json['sensors'][key].append(data)
 

	
 
    save_last_state()
 
    return jsonify(active_json)
 

	
 

	
 
def set_radiation_value(data):
 

	
 
    radiation_keys = [k for k in RADIATON_SUBKEYS if k in data]
 

	
 
    if not radiation_keys:
 
        return abort(400)
 

	
 
    for first_subkey in radiation_keys:
 

	
 
        try:
 
            second_subkey = get_identification_key(data[first_subkey])
 
        except ValueError:
 
            return abort(400)
 

	
 
        try:
 
            index = fuzzy_list_find(
 
                active_json['sensors']['radiation'][first_subkey],
 
                second_subkey,
 
                data[first_subkey][second_subkey])
 
            active_json['sensors']['radiation'][first_subkey][index].update(
 
                data)
 
        except ValueError:
 
            active_json['sensors']['radiaton'][first_subkey].append(data)
 

	
 
    save_last_state()
 
    return jsonify(active_json)
 

	
 

	
 
@sensors_views.route('/set/<key>', methods=['POST'])
 
@httpauth.login_required
 
def set_sensors(key):
 

	
 
    if key in ALLOWED_SENSORS_KEYS and key in active_json['sensors']:
 
        data = request.data
 
        data = request.data.decode('utf-8')
 
        try:
 
            data = json.loads(data.decode('utf-8'))
 
            data = json.loads(data)
 

	
 
            try:
 
                jsonschema.validate(data, ALLOWED_SENSORS_KEYS[key])
 
            except jsonschema.ValidationError:
 
                current_app.logger.info('Validation Error')
 
                return abort(400)
 

	
 
            if key != 'radiation':
 
                return set_value(data, key)
 
            else:
 
                return set_radiation_value(data)
 

	
 
        except ValueError:
 
            return abort(400)
 
    else:
 
        return abort(400)
0 comments (0 inline, 0 general)