diff --git a/plugin/att/trace_view.py b/plugin/att/trace_view.py index 1e9ae2cec1..8611d028e1 100755 --- a/plugin/att/trace_view.py +++ b/plugin/att/trace_view.py @@ -21,10 +21,11 @@ from http import HTTPStatus from io import BytesIO from drawing import Readable, GeneratePIC from copy import deepcopy +from shutil import copy2 +from glob import glob JSON_GLOBAL_DICTIONARY = {} - def get_ip(): s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) s.settimeout(0) @@ -259,11 +260,11 @@ def view_trace( os.makedirs(trace_instance_name + "_ui/", exist_ok=True) JSON_GLOBAL_DICTIONARY["live.json"] = Readable({"live": 0}) - os.system( - "cp " - + os.path.join(os.path.abspath(os.path.dirname(__file__)), "ui") - + "/* " + trace_instance_name + "_ui/" - ) + + ui_dir_files = glob(os.path.join(os.path.abspath(os.path.dirname(__file__)), "ui")+"/*") + for f in ui_dir_files: + copy2(f, trace_instance_name + "_ui/") + for k, v in JSON_GLOBAL_DICTIONARY.items(): with open(os.path.join(trace_instance_name+"_ui", k), "w" if ".json" in k else "wb") as f: f.write(v.read()) diff --git a/plugin/att/ui/index.html b/plugin/att/ui/index.html index 9f78232427..7a33992fbb 100644 --- a/plugin/att/ui/index.html +++ b/plugin/att/ui/index.html @@ -460,7 +460,7 @@ let L2FirstToken = {} let L2InstTime = {} insts.forEach((ins, i) => { - const line_num = ins[4] + const line_num = ins[4]-1 if (!(line_num in L2FirstToken)) { L2FirstToken[line_num] = ins[0] }