Changeset 2459

Timestamp:

Jul 22, 2007, 7:37:43 PM (16 years ago)

Author:

charles

Message:

• add code to refresh the torrent list, and a timer to call it.
• beautify some of the torrent list's columns

File:

• trunk/wx/xmission.cc (modified) (16 diffs)

trunk/wx/xmission.cc

@@ -47 +47 @@
     void OnAbout(wxCommandEvent& event);
     void OnOpen(wxCommandEvent& event);
+    void OnTimer(wxTimerEvent& event);
 
 protected:
     wxConfig * myConfig;
+    wxTimer myPulseTimer;
 
 private:
     void rebuildTorrentList();
     void repopulateTorrentList ();
+    void refreshTorrentList ();
     wxListCtrl * myTorrentList;
     typedef std::vector<tr_torrent_t*> torrents_t;
     torrents_t myTorrents;
-    void insertTorrent( tr_torrent_t*, const std::vector<int>& );
+    void refreshTorrent( tr_torrent_t*, int, const std::vector<int>& );
+
+    typedef std::map<std::string,int> str2int_t;
+
+    /** torrent hash -> the torrent's row in myTorrentList */
+    str2int_t myHashToRow;
 };
 
@@ -70 +78 @@
     ID_SHOW_DEBUG_WINDOW,
     ID_ABOUT,
+    ID_Pulse,
     N_IDS
 };
@@ -112 +121 @@
     frame->Connect( wxID_EXIT, wxEVT_COMMAND_MENU_SELECTED, (wxObjectEventFunction) &MyFrame::OnQuit );
     frame->Connect( wxID_ABOUT, wxEVT_COMMAND_MENU_SELECTED, (wxObjectEventFunction) &MyFrame::OnAbout );
+    frame->Connect( ID_Pulse, wxEVT_TIMER, (wxObjectEventFunction) &MyFrame::OnTimer );
 
     frame->Show( true );
@@ -188 +198 @@
         wxString columnStr;
         if( !config->Read( key, &columnStr ) )
-            columnStr = _T("name|#|size|done|status|seeds|peers|eta|uspeed|dspeed");
+            columnStr = _T("name|dspeed|uspeed|eta|peers|size|done|status|seeds");
 
         int_v cols;
@@ -246 +256 @@
 /***
 ****
+****  PEERS LIST
+****
+****
 ***/
 
+
+/***
+****
+****  TORRENT LIST
+****
+****
+***/
+
 void
-MyFrame :: insertTorrent( tr_torrent_t * tor,
-                          const int_v        & cols )
+MyFrame :: refreshTorrent( tr_torrent_t  * tor,
+                           int             myTorrents_index,
+                           const int_v   & cols )
 {
     int row = -1;
@@ -259 +281 @@
     const tr_info_t* info = tr_torrentInfo( tor );
 
-
     for( int_v::const_iterator it(cols.begin()), end(cols.end()); it!=end; ++it )
     {
@@ -272 +293 @@
 
             case COL_DONE:
-                snprintf( buf, sizeof(buf), "%%%.1f", s->percentDone );
+                snprintf( buf, sizeof(buf), "%d%%", (int)(s->percentDone*100.0) );
                 xstr = toWxStr( buf );
                 break;
@@ -281 +302 @@
 
             case COL_ETA:
-                xstr = toWxStr( getReadableTime( s->eta ) );
+                if( (int)(s->percentDone*100) >= 100 )
+                    xstr = wxString ();
+                else if( s->eta < 0 )
+                    xstr = toWxStr( "\xE2\x88\x9E" ); /* infinity, in utf-8 */
+                else
+                    xstr = toWxStr( getReadableTime( s->eta ) );
                 break;
                 
@@ -344 +370 @@
         }
 
-        if( row < 0 )
-            row = myTorrentList->InsertItem( myTorrentList->GetItemCount(), xstr );
-        else
-            myTorrentList->SetItem( row, ++col, xstr );
-    }
-}
-
+        if( col ) {
+            myTorrentList->SetItem( row, col++, xstr );
+        }
+        else {
+            // first column... find the right row to put the info in.
+            // if the torrent's in the list already, update that row.
+            // otherwise, add a new row.
+            if( row < 0 ) {
+                str2int_t::const_iterator it = myHashToRow.find( info->hashString );
+                if( it != myHashToRow.end() ) {
+                    row = it->second;
+                }
+            }
+            if( row >= 0 ) {
+                myTorrentList->SetItem( row, col++, xstr );
+            }
+            else {
+                row = myTorrentList->InsertItem( myTorrentList->GetItemCount(), xstr );
+                col = 1;
+                myHashToRow[info->hashString] = row;
+                myTorrentList->SetItemData( row, myTorrents_index );
+            }
+        }
+    }
+}
+
+void
+MyFrame :: refreshTorrentList ()
+{
+    const int_v  cols = getTorrentColumns( myConfig );
+    const int rowCount = myTorrentList->GetItemCount();
+    for( int row=0; row<rowCount; ++row )
+    {
+        int array_index = myTorrentList->GetItemData( row );
+        tr_torrent_t * tor = myTorrents[array_index];
+        refreshTorrent( tor, array_index, cols );
+    }
+}
 
 void
 MyFrame :: repopulateTorrentList ()
 {
+std::cerr << __FILE__ << ':' << __LINE__ << " clearing all items from list" << std::endl;
     myTorrentList->DeleteAllItems();
+    myHashToRow.clear ();
 
     const int_v cols = getTorrentColumns( myConfig );
+    int i = 0;
     for( torrents_t::const_iterator it(myTorrents.begin()),
                                    end(myTorrents.end()); it!=end; ++it )
-        insertTorrent( *it, cols );
+        refreshTorrent( *it, i++, cols );
 }
 
@@ -367 +427 @@
 {
     myTorrentList->ClearAll( );
+    myHashToRow.clear ();
 
     int i = 0;
@@ -372 +433 @@
     for( int_v ::const_iterator it(cols.begin()), end(cols.end()); it!=end; ++it )
     {
+        int format = wxLIST_FORMAT_LEFT;
+        int width = -1;
         wxString h;
 
         switch( *it )
         {
-            case COL_NUMBER:          h = _T("#"); break;
-            case COL_DONE:            h = _T("Done"); break;
+            case COL_NUMBER:          h = _T("#"); format = wxLIST_FORMAT_CENTRE; break;
+            case COL_DONE:            h = _T("Done"); format = wxLIST_FORMAT_RIGHT; break;
             case COL_DOWNLOAD_SPEED:  h = _T("Download"); break;
-            case COL_ETA:             h = _T("ETA"); break;
+            case COL_ETA:             h = _T("ETA"); format = wxLIST_FORMAT_RIGHT; break;
             case COL_HASH:            h = _T("SHA1 Hash"); break;
-            case COL_NAME:            h = _T("Name"); break;
-            case COL_PEERS:           h = _T("Peers"); break;
-            case COL_RATIO:           h = _T("Ratio"); break;
-            case COL_RECEIVED:        h = _T("Received"); break;
-            case COL_REMAINING:       h = _T("Remaining"); break;
-            case COL_SEEDS:           h = _T("Seeds"); break;
-            case COL_SENT:            h = _T("Sent"); break;
-            case COL_SIZE:            h = _T("Size"); break;
+            case COL_NAME:            h = _T("Name"); width = 500; break;
+            case COL_PEERS:           h = _T("Peers"); format = wxLIST_FORMAT_RIGHT; break;
+            case COL_RATIO:           h = _T("Ratio"); format = wxLIST_FORMAT_RIGHT; break;
+            case COL_RECEIVED:        h = _T("Received"); format = wxLIST_FORMAT_RIGHT; break;
+            case COL_REMAINING:       h = _T("Remaining"); format = wxLIST_FORMAT_RIGHT; break;
+            case COL_SEEDS:           h = _T("Seeds"); format = wxLIST_FORMAT_RIGHT; break;
+            case COL_SENT:            h = _T("Sent"); format = wxLIST_FORMAT_RIGHT; break;
+            case COL_SIZE:            h = _T("Size");  format = wxLIST_FORMAT_RIGHT; break;
             case COL_STATE:           h = _T("State"); break;
             case COL_STATUS:          h = _T("Status"); break;
             case COL_TOTAL:           h = _T("Total"); break;
-            case COL_UPLOAD_SPEED:    h = _T("Upload"); break;
+            case COL_UPLOAD_SPEED:    h = _T("Upload"); format = wxLIST_FORMAT_RIGHT;break;
             default:                  h = _T("Error"); break;
         }
 
-        myTorrentList->InsertColumn( i++, h );
+        myTorrentList->InsertColumn( i++, h, format, width );
     }
 
@@ -405 +468 @@
 ****
 ***/
+
+void
+MyFrame :: OnTimer(wxTimerEvent& event)
+{
+    refreshTorrentList ();
+}
 
 MyFrame::~MyFrame()
@@ -413 +482 @@
 MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size):
     wxFrame((wxFrame*)NULL,-1,title,pos,size),
-    myConfig( new wxConfig( _T("xmission") ) )
+    myConfig( new wxConfig( _T("xmission") ) ),
+    myPulseTimer( this, ID_Pulse )
 {
     wxImage::AddHandler( new wxPNGHandler );
@@ -426 +496 @@
 
     const int flags = TR_FLAG_PAUSED;
-    const char * destination = "/tmp/asdf";
+    const char * destination = "/home/charles/torrents";
     int count = 0;
     tr_torrent_t ** torrents = tr_loadTorrents ( handle, destination, flags, &count );
@@ -521 +591 @@
     row_sizer->Add( myTorrentList, wxSizerFlags().Expand() );
     row_sizer->AddGrowableCol( 1, 1 );
-    repopulateTorrentList ();
 
 
@@ -545 +614 @@
     CreateStatusBar();
     SetStatusText(_T("Welcome to Xmission!"));
+
+    /**
+    ***  Refresh
+    **/
+
+    myPulseTimer.Start( 1500 );
 }