1 files changed, 37 insertions, 6 deletions

diff --git a/tools/file_packager.py b/tools/file_packager.py
index 64a21386..e5a9025d 100644
--- a/tools/file_packager.py
+++ b/tools/file_packager.py
@@ -46,6 +46,8 @@ CRUNCH_OUTPUT_SUFFIX = '.crn'
 
 DDS_HEADER_SIZE = 128
 
+AV_WORKAROUND = 0 # Set to 1 to randomize file order and add some padding, to work around silly av false positives
+
 data_files = []
 in_preload = False
 in_embed = False
@@ -136,8 +138,8 @@ def was_seen(name):
   return False
 data_files = filter(lambda file_: not was_seen(file_['name']), data_files)
 
-# Randomize order, to get around silly fake antivirus positivies
-random.shuffle(data_files)
+if AV_WORKAROUND:
+  random.shuffle(data_files)
 
 # Apply plugins
 for file_ in data_files:
@@ -222,6 +224,7 @@ if has_preloaded:
     file_['data_start'] = start
     curr = open(file_['localname'], 'rb').read()
     file_['data_end'] = start + len(curr)
+    if AV_WORKAROUND: curr += '\x00'
     print >> sys.stderr, 'bundling', file_['name'], file_['localname'], file_['data_start'], file_['data_end']
     start += len(curr)
     data.write(curr)
@@ -318,18 +321,46 @@ if has_preloaded:
       });
 ''' % use_data
 
-  code += '''
+  code += r'''
+    if (!Module.expectedDataFileDownloads) {
+      Module.expectedDataFileDownloads = 0;
+      Module.finishedDataFileDownloads = 0;
+    }
+    Module.expectedDataFileDownloads++;
+
     var dataFile = new XMLHttpRequest();
     dataFile.onprogress = function(event) {
+      var url = '%s';
       if (event.loaded && event.total) {
-        Module.setStatus('Downloading data... (' + event.loaded + '/' + event.total + ')');
-      } else {
+        if (!dataFile.addedTotal) {
+          dataFile.addedTotal = true;
+          if (!Module.dataFileDownloads) Module.dataFileDownloads = {};
+          Module.dataFileDownloads[url] = {
+            loaded: event.loaded,
+            total: event.total
+          };
+        } else {
+          Module.dataFileDownloads[url].loaded = event.loaded;
+        }
+        var total = 0;
+        var loaded = 0;
+        var num = 0;
+        for (var download in Module.dataFileDownloads) {
+          var data = Module.dataFileDownloads[download];
+          total += data.total;
+          loaded += data.loaded;
+          num++;
+        }
+        total = Math.ceil(total * Module.expectedDataFileDownloads/num);
+        Module.setStatus('Downloading data... (' + loaded + '/' + total + ')');
+      } else if (!Module.dataFileDownloads) {
         Module.setStatus('Downloading data...');
       }
     }
     dataFile.open('GET', '%s', true);
     dataFile.responseType = 'arraybuffer';
     dataFile.onload = function() {
+      Module.finishedDataFileDownloads++;
       var arrayBuffer = dataFile.response;
       assert(arrayBuffer, 'Loading data file failed.');
       var byteArray = new Uint8Array(arrayBuffer);
@@ -339,7 +370,7 @@ if has_preloaded:
     Module['addRunDependency']('datafile_%s');
     dataFile.send(null);
     if (Module['setStatus']) Module['setStatus']('Downloading...');
-  ''' % (os.path.basename(Compression.compressed_name(data_target) if Compression.on else data_target), use_data, data_target) # use basename because from the browser's point of view, we need to find the datafile in the same dir as the html file
+  ''' % (data_target, os.path.basename(Compression.compressed_name(data_target) if Compression.on else data_target), use_data, data_target) # use basename because from the browser's point of view, we need to find the datafile in the same dir as the html file
 
 if pre_run:
   print '''