codex-storage
/
deluge
mirror of https://github.com/codex-storage/deluge.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

rollback kripken 'fix'

This commit is contained in:
Marcos Pinto 2007-05-30 21:07:58 +00:00
parent 2b93b71f7e
commit 0f63808f31
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
encryption/src/deluge_core.cpp
View File

@ -611,6 +611,15 @@ static PyObject *torrent_get_torrent_state(PyObject *self, PyObject *args)
std::vector<peer_info> peers;
t.handle.get_peer_info(peers);
long total_seeds = 0;
long total_peers = 0;
for (unsigned long i = 0; i < peers.size(); i++)
if (peers[i].seed)
total_seeds++;
else
total_peers++;
return Py_BuildValue("{s:s,s:l,s:l,s:l,s:l,s:f,s:f,s:d,s:f,s:l,s:l,s:s,s:s,s:f,s:d,s:l,s:l,s:l,s:d,s:l,s:l,s:l,s:l,s:l,s:l,s:d,s:d,s:l,s:l}",
"name", t.handle.get_torrent_info().name().c_str(),
"num_files", t.handle.get_torrent_info().num_files(),
@ -633,8 +642,8 @@ static PyObject *torrent_get_torrent_state(PyObject *self, PyObject *args)
"total_size", double(i.total_size()),
"piece_length", long(i.piece_length()),
"num_pieces", long(i.num_pieces()),
"total_seeds", s.num_complete != -1 ? s.num_complete: s.num_seeds,
"total_peers", s.num_incomplete != -1 ? s.num_incomplete : s.num_peers,
"total_seeds", total_seeds,
"total_peers", total_peers,
"is_paused", long(t.handle.is_paused()),
"is_seed", long(t.handle.is_seed()),
"total_wanted", double(s.total_wanted),
@ -770,7 +779,7 @@ static PyObject *torrent_pop_event(PyObject *self, PyObject *args)
return NULL;
if (handle_exists(handle))
return Py_BuildValue("{s:i,s:i,s:s,s:i,s:s}",
return Py_BuildValue("{s:i,s:i,s:s,s:s}",
"event_type", EVENT_TRACKER,
"unique_ID",
M_torrents->at(index).unique_ID,
@ -791,7 +800,6 @@ static PyObject *torrent_pop_event(PyObject *self, PyObject *args)
"unique_ID",
M_torrents->at(index).unique_ID,
"tracker_status", "Announce succeeded",
"num_peers", long(dynamic_cast<tracker_reply_alert*>(popped_alert)->num_peers),
"message", a->msg().c_str());
else
{ Py_INCREF(Py_None); return Py_None; }

2
encryption/src/interface.py
View File

@ -619,8 +619,6 @@ class DelugeGTK:
## Call via a timer to update the interface
def update(self):
# Tell the core to handle messages (now, so we show their output on this tick)
self.manager.handle_events()
# Make sure that the interface still exists
try:
tab = self.wtree.get_widget("torrent_info").get_current_page()