cleaning up tabs/spaces
This commit is contained in:
parent
6a51a4b9ed
commit
56e8db547c
612
po/deluge.pot
612
po/deluge.pot
File diff suppressed because it is too large
Load Diff
|
@ -382,7 +382,7 @@ static PyObject *torrent_init(PyObject *self, PyObject *args)
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
// on XP SP2 it's 10
|
// on XP SP2 it's 10
|
||||||
M_ses->set_max_half_open_connections(8);
|
M_ses->set_max_half_open_connections(8);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
@ -500,7 +500,7 @@ static PyObject *torrent_set_max_half_open(PyObject *self, PyObject *args)
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
// on XP SP2 it's 10
|
// on XP SP2 it's 10
|
||||||
if (arg > 8)
|
if (arg > 8)
|
||||||
{
|
{
|
||||||
arg = 8;
|
arg = 8;
|
||||||
|
@ -929,31 +929,31 @@ static PyObject *torrent_get_torrent_state(PyObject *self, PyObject *args)
|
||||||
total_seeds = s.num_complete != -1? s.num_complete : connected_seeds;
|
total_seeds = s.num_complete != -1? s.num_complete : connected_seeds;
|
||||||
total_peers = s.num_incomplete != -1? s.num_incomplete : connected_peers;
|
total_peers = s.num_incomplete != -1? s.num_incomplete : connected_peers;
|
||||||
|
|
||||||
// The following section computes the ranges of pieces that have been downloaded
|
// The following section computes the ranges of pieces that have been downloaded
|
||||||
std::vector<int> downloaded_range;
|
std::vector<int> downloaded_range;
|
||||||
bool range_opened=false;
|
bool range_opened=false;
|
||||||
for (unsigned int i=0; i<=s.pieces->size(); ++i) {
|
for (unsigned int i=0; i<=s.pieces->size(); ++i) {
|
||||||
bool downloaded=(i<s.pieces->size() && s.pieces->at(i));
|
bool downloaded=(i<s.pieces->size() && s.pieces->at(i));
|
||||||
if (!range_opened) {
|
if (!range_opened) {
|
||||||
if (downloaded) {
|
if (downloaded) {
|
||||||
range_opened=true;
|
range_opened=true;
|
||||||
downloaded_range.push_back(i);
|
downloaded_range.push_back(i);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
if (!downloaded) {
|
if (!downloaded) {
|
||||||
range_opened=false;
|
range_opened=false;
|
||||||
downloaded_range.push_back(i-1);
|
downloaded_range.push_back(i-1);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
PyObject *pieces_range = PyTuple_New(downloaded_range.size()/2);
|
PyObject *pieces_range = PyTuple_New(downloaded_range.size()/2);
|
||||||
for(unsigned long i=0; i<downloaded_range.size(); i+=2)
|
for(unsigned long i=0; i<downloaded_range.size(); i+=2)
|
||||||
{
|
{
|
||||||
PyObject *rangepos;
|
PyObject *rangepos;
|
||||||
rangepos = Py_BuildValue("[i,i]",downloaded_range[i],
|
rangepos = Py_BuildValue("[i,i]",downloaded_range[i],
|
||||||
downloaded_range[i+1]);
|
downloaded_range[i+1]);
|
||||||
PyTuple_SetItem(pieces_range, i/2, rangepos);
|
PyTuple_SetItem(pieces_range, i/2, rangepos);
|
||||||
}
|
}
|
||||||
|
|
||||||
return Py_BuildValue("{s:s,s:i,s:i,s:l,s:l,s:f,s:f,s:b,s:f,s:L,s:L,s:s,s:s,s:f,s:L,s:L,s:O,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:b,s:f,s:L,s:L,s:s,s:s,s:f,s:L,s:L,s:O,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(),
|
||||||
|
@ -1571,13 +1571,13 @@ static PyObject *torrent_create_torrent(PyObject *self, PyObject *args)
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
boost::intrusive_ptr<torrent_info> t(new torrent_info);
|
boost::intrusive_ptr<torrent_info> t(new torrent_info);
|
||||||
boost::filesystem::path full_path = complete(boost::filesystem::path(input));
|
boost::filesystem::path full_path = complete(boost::filesystem::path(input));
|
||||||
boost::filesystem::ofstream out(complete(boost::filesystem::path(destination)), std::ios_base::binary);
|
boost::filesystem::ofstream out(complete(boost::filesystem::path(destination)), std::ios_base::binary);
|
||||||
|
|
||||||
|
|
||||||
internal_add_files(*t, full_path.branch_path(), full_path.leaf());
|
internal_add_files(*t, full_path.branch_path(), full_path.leaf());
|
||||||
t->set_piece_size(piece_size);
|
t->set_piece_size(piece_size);
|
||||||
|
|
||||||
file_pool fp;
|
file_pool fp;
|
||||||
boost::scoped_ptr<storage_interface> st(default_storage_constructor(t, full_path.branch_path(), fp));
|
boost::scoped_ptr<storage_interface> st(default_storage_constructor(t, full_path.branch_path(), fp));
|
||||||
|
|
|
@ -338,7 +338,7 @@ class PreferencesDlg:
|
||||||
self.glade.get_widget('ratio_spinner').set_sensitive(value)
|
self.glade.get_widget('ratio_spinner').set_sensitive(value)
|
||||||
self.glade.get_widget('chk_clear_max_ratio_torrents').set_sensitive(value)
|
self.glade.get_widget('chk_clear_max_ratio_torrents').set_sensitive(value)
|
||||||
elif widget == self.glade.get_widget('chk_seedbottom'):
|
elif widget == self.glade.get_widget('chk_seedbottom'):
|
||||||
self.glade.get_widget('chk_queue_above_completed').set_sensitive(value)
|
self.glade.get_widget('chk_queue_above_completed').set_sensitive(value)
|
||||||
elif widget == self.glade.get_widget('chk_peer_proxy'):
|
elif widget == self.glade.get_widget('chk_peer_proxy'):
|
||||||
value = self.glade.get_widget('chk_peer_proxy').get_active()
|
value = self.glade.get_widget('chk_peer_proxy').get_active()
|
||||||
for x in ['combo_peer_proxy_type', 'txt_peer_proxy_hostname',
|
for x in ['combo_peer_proxy_type', 'txt_peer_proxy_hostname',
|
||||||
|
|
|
@ -166,8 +166,6 @@ class DetailsTabManager(object):
|
||||||
self.upload_speed.set_text(common.fspeed(state["upload_rate"]))
|
self.upload_speed.set_text(common.fspeed(state["upload_rate"]))
|
||||||
self.seeders.set_text(common.fseed(state))
|
self.seeders.set_text(common.fseed(state))
|
||||||
self.peers.set_text(common.fpeer(state))
|
self.peers.set_text(common.fpeer(state))
|
||||||
# self.progress_bar.set_fraction(float(state['progress']))
|
|
||||||
# self.progress_bar.set_text(common.fpcnt(state["progress"]))
|
|
||||||
self.last_state=state
|
self.last_state=state
|
||||||
if self.use_advanced_bar:
|
if self.use_advanced_bar:
|
||||||
self.paint_customprogress()
|
self.paint_customprogress()
|
||||||
|
|
Loading…
Reference in New Issue