From 991a4133270c788ed2b77263abb2a11c0c3a9c26 Mon Sep 17 00:00:00 2001
From: Martijn Voncken <mvoncken@gmail.com>
Date: Tue, 12 Feb 2008 21:03:33 +0000
Subject: [PATCH] torrent_info:display torrent files

---
 deluge/ui/webui/webui_plugin/render.py                 | 10 ++++++++++
 .../templates/advanced/static/advanced.css             |  8 ++++++++
 .../webui_plugin/templates/deluge/torrent_info.html    |  5 ++++-
 .../ui/webui/webui_plugin/tests/multicall_notepad.py   |  6 +++---
 deluge/ui/webui/webui_plugin/utils.py                  |  2 +-
 deluge/ui/webui/webui_plugin/webserver_common.py       |  2 +-
 6 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/deluge/ui/webui/webui_plugin/render.py b/deluge/ui/webui/webui_plugin/render.py
index b304ae4c3..d3456bce4 100644
--- a/deluge/ui/webui/webui_plugin/render.py
+++ b/deluge/ui/webui/webui_plugin/render.py
@@ -89,6 +89,15 @@ def template_crop(text, end):
         return "[ERROR NOT A STRING:(%s)]" % text
     return text
 
+def template_crop_right(text, maxlen):
+    try:
+        if len(text) > maxlen:
+            return "..." + text[-(maxlen + 3):]
+    except:
+        return "[ERROR NOT A STRING:(%s)]" % text
+    return text
+
+
 def template_sort_head(id,name):
     #got tired of doing these complex things inside templetor..
     vars = web.input(sort = None, order = None)
@@ -136,6 +145,7 @@ template.Template.globals.update({
     'part_stats':template_part_stats,
     'category_tabs':category_tabs,
     'crop': template_crop,
+    'crop_right': template_crop_right,
     '_': _ , #gettext/translations
     'str': str, #because % in templetor is broken.
     'int':int,
diff --git a/deluge/ui/webui/webui_plugin/templates/advanced/static/advanced.css b/deluge/ui/webui/webui_plugin/templates/advanced/static/advanced.css
index 7dc2777dc..bcba9c4ad 100644
--- a/deluge/ui/webui/webui_plugin/templates/advanced/static/advanced.css
+++ b/deluge/ui/webui/webui_plugin/templates/advanced/static/advanced.css
@@ -86,6 +86,14 @@ tr.altrow1{
 	background-color: #37506f;
 }
 
+tr.tab_altrow0{
+	background-color: #304663;
+}
+
+tr.tab_altrow1{
+	background-color: #37506f;
+}
+
 
 
 tr.torrent_table_selected {
diff --git a/deluge/ui/webui/webui_plugin/templates/deluge/torrent_info.html b/deluge/ui/webui/webui_plugin/templates/deluge/torrent_info.html
index 660273e1a..e0cd572c2 100644
--- a/deluge/ui/webui/webui_plugin/templates/deluge/torrent_info.html
+++ b/deluge/ui/webui/webui_plugin/templates/deluge/torrent_info.html
@@ -2,8 +2,8 @@ $def with (torrent)
 
 $:(render.header(torrent.message + '/' + torrent.name))
 <div class="panel">
-<h3>$_('Details')</h3>
 
+<h3>$_('Details')</h3>
 $:render.tab_meta(torrent)
 
 $if (torrent.action == 'start'):
@@ -18,6 +18,9 @@ $:render.part_button('POST', '/torrent/reannounce/' + str(torrent.id), _('Reanno
 $:render.part_button('POST', '/torrent/queue/up/' + str(torrent.id), _('Queue Up'), 'tango/queue-up.png')
 $:render.part_button('POST', '/torrent/queue/down/' + str(torrent.id), _('Queue Down'), 'tango/queue-down.png')
 
+<br>
+$:render.tab_files(torrent)
+
 <br>
 <!--
 [<a onclick="javascript:toggle_dump()">$_('Debug:Data Dump')</a>]
diff --git a/deluge/ui/webui/webui_plugin/tests/multicall_notepad.py b/deluge/ui/webui/webui_plugin/tests/multicall_notepad.py
index 62bf7a1ff..032633060 100644
--- a/deluge/ui/webui/webui_plugin/tests/multicall_notepad.py
+++ b/deluge/ui/webui/webui_plugin/tests/multicall_notepad.py
@@ -68,12 +68,12 @@ start = time.time()
 torrent_ids  = ws.proxy.get_session_state() #Syc-api.
 torrent_dict = {}
 for id in torrent_ids:
-    async_proxy.get_torrent_status(dict_cb(id,torrent_dict), id, ["name"])
+    async_proxy.get_torrent_status(dict_cb(id,torrent_dict), id, [])
 async_proxy.force_call(block=True)
 
 print "Async-list:",time.time() - start
-print torrent_dict[torrent_ids[0]].keys()
-print torrent_dict[torrent_ids[0]]["name"]
+print "\n".join(torrent_dict[torrent_ids[0]].keys())
+print torrent_dict[torrent_ids[0]]["files"]
 
 
 
diff --git a/deluge/ui/webui/webui_plugin/utils.py b/deluge/ui/webui/webui_plugin/utils.py
index 12cc9b577..1b065f535 100644
--- a/deluge/ui/webui/webui_plugin/utils.py
+++ b/deluge/ui/webui/webui_plugin/utils.py
@@ -224,7 +224,7 @@ def get_torrent_status(torrent_id):
     helper method.
     enhance ws.proxy.get_torrent_status with some extra data
     """
-    status = ws.proxy.get_torrent_status(torrent_id,[])
+    status = ws.proxy.get_torrent_status(torrent_id,TORRENT_KEYS)
 
     return enhance_torrent_status(torrent_id, status)
 
diff --git a/deluge/ui/webui/webui_plugin/webserver_common.py b/deluge/ui/webui/webui_plugin/webserver_common.py
index d10a9278a..020224a02 100644
--- a/deluge/ui/webui/webui_plugin/webserver_common.py
+++ b/deluge/ui/webui/webui_plugin/webserver_common.py
@@ -71,7 +71,7 @@ TORRENT_KEYS = ['distributed_copies', 'download_payload_rate',
     'total_payload_download', 'total_payload_upload', 'total_peers',
     'total_seeds', 'total_size', 'total_upload', 'total_wanted',
     'tracker_status', 'upload_payload_rate',
-    'uploaded_memory','tracker','state','queue_pos','user_paused']
+    'uploaded_memory','tracker','state','queue_pos','user_paused','files']
 
 STATE_MESSAGES = (_("Queued"),
     _("Checking"),