jiigen666/libtorrent
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

udpated docs and fixed python binding issues

Browse Source
This commit is contained in:
Arvid Norberg
2007-06-11 03:28:07 +00:00
parent c960878352
commit 6ff2d8accf
5 changed files with 123 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
bindings/python/client.py
View File

@@ -153,13 +153,16 @@ def print_download_queue(console, download_queue):
for e in download_queue:
out += '%4d: [' % e['piece_index'];
for fin, req in zip(e['finished_blocks'], e['requested_blocks']):
if fin:
for b in e['blocks']:
s = b['state']
if s == 3:
out += '#'
elif req:
out += '+'
else:
elif s == 2:
out += '='
elif s == 1:
out += '-'
else:
out += ' '
out += ']\n'
write_line(console, out)

30
bindings/python/src/session_settings.cpp
View File

@@ -37,8 +37,16 @@ void bind_session_settings()
#ifndef TORRENT_DISABLE_DHT
.def_readwrite("use_dht_as_fallback", &session_settings::use_dht_as_fallback)
#endif
;
;
enum_<proxy_settings::proxy_type>("proxy_type")
.value("none", proxy_settings::none)
.value("socks4", proxy_settings::socks4)
.value("socks5", proxy_settings::socks5)
.value("socks5_pw", proxy_settings::socks5_pw)
.value("http", proxy_settings::http)
.value("http_pw", proxy_settings::http_pw)
;
scope ps = class_<proxy_settings>("proxy_settings")
.def_readwrite("hostname", &proxy_settings::hostname)
.def_readwrite("port", &proxy_settings::port)
@@ -47,11 +55,16 @@ void bind_session_settings()
.def_readwrite("type", &proxy_settings::type)
;
ps.attr("none") = (int)proxy_settings::none;
ps.attr("socks5") = (int)proxy_settings::socks5;
ps.attr("socks5_pw") = (int)proxy_settings::socks5_pw;
ps.attr("http") = (int)proxy_settings::http;
ps.attr("http_pw") = (int)proxy_settings::http_pw;
enum_<pe_settings::enc_policy>("enc_policy")
.value("forced", pe_settings::forced)
.value("enabled", pe_settings::enabled)
.value("disabled", pe_settings::disabled)
;
enum_<pe_settings::enc_level>("enc_level")
.value("rc4", pe_settings::rc4)
.value("plaintext", pe_settings::plaintext)
;
scope pes = class_<pe_settings>("pe_settings")
.def_readwrite("out_enc_policy", &pe_settings::out_enc_policy)
@@ -60,10 +73,5 @@ void bind_session_settings()
.def_readwrite("prefer_rc4", &pe_settings::prefer_rc4)
;
pes.attr("forced") = pe_settings::forced;
pes.attr("enabled") = pe_settings::enabled;
pes.attr("disabled") = pe_settings::disabled;
pes.attr("plaintext") = pe_settings::plaintext;
pes.attr("rc4") = pe_settings::rc4;
}

16
bindings/python/src/torrent_handle.cpp
View File

@@ -101,18 +101,16 @@ list get_download_queue(torrent_handle& handle)
dict partial_piece;
partial_piece["piece_index"] = i->piece_index;
partial_piece["blocks_in_piece"] = i->blocks_in_piece;
list requested;
list finished;
// list peer;
list block_list;
for (int k = 0; k < i->blocks_in_piece; ++k)
{
requested.append(bool(i->requested_blocks[k]));
finished.append(bool(i->finished_blocks[k]));
// peer.append(i->peer[k]);
dict block_info;
block_info["state"] = i->blocks[k].state;
block_info["num_downloads"] = i->blocks[k].num_downloads;
// block_info["peer"] = i->info[k].peer;
block_list.append(block_info);
}
partial_piece["requested_blocks"] = requested;
partial_piece["finished_blocks"] = finished;
// partial_piece["peer"] = peer;
partial_piece["blocks"] = block_list;
ret.append(partial_piece);
}