Custom file name from the content

Author: janodvarko

lib/net/export/export-driver-actor.js

@@ -147,12 +147,13 @@ var ExportDriverActor = ActorClass(
 // Export Driver API
 
 function ExportDriverApi(actor) {
-  this.triggerExport = function() {
-    Trace.sysout("ExportDriverApi.triggerExport;");
+  this.triggerExport = function(options) {
+    Trace.sysout("ExportDriverApi.triggerExport; " + options.fileName, options);
 
     actor.conn.send({
       from: actor.actorID,
       type: "triggerExport",
+      fileName: options.fileName + "",
     });
   };
 

lib/net/export/export-driver-front.js

@@ -40,13 +40,14 @@ var ExportDriverFront = FrontClass(ExportDriverActor,
       packet);
 
     let type = packet.type;
+    let fileName = packet.fileName;
 
     switch (type) {
     case "clear":
       this.toolbox.networkMonitor.clear();
       break;
     case "triggerExport":
-      this.toolbox.networkMonitor.triggerExport();
+      this.toolbox.networkMonitor.triggerExport(fileName);
       break;
     }
   },

lib/net/export/network-monitor.js

@@ -133,7 +133,7 @@ const NetworkMonitor = Class(
     }
   },
 
-  exportCollectedData: function(collector) {
+  exportCollectedData: function(collector, fileName) {
     Trace.sysout("NetworkMonitor.exportCollectedData;", collector);
 
     let toFile = Options.get("netexport.autoExportToFile");
@@ -152,7 +152,7 @@ const NetworkMonitor = Class(
 
     // Store collected data into a HAR file (into the  default directory).
     if (toFile) {
-      this.exportToFile(context, jsonString, jsonp);
+      this.exportToFile(context, jsonString, jsonp, fileName);
     }
 
     // Send collected data to the server.
@@ -161,7 +161,7 @@ const NetworkMonitor = Class(
     }
   },
 
-  exportToFile: makeInfallible(function(context, jsonString, jsonp) {
+  exportToFile: makeInfallible(function(context, jsonString, jsonp, fileNameFromContent) {
     var file = ExportUtils.getDefaultFolder();
     var now = new Date();
 
@@ -195,6 +195,10 @@ const NetworkMonitor = Class(
       fileName = name;
     }
 
+    if (fileNameFromContent) {
+      fileName = fileNameFromContent;
+    }
+
     // Default file extension is zip if compressing is on
     let fileExt = jsonp ? ".harp" : ".har";
     if (Options.get("netexport.compress")) {
@@ -223,9 +227,9 @@ const NetworkMonitor = Class(
    * requests. This is used by the content 'NetExport' driver.
    * (see NetExport.triggerExport)
    */
-  triggerExport: function() {
+  triggerExport: function(fileName) {
     if (this.harCollector) {
-      this.exportCollectedData(this.harCollector);
+      this.exportCollectedData(this.harCollector, fileName);
     }
   },