Browse Source

- Fixed folder progress calculation in torrent properties (closes #154387)

adaptive-webui-19844
Christophe Dumez 17 years ago
parent
commit
1519bca46d
  1. 1
      TODO
  2. 14
      src/arborescence.h
  3. 2
      src/bittorrent.cpp

1
TODO

@ -61,4 +61,5 @@ rc5->rc6 changelog: @@ -61,4 +61,5 @@ rc5->rc6 changelog:
- BUGFIX: configure looks for libraries in lib64 folders too
- BUGFIX: configure doesn't require paths with a terminal "/" anymore
- BUGFIX: Fixed minimize to tray feature
- BUGFIX: Fixed folders progress calculation in torrent properties
- I18N: Fixed swedish, French, Spanish translations

14
src/arborescence.h

@ -62,12 +62,20 @@ class file { @@ -62,12 +62,20 @@ class file {
void updateProgress() {
Q_ASSERT(is_dir);
float sum = 0;
if(children.isEmpty()) {
progress = 0.;
return;
}
float wanted = 0.;
float done = 0.;
file *child;
foreach(child, children) {
sum += child->getProgress();
wanted += child->getSize();
done += child->getSize()*child->getProgress();
}
progress = sum / (float)children.size();
progress = done / wanted;
Q_ASSERT(progress >= 0.);
Q_ASSERT(progress <= 1.);
}
void updatePriority(int prio) {

2
src/bittorrent.cpp

@ -154,8 +154,8 @@ void bittorrent::updateETAs() { @@ -154,8 +154,8 @@ void bittorrent::updateETAs() {
Q_ASSERT(nbETAs);
foreach(val, listEtas) {
moy += (qlonglong)((double)val/(double)nbETAs);
Q_ASSERT(moy >= 0);
}
Q_ASSERT(moy >= 0);
ETAs[hash] = moy;
} else {
// Speed is too low, we don't want an overflow.

Loading…
Cancel
Save