oci/zeronet
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix js merging

Browse source
This commit is contained in:
shortcutme 2019-04-08 18:12:43 +02:00
parent 5642d0aae6
commit 6764a7ad2f
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/Debug/DebugMedia.py
View file

@ -66,12 +66,13 @@ def merge(merged_path):
if not changed: if not changed:
return # Assets not changed, nothing to do return # Assets not changed, nothing to do
old_parts = {}
if os.path.isfile(merged_path): # Find old parts to avoid unncessary recompile if os.path.isfile(merged_path): # Find old parts to avoid unncessary recompile
merged_old = open(merged_path, "rb").read() merged_old = open(merged_path, "rb").read()
old_parts = {}
for match in re.findall(rb"(/\* ---- (.*?) ---- \*/(.*?)(?=/\* ----|$))", merged_old, re.DOTALL): for match in re.findall(rb"(/\* ---- (.*?) ---- \*/(.*?)(?=/\* ----|$))", merged_old, re.DOTALL):
old_parts[match[1]] = match[2].strip(rb"\n\r") old_parts[match[1].decode()] = match[2].strip(rb"\n\r")
logging.debug("Merging %s (changed: %s, old parts: %s)" % (merged_path, changed, len(old_parts)))
# Merge files # Merge files
parts = [] parts = []
s_total = time.time() s_total = time.time()
@ -106,9 +107,10 @@ def merge(merged_path):
else: # Put error message in place of source code else: # Put error message in place of source code
error = out error = out
logging.error("%s Compile error: %s" % (file_path, error)) logging.error("%s Compile error: %s" % (file_path, error))
error_escaped = re.escape(error).replace(b"\n", b"\\n").replace(br"\\n", br"\n")
parts.append( parts.append(
b"alert('%s compile error: %s');" % b"alert('%s compile error: %s');" %
(file_path, re.escape(error).replace(b"\n", b"\\n").replace(r"\\n", r"\n")) (file_path.encode(), error_escaped)
) )
else: # Not changed use the old_part else: # Not changed use the old_part
parts.append(old_parts[file_path.replace(config.data_dir, "")]) parts.append(old_parts[file_path.replace(config.data_dir, "")])