InformAction Forums

Code: Select all

diff -r -u t.org//content/flashgot/DMS.js t//content/flashgot/DMS.js
--- t.org//content/flashgot/DMS.js	2010-12-03 00:02:40.000000000 +0800
+++ t//content/flashgot/DMS.js	2010-12-19 13:37:55.391281001 +0800
@@ -2109,8 +2109,9 @@
     dm.askPath = ASK_NEVER;
   }
   
-  dm = new FlashGotDMX("Axel", "axel", '-n 4 [URL]');
+  dm = new FlashGotDMX("Axel", "axel", '-n 4 [URL] [-o FNAME] [-H Cookie:COOKIE] [-H Referer:REFERER]');
   dm.terminal = true;
+  dm.cookieSupport = true;
   dm.createJob = function(links, opType) {
     this.argsTemplate = this.argsTemplate.replace(/^-n \d+/, "-n " + this.getPref("connections", 4));  
     return this.__proto__.createJob.call(this, links , opType);

Code: Select all

diff -r -u t.org//content/flashgot/DMS.js t//content/flashgot/DMS.js
--- t.org//content/flashgot/DMS.js	2010-12-16 15:49:54.000000000 +0800
+++ t//content/flashgot/DMS.js	2010-12-21 14:05:34.023420010 +0800
@@ -212,6 +212,7 @@
       }
       FlashGotDM.dmtests[this.exeName] = dmtest;
     } else dmtest = FlashGotDM.dmtests[this.exeName];
+    if(this.customVersionCheck) this.customVersionCheck(dmtest);
     return this._supported = dmtest.indexOf(this.name + "|OK") > -1;
   }
 ,
@@ -639,7 +640,7 @@
 
 
 // *** Unix-like DMS ***********************************************************
-function FlashGotDMX(name, cmd, argsTemplate) {
+function FlashGotDMX(name, cmd, argsTemplate, versionCmd) {
   if (arguments.length != 0) {
     this._init(name);
     const cmds = FlashGotDMX.prototype.unixCmds;
@@ -647,6 +648,7 @@
     this.unixCmd = cmd;
     if (argsTemplate) this.argsTemplate = argsTemplate;
     this.cookieSupport =  /\[.*?(?:CFILE|COOKIE).*?\]/.test(this.argsTemplate);
+    if(versionCmd) FlashGotDMX.prototype.versionCmds[name] = versionCmd;
   }
   if (fg.isMac) {
     this.createJobFile = FlashGotDMMac.prototype.createJobFile;
@@ -658,6 +660,7 @@
 FlashGotDMX.prototype.terminal = false;
 FlashGotDMX.prototype.askPath = [true, true, true];
 FlashGotDMX.prototype.unixCmds = {};
+FlashGotDMX.prototype.versionCmds = {};
 FlashGotDMX.prototype.__defineGetter__("unixShell", function() {
   var f = CC["@mozilla.org/file/local;1"].createInstance(CI.nsILocalFile);
   try {
@@ -677,12 +680,16 @@
 FlashGotDMX.prototype.argsTemplate = "[URL]";
 FlashGotDMX.prototype.launchSupportTest = function(testFile) {
   const cmds = this.unixCmds;
+  const vcmds = this.versionCmds;
   var script="(\n";
 
   for (var name in cmds) {
     cmd = cmds[name];
     script += " which \"" + cmd + "\" && echo '"
       + name + "|OK' || echo '" + name+"|KO'\n"; 
+    if(vcmds[name]) {
+      script += " which \"" + cmd + "\" && " + vcmds[name] + "\n";
+    }
   }
   script += ") > '" + testFile.path + "' 2>/dev/null\n"; 
   this.performJob(script, true);
@@ -2109,10 +2116,21 @@
     dm.askPath = ASK_NEVER;
   }
   
-  dm = new FlashGotDMX("Axel", "axel", '-n 4 [URL]');
+  dm = new FlashGotDMX("Axel", "axel", '-n 4 [URL] [-o FNAME]', 'axel --version');
   dm.terminal = true;
+  dm.version = 1;
+  dm.cookieSupport = true; //must be specified, even if not supported
+  dm.customVersionCheck = function(dmtest) {
+    var versionMsg = "Axel version ";
+    var start = dmtest.indexOf(versionMsg);
+    if(start < 0) return;
+    this.version = parseFloat(dmtest.substring(start+versionMsg.length));
+  }
   dm.createJob = function(links, opType) {
     this.argsTemplate = this.argsTemplate.replace(/^-n \d+/, "-n " + this.getPref("connections", 4));  
+    if(this.version >= 2) {
+      this.argsTemplate += " [-H Cookie:COOKIE] [-H Referer:REFERER]";
+    }
     return this.__proto__.createJob.call(this, links , opType);
   };
   

Code: Select all

diff -r -u t.org//content/flashgot/DMS.js t//content/flashgot/DMS.js
--- t.org//content/flashgot/DMS.js	2010-12-20 11:59:56.000000000 +0800
+++ t//content/flashgot/DMS.js	2010-12-22 01:41:14.630743212 +0800
@@ -2114,22 +2114,20 @@
   dm.terminal = true;
   dm.createJob = function(links, opType) {
     this.argsTemplate = this.argsTemplate.replace(/\b-n \d+/, "-n " + this.getPref("connections", 4));
-    this._checkAxelVersion();
+    this._checkAxelFeatures();
     return this.__proto__.createJob.call(this, links , opType);
   };
-  dm._checkAxelVersion = function() {
+  dm._checkAxelFeatures = function() {
     const outFile = fg.tmpDir.clone();
-    outFile.append("axelVersion.txt");
-    this.performJob(this.unixCmd + " -V >'" + outFile.path + "' 2>&1", true);
-    var m = IO.readFile(outFile).match(/ (\d+\.\d)/);
-    this._axelVersion = m && parseFloat(m[1]) || 0;
-    if (this._axelVersion < 2) {
+    outFile.append("axelHelp.txt");
+    this.performJob(this.unixCmd + " -h >'" + outFile.path + "' 2>&1", true);
+    if(IO.readFile(outFile).indexOf("--header") < 0) {
       this.cookieSupport = false;
     } else {
       this.cookieSupport = true;
       this.argsTemplate = '[-H Cookie:COOKIE] [-H Referer:REFERER] ' + this.argsTemplate;
     }
-    this._checkAxelVersion = function() {};
+    this._checkAxelFeatures = function() {};
   }
   
  

Code: Select all

       this.cookieSupport = true;
       this.argsTemplate = '[-H Cookie:COOKIE] [-H Referer:REFERER] ' + this.argsTemplate;
+      this.checkCookieSupport();
     }