diff --git a/data_embed/index.html b/data_embed/index.html index 6465aa8..f662f07 100644 --- a/data_embed/index.html +++ b/data_embed/index.html @@ -2467,7 +2467,7 @@ body{background:var(--msh-bg);color:var(--msh-text);font-family:"Inter",system-u if(window.fetchReceivedPackets)window.fetchReceivedPackets(); }); var bi=document.getElementById("buildInfo"); - if(bi){var h=bi.innerHTML; if(/Version date/i.test(h)){h=h.replace(/()[\s\S]*?(?=Version date)/i,"$1");bi.innerHTML="Board / Environment = "+h;}} + if(bi){var h=bi.innerHTML; if(/Version date/i.test(h)){h=h.replace(/()[\s\S]*?(?=Version: )/i,"$1");bi.innerHTML="Board / Environment = "+h;}} if(window.loadReceivedPackets){var _o=window.loadReceivedPackets;window.loadReceivedPackets=function(p){if(p&&p.slice){p=p.slice().reverse();}return _o(p);};} })(); diff --git a/tools/compress.py b/tools/compress.py index 9c7190c..8f6038b 100644 --- a/tools/compress.py +++ b/tools/compress.py @@ -35,16 +35,19 @@ files = [ ] string_to_find_str = "String" -string_to_find_ver = "versionDate" -with open('src/LoRa_APRS_iGate.cpp', encoding='utf-8') as cpp_file: - for line in cpp_file: - if string_to_find_str in line and string_to_find_ver in line: - start = line.find('"') + 1 - end = line.find('"', start) - if start > 0 and end > start: - versionDate = line[start:end] - break +def find_string_value(variable_name): + with open('src/LoRa_APRS_iGate.cpp', encoding='utf-8') as cpp_file: + for line in cpp_file: + if string_to_find_str in line and variable_name in line: + start = line.find('"') + 1 + end = line.find('"', start) + if start > 0 and end > start: + return line[start:end] + return "" + +versionDate = find_string_value("versionDate") +versionNumber = find_string_value("versionNumber") for src in files: out = src + ".gz" @@ -54,7 +57,7 @@ for src in files: content = f.read() if src == 'data_embed/index.html': - env_vars = env["BOARD"] + "
" + ','.join(env["BUILD_FLAGS"]).replace('-Werror -Wall,', '').replace(',-DELEGANTOTA_USE_ASYNC_WEBSERVER=1', '') + "
" + "Version date: " + versionDate + env_vars = env["BOARD"] + "
" + ','.join(env["BUILD_FLAGS"]).replace('-Werror -Wall,', '').replace(',-DELEGANTOTA_USE_ASYNC_WEBSERVER=1', '') + "
" + "Version: " + versionNumber + "
" + "Version date: " + versionDate current_date = datetime.datetime.utcnow().strftime('%Y-%m-%d %H:%M:%S') + " UTC" build_info = f'{env_vars}
Build date: {current_date}'.encode()