d4708/qBittorrent
1
0
Fork 0
mirror of https://github.com/d47081/qBittorrent.git synced 2025-01-25 14:04:23 +00:00
Code Issues Projects Releases Wiki Activity

- Try to make progress calculation more robust in torrent files model

Browse Source
This commit is contained in:
Christophe Dumez 2009-11-29 20:29:40 +00:00
parent ecf48b3a7b
commit c5a9e27cb3
1 changed files with 28 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/torrentfilesmodel.h
View File

@ -49,6 +49,7 @@ private:
QList<QVariant> itemData; QList<QVariant> itemData;
TreeItem *parentItem; TreeItem *parentItem;
TreeItemType type; TreeItemType type;
qulonglong total_done;
public: public:
// File Construction // File Construction
@ -60,6 +61,7 @@ public:
qDebug("Created a TreeItem file with name %s", getName().toLocal8Bit().data()); qDebug("Created a TreeItem file with name %s", getName().toLocal8Bit().data());
qDebug("parent is %s", parent->getName().toLocal8Bit().data()); qDebug("parent is %s", parent->getName().toLocal8Bit().data());
itemData << QVariant((qulonglong)f.size); itemData << QVariant((qulonglong)f.size);
total_done = 0;
itemData << 0.; // Progress; itemData << 0.; // Progress;
itemData << 1; // Priority itemData << 1; // Priority
if(parent) { if(parent) {
@ -75,6 +77,7 @@ public:
itemData << name; itemData << name;
itemData << 0.; // Size itemData << 0.; // Size
itemData << 0.; // Progress; itemData << 0.; // Progress;
total_done = 0;
itemData << 1; // Priority itemData << 1; // Priority
if(parent) { if(parent) {
parent->appendChild(this); parent->appendChild(this);
@ -85,6 +88,7 @@ public:
parentItem = 0; parentItem = 0;
type = ROOT; type = ROOT;
itemData = data; itemData = data;
total_done = 0;
} }
~TreeItem() { ~TreeItem() {
@ -134,32 +138,42 @@ public:
setSize(size); setSize(size);
} }
void setProgress(float progress) { void setProgress(qulonglong done) {
if(progress == getProgress()) return; if(done == total_done) return;
total_done = done;
qulonglong size = getSize();
Q_ASSERT(total_done <= size);
float progress;
if(size > 0)
progress = total_done/(float)size;
else
progress = 1.;
Q_ASSERT(progress >= 0. && progress <= 1.); Q_ASSERT(progress >= 0. && progress <= 1.);
itemData.replace(2, progress); itemData.replace(2, progress);
if(parentItem) if(parentItem)
parentItem->updateProgress(); parentItem->updateProgress();
} }
qulonglong getTotalDone() const {
return total_done;
}
float getProgress() const { float getProgress() const {
return itemData.value(2).toDouble(); qulonglong size = getSize();
if(size > 0)
return total_done/(float)getSize();
return 1.;
} }
void updateProgress() { void updateProgress() {
if(type == ROOT) return; if(type == ROOT) return;
Q_ASSERT(type == FOLDER); Q_ASSERT(type == FOLDER);
size_t total_size = 0; total_done = 0;
size_t total_done = 0;
foreach(TreeItem* child, childItems) { foreach(TreeItem* child, childItems) {
size_t size = child->getSize(); total_done += child->getTotalDone();
total_size += size;
total_done += size*child->getProgress();
} }
if(total_size == 0) Q_ASSERT(total_done <= getSize());
setProgress(1.); setProgress(total_done);
else
setProgress((float)total_done/(float)total_size);
} }
int getPriority() const { int getPriority() const {
@ -272,11 +286,8 @@ public:
void updateFilesProgress(std::vector<size_type> fp) { void updateFilesProgress(std::vector<size_type> fp) {
for(unsigned int i=0; i<fp.size(); ++i) { for(unsigned int i=0; i<fp.size(); ++i) {
TreeItem *item = files_index[i]; Q_ASSERT(fp[i] >= 0);
if(item->getSize() > 0) files_index[i]->setProgress(fp[i]);
item->setProgress((float)fp[i]/(float)item->getSize());
else
item->setProgress(1.); // Empty file...
} }
emit layoutChanged(); emit layoutChanged();
} }