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

Rev431, Define coveralls rcfile, Escape shell parameters

Browse source
This commit is contained in:
HelloZeroNet 2015-09-21 20:09:32 +02:00
parent 47dbdc0850
commit 54c367cac8
5 changed files with 41 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/Debug/DebugMedia.py
View file

@ -5,6 +5,7 @@ import logging
import time
from Config import config
from util import utils
# Find files with extension in path
@ -22,7 +23,7 @@ def findCoffeescriptCompiler():
coffeescript_compiler = None
try:
import distutils.spawn
coffeescript_compiler = distutils.spawn.find_executable("coffee") + " --no-header -p"
coffeescript_compiler = utils.shellquote(distutils.spawn.find_executable("coffee")) + " --no-header -p"
except:
pass
if coffeescript_compiler:
@ -72,18 +73,26 @@ def merge(merged_path):
if not config.coffeescript_compiler:
logging.error("No coffeescript compiler definied, skipping compiling %s" % merged_path)
return False # No coffeescript compiler, skip this file
# Replace / with os separators and escape it
file_path_escaped = utils.shellquote(os.path.join(*file_path.split("/")))
if "%s" in config.coffeescript_compiler: # Replace %s with coffeescript file
command = config.coffeescript_compiler % os.path.join(*file_path.split("/"))
command = config.coffeescript_compiler % file_path_escaped
else: # Put coffeescript file to end
command = config.coffeescript_compiler + " " + os.path.join(*file_path.split("/"))
command = config.coffeescript_compiler + " " + file_path_escaped
# Start compiling
s = time.time()
compiler = subprocess.Popen(command, shell=True, stderr=subprocess.STDOUT, stdout=subprocess.PIPE)
out = compiler.stdout.read().decode("utf8")
compiler.wait()
logging.debug("Running: %s (Done in %.2fs)" % (command, time.time() - s))
if out and out.startswith("("):
# Check errors
if out and out.startswith("("): # No error found
parts.append(out)
else:
else: # Put error message in place of source code
error = out
logging.error("%s Compile error: %s" % (file_path, error))
parts.append(
@ -108,4 +117,4 @@ if __name__ == "__main__":
logging.getLogger().setLevel(logging.DEBUG)
os.chdir("..")
config.coffeescript_compiler = r'type "%s" | tools\coffee-node\bin\node.exe tools\coffee-node\bin\coffee --no-header -s -p'
merge("data/12Hw8rTgzrNo4DSh2AkqwPRqDyTticwJyH/js/all.js")
merge("data/12Hw8rTgzrNo4DSh2AkqwPRqDyTticwJyH/js/all.js")