Browse Source

- Some fixes in bandwidth allocation per torrent dialog

adaptive-webui-19844
Christophe Dumez 18 years ago
parent
commit
ff756a2b1f
  1. 2
      TODO
  2. 63
      src/allocationDlg.h
  3. 4
      src/bandwidth_limit.ui

2
TODO

@ -48,6 +48,7 @@ @@ -48,6 +48,7 @@
- Clean up delayed progress column sorting code
- Clean up pause after checking code
- Test rss now that it has been rewritten
- Review speed allocation dialog : BTSession->getSession()->download_rate_limit() value is wrong
- Wait for some bug fixes in libtorrent :
- upload/download limit per torrent (Ticket #83)
- double free or corruption on exit (Ticket #84)
@ -71,5 +72,6 @@ beta3->beta4 changelog: @@ -71,5 +72,6 @@ beta3->beta4 changelog:
- BUGFIX: Fixed columns width problems in transfers lists due to hidden columns with non null size
- BUGFIX: The deleteThread now check if the path exists before trying to delete it
- BUGFIX: Finished list was refreshed even when main window was hidden (Hitted an assert)
- BUGFIX: Some fixes in bandwidth limiting per torrent
- I18N: Updated Chinese, Hungarian and Italian translations
- COSMETIC: Added our new baby mascot ("Draqoo") to About dialog

63
src/allocationDlg.h

@ -52,16 +52,22 @@ class BandwidthAllocationDialog : public QDialog, private Ui_bandwidth_dlg { @@ -52,16 +52,22 @@ class BandwidthAllocationDialog : public QDialog, private Ui_bandwidth_dlg {
if(!global){
unsigned int nbTorrents = hashes.size();
if(!nbTorrents) close();
int val;
int max;
int val = 0;
int max = -1;
if(nbTorrents == 1){
torrent_handle h = BTSession->getTorrentHandle(hashes.at(0));
if(uploadMode){
val = (int)(h.upload_limit() / 1024.);
max = (int)(BTSession->getSession()->upload_rate_limit() / 1024.);
if(h.upload_limit() > 0)
val = (int)(h.upload_limit() / 1024.);
if(BTSession->getSession()->upload_rate_limit() > 0)
max = (int)(BTSession->getSession()->upload_rate_limit() / 1024.);
}else{
val = (int)(h.download_limit() / 1024.);
max = (int)(BTSession->getSession()->download_rate_limit() / 1024.);
if(h.download_limit() > 0)
val = (int)(h.download_limit() / 1024.);
if(BTSession->getSession()->download_rate_limit() > 0){
qDebug("there is a global download rate limit at: %d kb/s", (int)(BTSession->getSession()->download_rate_limit() / 1024.));
max = (int)(BTSession->getSession()->download_rate_limit() / 1024.);
}
}
if(max != -1)
bandwidthSlider->setMaximum(max);
@ -69,9 +75,9 @@ class BandwidthAllocationDialog : public QDialog, private Ui_bandwidth_dlg { @@ -69,9 +75,9 @@ class BandwidthAllocationDialog : public QDialog, private Ui_bandwidth_dlg {
if(val > bandwidthSlider->maximum())
val = bandwidthSlider->maximum();
else if(val < bandwidthSlider->minimum())
val = -1;
val = 0;
bandwidthSlider->setValue(val);
if(val == -1) {
if(val == 0) {
limit_lbl->setText(tr("Unlimited", "Unlimited (bandwidth)"));
kb_lbl->setText("");
} else {
@ -79,20 +85,23 @@ class BandwidthAllocationDialog : public QDialog, private Ui_bandwidth_dlg { @@ -79,20 +85,23 @@ class BandwidthAllocationDialog : public QDialog, private Ui_bandwidth_dlg {
}
}else{
qDebug("More than one torrent selected, no initilization");
bandwidthSlider->setValue(-1);
bandwidthSlider->setValue(0);
limit_lbl->setText(tr("Unlimited", "Unlimited (bandwidth)"));
kb_lbl->setText("");
}
}else{
// Global limit
int val;
int val = 0;
session *s = BTSession->getSession();
if(uploadMode)
val = (int)(s->upload_rate_limit()/1024.);
else
val = (int)(s->download_rate_limit()/1024.);
if(val == -1){
bandwidthSlider->setValue(-1);
if(uploadMode){
if(s->upload_rate_limit() > 0)
val = (int)(s->upload_rate_limit()/1024.);
}else{
if(s->download_rate_limit() > 0)
val = (int)(s->download_rate_limit()/1024.);
}
if(val == 0){
bandwidthSlider->setValue(0);
limit_lbl->setText(tr("Unlimited", "Unlimited (bandwidth)"));
kb_lbl->setText("");
}else{
@ -109,7 +118,7 @@ class BandwidthAllocationDialog : public QDialog, private Ui_bandwidth_dlg { @@ -109,7 +118,7 @@ class BandwidthAllocationDialog : public QDialog, private Ui_bandwidth_dlg {
protected slots:
void updateBandwidthLabel(int val){
if(val == -1){
if(val == 0){
limit_lbl->setText(tr("Unlimited", "Unlimited (bandwidth)"));
kb_lbl->setText("");
}else{
@ -125,12 +134,18 @@ class BandwidthAllocationDialog : public QDialog, private Ui_bandwidth_dlg { @@ -125,12 +134,18 @@ class BandwidthAllocationDialog : public QDialog, private Ui_bandwidth_dlg {
QString hash;
if(uploadMode) {
foreach(hash, hashes) {
BTSession->setUploadLimit(hash, val*1024);
if(!val)
BTSession->setUploadLimit(hash, -1);
else
BTSession->setUploadLimit(hash, val*1024);
qDebug("Setting upload limit");
}
} else {
foreach(hash, hashes) {
BTSession->setDownloadLimit(hash, val*1024);
if(!val)
BTSession->setDownloadLimit(hash, -1);
else
BTSession->setDownloadLimit(hash, val*1024);
qDebug("Setting download limit");
}
}
@ -138,10 +153,16 @@ class BandwidthAllocationDialog : public QDialog, private Ui_bandwidth_dlg { @@ -138,10 +153,16 @@ class BandwidthAllocationDialog : public QDialog, private Ui_bandwidth_dlg {
QSettings settings("qBittorrent", "qBittorrent");
session *s = BTSession->getSession();
if(uploadMode){
s->set_upload_rate_limit(val*1024);
if(!val)
s->set_upload_rate_limit(-1);
else
s->set_upload_rate_limit(val*1024);
settings.setValue("Options/Main/UPLimit", val);
}else{
s->set_download_rate_limit(val*1024);
if(!val)
s->set_download_rate_limit(-1);
else
s->set_download_rate_limit(val*1024);
settings.setValue("Options/Main/DLLimit", val);
}
}

4
src/bandwidth_limit.ui

@ -66,13 +66,13 @@ @@ -66,13 +66,13 @@
<item>
<widget class="QSlider" name="bandwidthSlider" >
<property name="minimum" >
<number>-1</number>
<number>0</number>
</property>
<property name="maximum" >
<number>1000</number>
</property>
<property name="sliderPosition" >
<number>-1</number>
<number>0</number>
</property>
<property name="orientation" >
<enum>Qt::Horizontal</enum>

Loading…
Cancel
Save