diff --git a/app.py b/app.py
index 5374235..d3b8189 100755
--- a/app.py
+++ b/app.py
@@ -237,8 +237,8 @@ def HTTP_upload(file_dict, host_local, port):
# ~ response = requests.post(url, files=files, headers=http_headers, verify=CAfile)
response = requests.post(url, data=data, headers=http_headers, verify=CAfile)
# ~ response = requests.post(url, data=data, headers=http_headers, verify=CAfile)
- if debug:
- print(response.text)
+ # ~ if debug:
+ # ~ print(response.text)
transferred_mb = len(data) / 1024 / 1024
current_upload["transferred_size"] += round(transferred_mb)
current_upload["transferred_percent"] += round(100 / current_upload["total_size"] * transferred_mb)
@@ -534,9 +534,9 @@ def send_pilpil_command(host, arg0, arg1, arg2):
# Send request and get data response
data = send_HTTP_request(host, port_, time_out=3, request_=HTTP_request)
- if debug:
- if data:
- print(str(host) + " - data length:" + str(len(data)) + " : " + str(data))
+ # ~ if debug:
+ # ~ if data:
+ # ~ print(str(host) + " - data length:" + str(len(data)) + " : " + str(data))
if not data:
print("No data was received.")
return 0
@@ -672,4 +672,5 @@ def action(host, arg0, arg1, arg2):
if __name__ == '__main__':
# ~ app.run()
- serve(app, host='127.0.0.1', port=8080)
+ HTTP_url_scheme = "http"
+ serve(app, host='127.0.0.1', port=5000, url_scheme=HTTP_url_scheme)
diff --git a/serve_app.sh b/serve_app.sh
new file mode 100755
index 0000000..c45ac5c
--- /dev/null
+++ b/serve_app.sh
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+cd "$(dirname "$0")"
+
+waitress-serve --listen=127.0.0.1:5000 app:app
diff --git a/static/script.js b/static/script.js
index 65b2f49..9dbc548 100644
--- a/static/script.js
+++ b/static/script.js
@@ -71,11 +71,9 @@ async function update_sort_VLC_playlist(host) {
currentUser.freeze_timeline_update = 0;
}
function get_child_by_id(id, parent_element, depth=0){
- // TODO : fix this ofc
Array.from(parent_element.children).forEach(function(child){
if (depth){
if (child.children[0].id == id){
- //~ console.log(child.children[0]);
result = child.children[0];
}
} else if (child.id == id) {
@@ -401,23 +399,21 @@ function update_rssi_indicator(infos_array_element){
}
-function update_local_filelist(infos_array) {
- // TODO : Is this useful ?
- // TODO : Get real media length
- let html_table = "" +
- "" +
- "| " + t9n[LOCALE].filename + " | " +
- "" + t9n[LOCALE].duration + " | " +
- "
";
- infos_array.forEach(function(element){
- html_table += "" +
- "| " + element + " | " +
- "" + "00:00" + " | " +
- "
" ;
- });
- html_table += "
";
- return html_table;
-}
+//~ function update_local_filelist(infos_array) {
+ //~ let html_table = "" +
+ //~ "" +
+ //~ "| " + t9n[LOCALE].filename + " | " +
+ //~ "" + t9n[LOCALE].duration + " | " +
+ //~ "
";
+ //~ infos_array.forEach(function(element){
+ //~ html_table += "" +
+ //~ "| " + element + " | " +
+ //~ "" + "00:00" + " | " +
+ //~ "
" ;
+ //~ });
+ //~ html_table += "
";
+ //~ return html_table;
+//~ }
function update_host_list(infos_array){
@@ -487,24 +483,24 @@ function display_upload_status(command) {
}
-function destroy_upload_status() {
- let container_element = document.getElementById(currentUser.last_ul_host);
- let ul_cont_exists = document.getElementById("ul_dialog_cont_" + currentUser.last_ul_host);
+function destroy_upload_status(host) {
+ let container_element = document.getElementById(host);
+ let ul_cont_exists = document.getElementById("ul_dialog_cont_" + host);
if ( ul_cont_exists != undefined) {
container_element.removeChild(ul_cont_exists);
- clearTimeout(currentUser["ul_timeout_" + currentUser.last_ul_host]);
+ clearTimeout(currentUser["ul_timeout_" + host]);
}
}
async function update_upload_status(current_upload) {
- console.log("Updating upload status...");
+ //~ console.log("Updating upload status...");
//~ console.log(current_upload);
if (current_upload.status == -1){
- console.log("Destroying dialog..." + current_upload.host);
- destroy_upload_status();
+ console.log("Destroying dialog..." + currentUser.last_ul_host);
+ destroy_upload_status(currentUser.last_ul_host);
} else if (current_upload.status) {
- console.log("Filling dialog...");
+ //~ console.log("Filling dialog...");
document.getElementById("ul_dialog_cont_" + current_upload.host).style.display = "block";
// Fill table
document.getElementById("ul_status_progress_cnt_" + current_upload.host).innerHTML = current_upload.progress + " / " + current_upload.total_count + t9n[LOCALE].upload_sent_count_msg;
@@ -518,7 +514,7 @@ async function update_upload_status(current_upload) {
}
currentUser["ul_timeout_" + current_upload.host] = setTimeout(send_ajax_cmd, 3000, `/sync/${current_upload.host}/status`);
} else {
- console.log("requesting status data");
+ //~ console.log("requesting status data");
currentUser.last_ul_host = current_upload.host;
send_ajax_cmd(`/sync/${current_upload.host}/status`);
await sleep(500);
@@ -545,7 +541,7 @@ function parse_result(command, infos_array) {
} else if (command == "/browse_local") {
// Display local media files in a table
- document.getElementById("filelist").innerHTML = update_local_filelist(infos_array);
+ //~ document.getElementById("filelist").innerHTML = update_local_filelist(infos_array);
} else if (command == "/all/rssi") {
// RSSI strength indicator
@@ -558,15 +554,15 @@ function parse_result(command, infos_array) {
} else if (command.indexOf("/sync/") > -1) {
if (command.indexOf("/status") > -1 ) {
- console.log("updating infos...");
- console.log(infos_array);
+ //~ console.log("updating infos...");
+ //~ console.log(infos_array);
update_upload_status(infos_array);
} else if (command.indexOf("/stop") > -1 ) {
- console.log("stopping upload...");
- console.log(infos_array);
- destroy_upload_status();
+ //~ console.log("stopping upload...");
+ //~ console.log(infos_array);
+ //~ destroy_upload_status();
} else {
- console.log("displaying status");
+ //~ console.log("displaying status");
//~ console.log(infos_array);
//~ if (infos_array.total_count) {
//~ display_upload_status(infos_array)
@@ -650,7 +646,6 @@ addEventListener("DOMContentLoaded", function() {
clickedButton.value = clickedButton.value.replace('/0/','/1/');
}
}
-
// AJAX request
let request = new XMLHttpRequest();
if ( command == "/scan") {
diff --git a/static/style.css b/static/style.css
index 151db81..b166549 100644
--- a/static/style.css
+++ b/static/style.css
@@ -66,7 +66,7 @@ tr:nth-child(2n+1) {background-color: #888;}
}
.client_container [id^="ul_dialog_cont_"] {
- display:none;
+ display: none;
}
.client_container .upload_dialog button {