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

more fixes for the seeds/peers count.. should work perfectly now 

fix get_peer_info return types
This commit is contained in:
Andrew Resch 2007-06-09 02:44:03 +00:00
parent e74e6d2bca
commit 810f26395f
1 changed files with 26 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/deluge_core.cpp
View File

@ -612,11 +612,13 @@ static PyObject *torrent_get_torrent_state(PyObject *self, PyObject *args)
t.handle.get_peer_info(peers); t.handle.get_peer_info(peers);
long connected_seeds = 0; long connected_seeds = 0;
for (unsigned long i = 0; i < peers.size(); i++) long connected_peers = 0;
for (unsigned long i = 0; i < peers.size(); i++) {
if ((peers[i].flags&(peer_info::seed)) && !(peers[i].flags&(peer_info::handshake|peer_info::connecting|peer_info::queued))) if ((peers[i].flags&(peer_info::seed)) && !(peers[i].flags&(peer_info::handshake|peer_info::connecting|peer_info::queued)))
connected_seeds++; connected_seeds++;
if (!(peers[i].flags&(peer_info::handshake|peer_info::connecting|peer_info::queued|peer_info::seed)))
long connected_peers = peers.size() - connected_seeds; connected_peers++;
}
return Py_BuildValue("{s:s,s:i,s:i,s:l,s:l,s:f,s:f,s:f,s:L,s:L,s:b,s:s,s:s,s:f,s:L,s:L,s:l,s:i,s:i,s:L,s:L,s:i,s:l,s:l,s:b,s:b,s:L,s:L,s:L}", return Py_BuildValue("{s:s,s:i,s:i,s:l,s:l,s:f,s:f,s:f,s:L,s:L,s:b,s:s,s:s,s:f,s:L,s:L,s:l,s:i,s:i,s:L,s:L,s:i,s:l,s:l,s:b,s:b,s:L,s:L,s:L}",
"name", t.handle.get_torrent_info().name().c_str(), "name", t.handle.get_torrent_info().name().c_str(),
@ -872,29 +874,29 @@ static PyObject *torrent_get_peer_info(PyObject *self, PyObject *args)
} }
peer_info = Py_BuildValue( peer_info = Py_BuildValue(
"{s:f,s:d,s:f,s:d,s:i,s:i,s:i,s:i,s:i,s:i,s:i,s:i,s:i,s:i,s:i,s:s,s:i,s:s,s:f,s:O,s:i,s:i}", "{s:f,s:L,s:f,s:L,s:i,s:i,s:b,s:b,s:b,s:b,s:b,s:b,s:b,s:b,s:b,s:s,s:b,s:s,s:f,s:O,s:b,s:b}",
"download_speed", float(peers[i].down_speed), "download_speed", peers[i].down_speed,
"total_download", double(peers[i].total_download), "total_download", peers[i].total_download,
"upload_speed", float(peers[i].up_speed), "upload_speed", peers[i].up_speed,
"total_upload", double(peers[i].total_upload), "total_upload", peers[i].total_upload,
"download_queue_length", long(peers[i].download_queue_length), "download_queue_length", peers[i].download_queue_length,
"upload_queue_length", long(peers[i].upload_queue_length), "upload_queue_length", peers[i].upload_queue_length,
"is_interesting", long((peers[i].flags & peer_info::interesting) != 0), "is_interesting", ((peers[i].flags & peer_info::interesting) != 0),
"is_choked", long((peers[i].flags & peer_info::choked) != 0), "is_choked", ((peers[i].flags & peer_info::choked) != 0),
"is_remote_interested", long((peers[i].flags & peer_info::remote_interested) != 0), "is_remote_interested", ((peers[i].flags & peer_info::remote_interested) != 0),
"is_remote_choked", long((peers[i].flags & peer_info::remote_choked) != 0), "is_remote_choked", ((peers[i].flags & peer_info::remote_choked) != 0),
"supports_extensions", long((peers[i].flags & peer_info::supports_extensions)!= 0), "supports_extensions", ((peers[i].flags & peer_info::supports_extensions) != 0),
"is_local_connection", long((peers[i].flags & peer_info::local_connection) != 0), "is_local_connection", ((peers[i].flags & peer_info::local_connection) != 0),
"is_awaiting_handshake", long((peers[i].flags & peer_info::handshake) != 0), "is_awaiting_handshake", ((peers[i].flags & peer_info::handshake) != 0),
"is_connecting", long((peers[i].flags & peer_info::connecting) != 0), "is_connecting", ((peers[i].flags & peer_info::connecting) != 0),
"is_queued", long((peers[i].flags & peer_info::queued) != 0), "is_queued", ((peers[i].flags & peer_info::queued) != 0),
"client", peers[i].client.c_str(), "client", peers[i].client.c_str(),
"is_seed", long(peers[i].seed), "is_seed", ((peers[i].flags & peer_info::seed) != 0),
"ip", peers[i].ip.address().to_string().c_str(), "ip", peers[i].ip.address().to_string().c_str(),
"peer_has", float(float(pieces_had)*100.0/pieces.size()), "peer_has", float(float(pieces_had)*100.0/pieces.size()),
"pieces", py_pieces, "pieces", py_pieces,
"rc4_encrypted", long((peers[i].flags & peer_info::rc4_encrypted) != 0), "rc4_encrypted", ((peers[i].flags & peer_info::rc4_encrypted) != 0),
"plaintext_encrypted", long((peers[i].flags & peer_info::plaintext_encrypted) != 0) "plaintext_encrypted", ((peers[i].flags & peer_info::plaintext_encrypted) != 0)
); );
Py_DECREF(py_pieces); // Assuming the previous line does NOT steal the ref, then this is Py_DECREF(py_pieces); // Assuming the previous line does NOT steal the ref, then this is