Add export sort method

Add export sort method

Author: tindy2013

pref.ini

@@ -1,5 +1,4 @@
-[preference]
-
+[common]
 ;Excluded remarks, nodes with these remarks will be ignored
 ;one remark per line, index starts at 0
 exclude_remarks0=剩余流量
@@ -11,6 +10,7 @@ exclude_remarks3=
 ;one remark per line, index starts at 0
 ;include_remarks0=香港
 
+[advanced]
 ;SS clients used in Speedtest, default is ss-csharp
 ;recognized value: ss-libev, ss-csharp
 preferred_ss_client=ss-libev
@@ -23,17 +23,23 @@ preferred_ssr_client=ssr-libev
 ;recognized value: tcping, googleping, bingping, gstaticping
 preferred_ping_method=tcping
 
-;Speedtest method, default is file
-;recognized value: file, fast.com
-preferred_test_method=file
+;Override any port in configurations and use the following one
+;!!!DO NOT USE THIS UNLESS YOU ARE VERY SURE OF WHAT YOU ARE DOING!!!
+;uncomment to enable this feature
+;override_conf_port=8080
 
 ;Multi-thread speedtest thread count
 thread_count=4
 
+[export]
 ;Export result with MaxSpeed
 export_with_maxspeed=true
 
-;Override any port in configurations and use the following one
-;!!!DO NOT USE THIS UNLESS YOU ARE VERY SURE OF WHAT YOU ARE DOING!!!
-;uncomment to enable this feature
-;override_conf_port=8080
+;Result picture sort method, default is speed
+;recognized value: none, speed, rspeed, ping, rping
+export_sort_method=none
+
+[deprecated]
+;Speedtest method, default is file
+;recognized value: file, fast.com
+preferred_test_method=file

speedtest.bat

@@ -542,9 +542,11 @@ set speed=!speed!B
 goto :eof
 
 :exportresult
+if not defined export_sort_method set export_sort_method=speed
 echo !logfile! | tools\misc\speedtestutil export tools\misc\util.js !export_with_maxspeed!>"!logpath!.htm"
 cd results
-..\tools\misc\phantomjs ..\tools\misc\simplerender.js "!logname!.htm" "!logname!.png"
+rem ..\tools\misc\phantomjs ..\tools\misc\simplerender.js "!logname!.htm" "!logname!.png"
+..\tools\misc\phantomjs ..\tools\misc\render_alt.js "!logname!.htm" "!logname!.png" !export_sort_method!
 cd ..
 goto :eof
 

tools/misc/render_alt.js

@@ -0,0 +1,27 @@
+var page = require('webpage').create(),
+    system = require('system'),
+    address, output;
+
+if (system.args.length < 3 || system.args.length > 4) {
+    console.log('Usage: render_alt.js URL filename [type]');
+    phantom.exit(1);
+} else {
+    address = system.args[1];
+    output = system.args[2];
+	if(system.args.length == 4) {type = system.args[3];} else {type = "speed";}
+	page.viewportSize = {width:1,height:1};
+	page.open(address, function (status) {
+		if (status !== 'success') {
+		console.log('Unable to load the address!');
+		phantom.exit(1);
+		} else {
+			window.setTimeout(function () {
+				page.evaluate(function (t) {runsort(t);},type);
+				table=page.evaluate(function () {return document.getElementById("table");});
+				page.clipRect = {width:table.clientWidth,height:table.clientHeight,top:table.clientTop,left:table.clientLeft};
+				page.render(output);
+				phantom.exit();
+			}, 200);
+		}
+    });
+}

tools/misc/util.js

@@ -119,7 +119,7 @@ function loadevent() {
 		firststr+="<td onclick='clickevent(speedCompare);'>MaxSpeed</td>"
 		orderpos--;
 	}
-	orderByName("table",orderpos,speedCompare);
+	//orderByName("table",orderpos,speedCompare);
 	drawcolor();
 	addRow(0,firststr,"first");
 	addRow(-1,traffic,"traffic");
@@ -137,4 +137,23 @@ function clickevent(comparer) {
 	addRow(0,firstrow,"first");
 	addRow(-1,traffic,"traffic");
 	addRow(-1,gentime,"gentime");
-}
+}
+
+function runsort(type) {
+	var gentime=saveAndRemoveRow("gentime");
+	var traffic=saveAndRemoveRow("traffic");
+	var firstrow=saveAndRemoveRow("first");
+	if(type=="none") return 0;
+	var orderpos=table.rows[0].cells.length-1;
+	if(table.rows[0].cells.length==6) orderpos--;
+	if(type=="rspeed") orderByName("table",orderpos,speedCompare);
+	else if(type=="ping") orderpos--;
+	else if(type=="rping") {
+		orderpos--;
+		orderByName("table",orderpos,standardCompare);
+	}
+	orderByName("table",orderpos,speedCompare);
+	addRow(0,firstrow,"first");
+	addRow(-1,traffic,"traffic");
+	addRow(-1,gentime,"gentime");
+}