CopterExpress/clever-show
1
0
Fork 0
mirror of https://github.com/CopterExpress/clever-show.git synced 2026-06-08 13:04:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added config file transfer

Browse Source
This commit is contained in:
Igor Nurullaev
2019-09-02 17:34:33 +03:00
parent 3997952e1e
commit afc26be64d
2 changed files with 45 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
Server/app_routes/file_sender.py
View File

@@ -2,6 +2,8 @@ import os
from json import loads
from flask import Blueprint, request, jsonify
from web_server_models import copters
from server import ConfigOption
import configparser
file_sender_api = Blueprint('file_sender_api', __name__, template_folder='templates')
@@ -9,8 +11,25 @@ file_sender_api = Blueprint('file_sender_api', __name__, template_folder='templa
@file_sender_api.route('/set/config', methods=['GET', 'POST'])
def set_config():
if request.method == 'POST':
f = request.files['file']
print(f, 'ip', request.args.get('ip'))
key_name = ""
ips = request.values.get('ips').split(',')
for _key_name in request.files.keys():
key_name = _key_name
request.files[key_name].save(os.path.join('files', _key_name))
sendable_config = configparser.ConfigParser()
sendable_config.read('files/' + key_name)
options = []
for section in sendable_config.sections():
for option in dict(sendable_config.items(section)):
value = sendable_config[section][option]
options.append(ConfigOption(section, option, value))
for copter in copters:
for ip in ips:
if copter.ip == ip:
copter.client.send_config_options(*options)
os.remove('files/' + key_name)
return jsonify({'m': 'ok'})
@@ -22,7 +41,8 @@ def set_aruco():
for ip in loads(request.args.get('ips')):
for copter in copters:
if copter.ip == ip:
copter.client.send_file('files/' + key_name, "/home/pi/catkin_ws/src/clever/aruco_pose/map/animation_map.txt")
copter.client.send_file('files/' + key_name,
"/home/pi/catkin_ws/src/clever/aruco_pose/map/animation_map.txt")
copter.client.send_message("service_restart", {"name": "clever"})
os.remove('files/' + key_name)
return jsonify({'m': 'ok'})

28
Server/static/js/file.js
View File

@@ -18,21 +18,37 @@ animationInput.onchange = function (e) {
}
}, 20);
};
configInput.onchange = function (e) {
sendRows(table.getSelectedRows(), configInput.files[0], 'config');
spinner.style.display = 'inline-block';
setTimeout(function () {
if (configInput.files.length > 0) {
let fileReq = new XMLHttpRequest();
let fileFormData = new FormData();
for (let i = 0; i < configInput.files.length; i++) {
fileFormData.append(configInput.files[i].name, configInput.files[i]);
}
let ips = [];
table.getSelectedRows().forEach(function (element) {
ips.push(element._row.data.ip);
});
fileFormData.append('ips', ips);
fileReq.open("POST", '/set/config', false);
fileReq.send(fileFormData);
deselectAll();
spinner.style.display = 'none';
}
}, 20);
};
arucoInput.onchange = function (e) {
spinner.style.display = 'inline-block';
setTimeout(function () {
if (arucoInput.files.length > 0) {
let fileReq = new XMLHttpRequest();
let fileFormData = new FormData();
let ips = [];
table.getSelectedRows().forEach(function (element) {
ips.push(element._row.data.ip);
});
fileFormData.append(arucoInput.files[0].name, arucoInput.files[0]);
fileReq.open("POST", '/set/aruco?ips=' + encodeURIComponent(JSON.stringify(ips)), false);
fileReq.open("POST", '/set/aruco', false);
fileReq.send(fileFormData);
deselectAll();
spinner.style.display = 'none';