From 5290b2092f2d2fc1397bb28b4c11219f13957f68 Mon Sep 17 00:00:00 2001
From: Binux <17175297.hk@gmail.com>
Date: Wed, 29 Jan 2014 21:06:43 +0800
Subject: [PATCH] add peers tab

---
 css/main.css     |  7 ++++++-
 index.html       |  8 ++++++++
 js/aria2.js      | 16 +++++++++++++++-
 js/yaaw.js       | 41 ++++++++++++++++++++++++++++++++++++++++-
 offline.appcache |  2 +-
 5 files changed, 70 insertions(+), 4 deletions(-)

diff --git a/css/main.css b/css/main.css
index f3265b0..16ce213 100644
--- a/css/main.css
+++ b/css/main.css
@@ -328,7 +328,8 @@
 }
 #ib-status,
 #ib-files,
-#ib-options {
+#ib-options,
+#ib-peers {
     position: relative;
     margin: 18px 0;
 }
@@ -380,6 +381,10 @@
 #ib-options li > * {
     float: left;
 }
+#ib-peers .ip_port {
+    display: inline-block;
+    width: 250px;
+}
 
 /* task-contextmenu */
 
diff --git a/index.html b/index.html
index 32d0c0c..1f958f8 100644
--- a/index.html
+++ b/index.html
@@ -305,11 +305,13 @@ <h2>Settings</h2>
             <li class="active"><a href="#ib-status" data-toggle="tab">Status</a></li>
             <li><a href="#ib-files" data-toggle="tab">Files</a></li>
             <li><a id="ib-options-a" href="#ib-options" data-toggle="tab">Options</a></li>
+            <li><a id="ib-peers-a" class="hide" style="display:none;" href="#ib-peers" data-toggle="tab">Peers</a></li>
           </ul>
           <div class="tab-content">
             <div class="tab-pane active" id="ib-status"> </div>
             <div class="tab-pane" id="ib-files"> </div>
             <div class="tab-pane" id="ib-options"> </div>
+            <div class="tab-pane hide" style="display:none;" id="ib-peers"> </div>
           </div>
         </div>
       </div>
@@ -359,6 +361,12 @@ <h2>Settings</h2>
       </form>
     </script>
 
+    <script id="ib-peers-tpl" type="text/mustache-template">
+      {{#.}}
+      <li><span class="ip_port">{{ip}}:{{port}}</span> <b>{{#_v.bitfield_to_percent}}{{bitfield}}{{/_v.bitfield_to_percent}}%</b> <i class="icon-download"></i>{{#_v.format_size}}{{downloadSpeed}}{{/_v.format_size}}/s <i class="icon-upload"></i>{{#_v.format_size}}{{uploadSpeed}}{{/_v.format_size}}/s</li>
+      {{/.}}
+    </script>
+
     <script id="other-task-empty" type="text/mustache-template">
       <li>
         <div class="empty-tasks">
diff --git a/js/aria2.js b/js/aria2.js
index 1b8dd80..a2c6500 100644
--- a/js/aria2.js
+++ b/js/aria2.js
@@ -558,7 +558,7 @@ if (typeof ARIA2=="undefined"||!ARIA2) var ARIA2=(function(){
     get_options: function(gid) {
       ARIA2.request("getOption", [gid],
         function(result) {
-          console.debug(result);
+          //console.debug(result);
 
           $("#ib-options").empty().append(YAAW.tpl.ib_options(result.result));
           if ($("#task-gid-"+gid).attr("data-status") == "active")
@@ -577,6 +577,16 @@ if (typeof ARIA2=="undefined"||!ARIA2) var ARIA2=(function(){
       );
     },
 
+    get_peers: function(gid) {
+      ARIA2.request("getPeers", [gid],
+        function(result) {
+          console.debug(result);
+
+          $("#ib-peers").empty().append(YAAW.tpl.ib_peers(result.result));
+        }
+      );
+    },
+
     pause_all: function() {
       ARIA2.request("pauseAll", [],
         function(result) {
@@ -700,6 +710,10 @@ if (typeof ARIA2=="undefined"||!ARIA2) var ARIA2=(function(){
           };
           $("#ib-status").empty().append(YAAW.tpl.ib_status(result));
           $("#ib-files").empty().append(YAAW.tpl.ib_files(result));
+          if (result.bittorrent) {
+            $("#ib-peers").show();
+            $("#ib-peers-a").show();
+          }
         }
       );
     },
diff --git a/js/yaaw.js b/js/yaaw.js
index ef19329..53873ae 100644
--- a/js/yaaw.js
+++ b/js/yaaw.js
@@ -105,6 +105,10 @@ var YAAW = (function() {
         ARIA2.get_options($(".info-box").attr("data-gid"));
       });
 
+      $("#ib-peers-a").live("click", function() {
+        ARIA2.get_peers($(".info-box").attr("data-gid"));
+      });
+
       var active_task_allowed_options = ["max-download-limit", "max-upload-limit"];
       $("#ib-options-save").live("click", function() {
         var options = {};
@@ -195,16 +199,51 @@ var YAAW = (function() {
 
       view: {
         bitfield: function() {
+          var graphic = "░▒▓█";
           return function(text) {
             var len = text.length;
             var result = "";
-            var graphic = "░▒▓█";
             for (var i=0; i<len; i++)
               result += graphic[Math.floor(parseInt(text[i], 16)/4)] + "&#8203;";
             return result;
           };
         },
 
+        bitfield_to_10: function() {
+          var graphic = "░▒▓█";
+          return function(text) {
+            var len = text.length;
+            var part_len = Math.ceil(len/10);
+            var result = "";
+            for (var i=0; i<10; i++) {
+              p = 0;
+              for (var j=0; j<part_len; j++) {
+                if (i*part_len+j >= len)
+                  p += 16;
+                else
+                  p += parseInt(text[i*part_len+j], 16);
+              }
+              result += graphic[Math.floor(p/part_len/4)] + "&#8203;";
+            }
+            return result;
+          };
+        },
+
+        bitfield_to_percent: function() {
+          return function(text) {
+            var len = text.length - 1;
+            var p, one = 0;
+            for (var i=0; i<len; i++) {
+              p = parseInt(text[i], 16);
+              for (var j=0; j<4; j++) {
+                one += (p & 1);
+                p >>= 1;
+              }
+            }
+            return Math.floor(one/(4*len)*100).toString();
+          };
+        },
+
         format_size: function() {
           var format_text = ["B", "KB", "MB", "GB", "TB", ];
           return function format_size(size) {
diff --git a/offline.appcache b/offline.appcache
index 67e4332..d757af7 100644
--- a/offline.appcache
+++ b/offline.appcache
@@ -1,5 +1,5 @@
 CACHE MANIFEST
-#2013-8-16 15:38
+#2014-1-29 21:06
 
 CACHE:
 index.html