Merge pull request #474 from rakshasa/merzlya-display

Merzlya display

doc/rtorrent.rc

@@ -3,59 +3,74 @@
 # uncomment the options you wish to enable.
 
 # Maximum and minimum number of peers to connect to per torrent.
+#
 #throttle.min_peers.normal.set = 40
 #throttle.max_peers.normal.set = 100
 
 # Same as above but for seeding completed torrents (-1 = same as downloading)
+#
 #throttle.min_peers.seed.set = 10
 #throttle.max_peers.seed.set = 50
 
 # Maximum number of simultanious uploads per torrent.
+#
 #throttle.max_uploads.set = 15
 
 # Global upload and download rate in KiB. "0" for unlimited.
+#
 #throttle.global_down.max_rate.set_kb = 0
 #throttle.global_up.max_rate.set_kb = 0
 
 # Default directory to save the downloaded torrents.
+#
 #directory.default.set = ./
 
 # Default session directory. Make sure you don't run multiple instance
 # of rtorrent using the same session directory. Perhaps using a
 # relative path?
+#
 #session.path.set = ./session
 
 # Watch a directory for new torrents, and stop those that have been
 # deleted.
+#
 #schedule2 = watch_directory,5,5,load.start=./watch/*.torrent
 #schedule2 = untied_directory,5,5,stop_untied=
 
 # Close torrents when diskspace is low.
+#
 #schedule2 = low_diskspace,5,60,close_low_diskspace=100M
 
 # The ip address reported to the tracker.
+#
 #network.local_address.set = 127.0.0.1
 #network.local_address.set = rakshasa.no
 
 # The ip address the listening socket and outgoing connections is
 # bound to.
+#
 #network.bind_address.set = 127.0.0.1
 #network.bind_address.set = rakshasa.no
 
 # Port range to use for listening.
+#
 #network.port_range.set = 6890-6999
 
 # Start opening ports at a random position within the port range.
+#
 #network.port_random.set = no
 
 # Check hash for finished torrents. Might be usefull until the bug is
 # fixed that causes lack of diskspace not to be properly reported.
+#
 #pieces.hash.on_completion.set = no
 
 # Set whether the client should try to connect to UDP trackers.
+#
 #trackers.use_udp.set = yes
 
 # Alternative calls to bind and ip that should handle dynamic ip's.
+#
 #schedule2 = ip_tick,0,1800,ip=rakshasa
 #schedule2 = bind_tick,0,1800,bind=rakshasa
 
@@ -76,9 +91,13 @@
 # dht.mode.set = auto
 
 # UDP port to use for DHT. 
-# 
-# dht.port.set = 6881
+#
+#dht.port.set = 6881
 
 # Enable peer exchange (for torrents not marked private)
 #
-# protocol.pex.set = yes
+#protocol.pex.set = yes
+
+# Set downlad list layout style. ("full", "compact")
+#
+#torrent_list_layout = "full"

src/command_ui.cc

@@ -555,6 +555,9 @@ initialize_command_ui() {
   CMD2_ANY       ("ui.current_view",       std::bind(&cmd_ui_current_view));
   CMD2_ANY_STRING("ui.current_view.set",   std::bind(&cmd_ui_set_view, std::placeholders::_2));
 
+  // TODO: Add 'option_string' for rtorrent-specific options.
+  CMD2_VAR_STRING("ui.torrent_list.layout", "full");
+
   // Move.
   CMD2_ANY("print", &apply_print);
   CMD2_ANY("cat",   &apply_cat);

src/display/utils.cc

@@ -133,7 +133,7 @@ print_download_title(char* first, char* last, core::Download* d) {
 }
 
 char*
-print_download_info(char* first, char* last, core::Download* d) {
+print_download_info_full(char* first, char* last, core::Download* d) {
   if (!d->download()->info()->is_open())
     first = print_buffer(first, last, "[CLOSED]  ");
   else if (!d->download()->info()->is_active())
@@ -177,7 +177,7 @@ print_download_info(char* first, char* last, core::Download* d) {
   first = print_buffer(first, last , "]");
 
   if (first > last)
-    throw torrent::internal_error("print_download_info(...) wrote past end of the buffer.");
+    throw torrent::internal_error("print_download_info_full(...) wrote past end of the buffer.");
 
   return first;
 }
@@ -218,6 +218,68 @@ print_download_status(char* first, char* last, core::Download* d) {
   return first;
 }
 
+char*
+print_download_column_compact(char* first, char* last) {
+  first = print_buffer(first, last, " %-64.64s", "Name");
+  first = print_buffer(first, last, "| Status | Downloaded | Size       | Done | Up Rate   | Down Rate | Uploaded   |  ETA      | Ratio| Misc ");
+
+  if (first > last)
+    throw torrent::internal_error("print_download_column_compact(...) wrote past end of the buffer.");
+
+  return first;
+}
+
+char*
+print_download_info_compact(char* first, char* last, core::Download* d) {
+  first = print_buffer(first, last, " %-64.64s", d->info()->name().c_str());
+  first = print_buffer(first, last, "|");
+
+  if (!d->download()->info()->is_open())
+    first = print_buffer(first, last, " CLOSED ");
+  else if (!d->download()->info()->is_active())
+    first = print_buffer(first, last, " OPEN   ");
+  else
+    first = print_buffer(first, last, "        ");
+
+  first = print_buffer(first, last, "| %7.1f MB ", (double)d->download()->bytes_done() / (double)(1 << 20));
+  first = print_buffer(first, last, "| %7.1f MB ", (double)d->download()->file_list()->size_bytes() / (double)(1 << 20));
+  first = print_buffer(first, last, "|");
+
+  if (d->is_done())
+    first = print_buffer(first, last, " 100%% ");
+  else if (d->is_open())
+    first = print_buffer(first, last, "  %2u%% ",(d->download()->file_list()->completed_chunks() * 100) / d->download()->file_list()->size_chunks());
+  else
+    first = print_buffer(first, last, "      ");
+
+  first = print_buffer(first, last, "| %6.1f KB ", (double)d->info()->up_rate()->rate() / (1 << 10));
+  first = print_buffer(first, last, "| %6.1f KB ", (double)d->info()->down_rate()->rate() / (1 << 10));
+  first = print_buffer(first, last, "| %7.1f MB ", (double)d->info()->up_rate()->total() / (1 << 20));
+  first = print_buffer(first, last, "| ");
+
+  if (d->download()->info()->is_active() && !d->is_done())
+    first = print_download_time_left(first, last, d);
+  else
+    first = print_buffer(first, last, "         ");
+
+  first = print_buffer(first, last, "| %4.2f ", (double)rpc::call_command_value("d.ratio", rpc::make_target(d)) / 1000.0);
+  first = print_buffer(first, last, "| %c%c",
+                       rpc::call_command_string("d.tied_to_file", rpc::make_target(d)).empty() ? ' ' : 'T',
+                       rpc::call_command_value("d.ignore_commands", rpc::make_target(d)) == 0 ? ' ' : 'I',
+                       (double)rpc::call_command_value("d.ratio", rpc::make_target(d)) / 1000.0);
+
+  if (d->priority() != 2)
+    first = print_buffer(first, last, " %s", rpc::call_command_string("d.priority_str", rpc::make_target(d)).c_str());
+
+  if (!d->bencode()->get_key("rtorrent").get_key_string("throttle_name").empty())
+    first = print_buffer(first, last , " %s", rpc::call_command_string("d.throttle_name", rpc::make_target(d)).c_str());
+
+  if (first > last)
+    throw torrent::internal_error("print_download_info_compact(...) wrote past end of the buffer.");
+
+  return first;
+}
+
 char*
 print_download_time_left(char* first, char* last, core::Download* d) {
   uint32_t rate = d->info()->down_rate()->rate();

src/display/utils.h

@@ -66,8 +66,12 @@ char*       print_ddhhmm(char* first, char* last, time_t t);
 char*       print_ddmmyyyy(char* first, char* last, time_t t);
 
 char*       print_download_title(char* first, char* last, core::Download* d);
-char*       print_download_info(char* first, char* last, core::Download* d);
+char*       print_download_info_full(char* first, char* last, core::Download* d);
 char*       print_download_status(char* first, char* last, core::Download* d);
+
+char*       print_download_column_compact(char* first, char* last);
+char*       print_download_info_compact(char* first, char* last, core::Download* d);
+
 char*       print_download_time_left(char* first, char* last, core::Download* d);
 char*       print_download_percentage_done(char* first, char* last, core::Download* d);
 

src/display/window_download_list.cc

@@ -40,6 +40,7 @@
 
 #include "core/download.h"
 #include "core/view.h"
+#include "rpc/parse_commands.h"
 
 #include "canvas.h"
 #include "globals.h"
@@ -85,12 +86,24 @@ WindowDownloadList::redraw() {
   if (m_view->empty_visible() || m_canvas->width() < 5 || m_canvas->height() < 2)
     return;
 
+  int layout_height;
+  const std::string layout_name = rpc::call_command_string("ui.torrent_list.layout");
+
+  if (layout_name == "full") {
+    layout_height = 3;
+  } else if (layout_name == "compact") {
+    layout_height = 1;
+  } else {
+    m_canvas->print(0, 0, "INVALID ui.torrent_list.layout '%s'", layout_name.c_str());
+    return;
+  }
+
   typedef std::pair<core::View::iterator, core::View::iterator> Range;
 
   Range range = rak::advance_bidirectional(m_view->begin_visible(),
                                            m_view->focus() != m_view->end_visible() ? m_view->focus() : m_view->begin_visible(),
                                            m_view->end_visible(),
-                                           m_canvas->height() / 3);
+                                           m_canvas->height() / layout_height);
 
   // Make sure we properly fill out the last lines so it looks like
   // there are more torrents, yet don't hide it if we got the last one
@@ -99,22 +112,38 @@ WindowDownloadList::redraw() {
     ++range.second;
 
   int pos = 1;
+  char buffer[m_canvas->width() + 1];
+  char* last = buffer + m_canvas->width() - 2 + 1;
 
-  while (range.first != range.second) {
-    char buffer[m_canvas->width() + 1];
-    char* last = buffer + m_canvas->width() - 2 + 1;
+  // Add a proper 'column info' method.
+  if (layout_name == "compact") {
+    print_download_column_compact(buffer, last);
 
-    print_download_title(buffer, last, *range.first);
-    m_canvas->print(0, pos++, "%c %s", range.first == m_view->focus() ? '*' : ' ', buffer);
-    
-    print_download_info(buffer, last, *range.first);
-    m_canvas->print(0, pos++, "%c %s", range.first == m_view->focus() ? '*' : ' ', buffer);
+    m_canvas->set_default_attributes(A_BOLD);
+    m_canvas->print(0, pos++, "  %s", buffer);
+  }
 
-    print_download_status(buffer, last, *range.first);
-    m_canvas->print(0, pos++, "%c %s", range.first == m_view->focus() ? '*' : ' ', buffer);
+  if (layout_name == "full") {
+    while (range.first != range.second) {
+      print_download_title(buffer, last, *range.first);
+      m_canvas->print(0, pos++, "%c %s", range.first == m_view->focus() ? '*' : ' ', buffer);
+      print_download_info_full(buffer, last, *range.first);
+      m_canvas->print(0, pos++, "%c %s", range.first == m_view->focus() ? '*' : ' ', buffer);
+      print_download_status(buffer, last, *range.first);
+      m_canvas->print(0, pos++, "%c %s", range.first == m_view->focus() ? '*' : ' ', buffer);
 
-    ++range.first;
-  }    
+      range.first++;
+    }
+
+  } else {
+    while (range.first != range.second) {
+      print_download_info_compact(buffer, last, *range.first);
+      m_canvas->set_default_attributes(range.first == m_view->focus() ? A_REVERSE : A_NORMAL);
+      m_canvas->print(0, pos++, "%c %s", range.first == m_view->focus() ? '*' : ' ', buffer);
+
+      range.first++;
+    }
+  }
 }
 
 }

src/display/window_download_statusbar.cc

@@ -66,7 +66,7 @@ WindowDownloadStatusbar::redraw() {
   char buffer[m_canvas->width()];
   char* last = buffer + m_canvas->width() - 2;
 
-  print_download_info(buffer, last, m_download);
+  print_download_info_full(buffer, last, m_download);
   m_canvas->print(0, 0, "%s", buffer);
 
   snprintf(buffer, last - buffer, "Peers: %i(%i) Min/Max: %i/%i Slots: U:%i/%i D:%i/%i U/I/C/A: %i/%i/%i/%i Unchoked: %u/%u Failed: %i",

src/main.cc

@@ -416,6 +416,8 @@ main(int argc, char** argv) {
     CMD2_REDIRECT_GENERIC("to_xb", "convert.xb");
     CMD2_REDIRECT_GENERIC("to_throttle", "convert.throttle");
 
+    CMD2_REDIRECT        ("torrent_list_layout", "ui.torrent_list.layout.set");
+
     // Deprecated commands. Don't use these anymore.
 
     if (rpc::call_command_value("method.use_intermediate") == 1) {

src/ui/element_download_list.cc

@@ -99,6 +99,8 @@ ElementDownloadList::ElementDownloadList() :
 
   m_bindings[KEY_UP]   = m_bindings['P' - '@'] = std::bind(&ElementDownloadList::receive_prev, this);
   m_bindings[KEY_DOWN] = m_bindings['N' - '@'] = std::bind(&ElementDownloadList::receive_next, this);
+
+  m_bindings['L']           = std::bind(&ElementDownloadList::toggle_layout, this);
 }
 
 void
@@ -221,4 +223,8 @@ ElementDownloadList::receive_change_view(const std::string& name) {
   set_view(*itr);
 }
 
+void
+ElementDownloadList::toggle_layout() {
+  rpc::call_command("download.list.layout.set", (rpc::call_command_value("download.list.layout") + 1)%2);
+}
 }

src/ui/element_download_list.h

@@ -77,6 +77,8 @@ public:
 
   void                receive_change_view(const std::string& name);
 
+  void                toggle_layout();
+
 private:
   WDownloadList*      m_window;
   core::View*         m_view;