diff options
| -rw-r--r-- | tools/crunch-worker.js | 1 | ||||
| -rw-r--r-- | tools/file_packager.py | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/tools/crunch-worker.js b/tools/crunch-worker.js index bc7eb95d..7bc63870 100644 --- a/tools/crunch-worker.js +++ b/tools/crunch-worker.js @@ -107,6 +107,7 @@ onmessage = function(msg) { var start = Date.now(); var data = deCrunch(new Uint8Array(msg.data.data), msg.data.filename); postMessage({ + filename: msg.data.filename, data: data, callbackID: msg.data.callbackID, time: Date.now() - start diff --git a/tools/file_packager.py b/tools/file_packager.py index 812def9b..a936ffd3 100644 --- a/tools/file_packager.py +++ b/tools/file_packager.py @@ -144,7 +144,7 @@ if crunch: var decrunchCallbacks = []; decrunchWorker.onmessage = function(msg) { decrunchCallbacks[msg.data.callbackID](msg.data.data); - console.log('decrunched in ' + msg.data.time + ' ms'); + console.log('decrunched ' + msg.data.filename + ' in ' + msg.data.time + ' ms, ' + msg.data.data.length + ' bytes'); decrunchCallbacks[msg.data.callbackID] = null; }; function requestDecrunch(filename, data, callback) { @@ -161,6 +161,7 @@ if crunch: if file_['name'].endswith(CRUNCH_INPUT_SUFFIX): # Do not crunch if crunched version exists and is more recent than dds source crunch_name = unsuffixed(file_['name']) + CRUNCH_OUTPUT_SUFFIX + file_['localname'] = crunch_name try: crunch_time = os.stat(crunch_name).st_mtime dds_time = os.stat(file_['name']).st_mtime @@ -187,7 +188,6 @@ if crunch: c.write(open(file_['name'], 'rb').read()[:DDS_HEADER_SIZE]) c.write(crunched) c.close() - file_['localname'] = crunch_name # Set up folders partial_dirs = [] @@ -210,6 +210,7 @@ if has_preloaded: file_['data_start'] = start curr = open(file_['localname'], 'rb').read() file_['data_end'] = start + len(curr) + print >> sys.stderr, 'bundling', file_['name'], file_['localname'], file_['data_start'], file_['data_end'] start += len(curr) data.write(curr) data.close() |