mirrors/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2024-11-23 17:56:50 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fix and improve file priorities editing

Browse source
This commit is contained in:
Christophe Dumez 2010-10-31 16:05:59 +00:00
parent 390508e7db
commit 658d876ff7
5 changed files with 69 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/properties/propertieswidget.cpp
View file

@ -676,7 +676,7 @@ void PropertiesWidget::renameSelectedFile() {
} }
bool PropertiesWidget::applyPriorities() { bool PropertiesWidget::applyPriorities() {
qDebug("Saving pieces priorities"); qDebug("Saving files priorities");
const std::vector<int> priorities = PropListModel->getFilesPriorities(h.get_torrent_info().num_files()); const std::vector<int> priorities = PropListModel->getFilesPriorities(h.get_torrent_info().num_files());
bool first_last_piece_first = false; bool first_last_piece_first = false;
// Save first/last piece first option state // Save first/last piece first option state

7
src/properties/proplistdelegate.h
View file

@ -96,6 +96,9 @@ public:
QItemDelegate::drawBackground(painter, opt, index); QItemDelegate::drawBackground(painter, opt, index);
QString text = ""; QString text = "";
switch(index.data().toInt()) { switch(index.data().toInt()) {
case -1:
text = tr("Mixed", "Mixed (priorities");
break;
case 0: case 0:
text = tr("Not downloaded"); text = tr("Not downloaded");
break; break;
@ -151,8 +154,8 @@ public:
QTorrentHandle h = properties->getCurrentTorrent(); QTorrentHandle h = properties->getCurrentTorrent();
if(!h.is_valid() || static_cast<torrent_handle>(h).is_seed() || !h.has_metadata()) return 0; if(!h.is_valid() || static_cast<torrent_handle>(h).is_seed() || !h.has_metadata()) return 0;
} }
if(index.data().toInt() == 0) { if(index.data().toInt() <= 0) {
// IGNORED // IGNORED or MIXED
return 0; return 0;
} }
QComboBox* editor = new QComboBox(parent); QComboBox* editor = new QComboBox(parent);

1
src/qtlibtorrent/qtorrenthandle.cpp
View file

@ -474,6 +474,7 @@ void QTorrentHandle::add_url_seed(QString seed) {
void QTorrentHandle::prioritize_files(const std::vector<int> &v) { void QTorrentHandle::prioritize_files(const std::vector<int> &v) {
// Does not do anything for seeding torrents // Does not do anything for seeding torrents
Q_ASSERT(torrent_handle::is_valid()); Q_ASSERT(torrent_handle::is_valid());
Q_ASSERT(v.size() == (unsigned int)torrent_handle::get_torrent_info().num_files());
if(v.size() != (unsigned int)torrent_handle::get_torrent_info().num_files()) if(v.size() != (unsigned int)torrent_handle::get_torrent_info().num_files())
return; return;
bool was_seed = is_seed(); bool was_seed = is_seed();

106
src/torrentfilesmodel.h
View file

@ -42,11 +42,12 @@
#include "misc.h" #include "misc.h"
using namespace libtorrent; using namespace libtorrent;
enum FilePriority {IGNORED=0, NORMAL=1, HIGH=2, MAXIMUM=7}; enum FilePriority {IGNORED=0, NORMAL=1, HIGH=2, MAXIMUM=7, PARTIAL=-1};
enum TreeItemType {TFILE, FOLDER, ROOT}; enum TreeItemType {TFILE, FOLDER, ROOT};
class TreeItem { class TreeItem {
private:
public:
enum TreeItemColumns {COL_NAME, COL_SIZE, COL_PROGRESS, COL_PRIO}; enum TreeItemColumns {COL_NAME, COL_SIZE, COL_PROGRESS, COL_PRIO};
private: private:
@ -127,27 +128,27 @@ public:
Q_ASSERT(childItems.empty()); Q_ASSERT(childItems.empty());
} }
const QList<TreeItem*>& children() const { QList<TreeItem*> children() const {
return childItems; return childItems;
} }
QString getName() const { QString getName() const {
//Q_ASSERT(type != ROOT); //Q_ASSERT(type != ROOT);
return itemData.first().toString(); return itemData.at(COL_NAME).toString();
} }
void setName(QString name) { void setName(QString name) {
Q_ASSERT(type != ROOT); Q_ASSERT(type != ROOT);
itemData.replace(0, name); itemData.replace(COL_NAME, name);
} }
qulonglong getSize() const { qulonglong getSize() const {
return itemData.value(1).toULongLong(); return itemData.value(COL_SIZE).toULongLong();
} }
void setSize(qulonglong size) { void setSize(qulonglong size) {
if(getSize() == size) return; if(getSize() == size) return;
itemData.replace(1, (qulonglong)size); itemData.replace(COL_SIZE, (qulonglong)size);
if(parentItem) if(parentItem)
parentItem->updateSize(); parentItem->updateSize();
} }
@ -157,7 +158,7 @@ public:
Q_ASSERT(type == FOLDER); Q_ASSERT(type == FOLDER);
qulonglong size = 0; qulonglong size = 0;
foreach(TreeItem* child, childItems) { foreach(TreeItem* child, childItems) {
if(child->getPriority() > 0) if(child->getPriority() != IGNORED)
size += child->getSize(); size += child->getSize();
} }
setSize(size); setSize(size);
@ -173,7 +174,7 @@ public:
else else
progress = 1.; progress = 1.;
Q_ASSERT(progress >= 0. && progress <= 1.); Q_ASSERT(progress >= 0. && progress <= 1.);
itemData.replace(2, progress); itemData.replace(COL_PROGRESS, progress);
if(parentItem) if(parentItem)
parentItem->updateProgress(); parentItem->updateProgress();
} }
@ -203,50 +204,58 @@ public:
} }
int getPriority() const { int getPriority() const {
return itemData.value(3).toInt(); return itemData.value(COL_PRIO).toInt();
} }
void setPriority(int new_prio, bool update_children=true, bool update_parent=true) { void setPriority(int new_prio, bool update_parent=true) {
int old_prio = getPriority(); Q_ASSERT(new_prio != PARTIAL || type == FOLDER); // PARTIAL only applies to folders
if(old_prio != new_prio) { const int old_prio = getPriority();
qDebug("setPriority(%s, %d)", qPrintable(getName()), new_prio); if(old_prio == new_prio) return;
itemData.replace(3, new_prio); qDebug("setPriority(%s, %d)", qPrintable(getName()), new_prio);
// Update parent itemData.replace(COL_PRIO, new_prio);
if(update_parent && parentItem) {
parentItem->updateSize(); // Update parent
parentItem->updateProgress(); if(update_parent && parentItem) {
parentItem->updatePriority(); qDebug("Updating parent item");
} parentItem->updateSize();
parentItem->updateProgress();
parentItem->updatePriority();
} }
// Update children // Update children
if(update_children) { if(new_prio != PARTIAL && !childItems.empty()) {
qDebug("Updating children items");
foreach(TreeItem* child, childItems) { foreach(TreeItem* child, childItems) {
child->setPriority(new_prio, true, false); // Do not update the parent since
// the parent is causing the update
child->setPriority(new_prio, false);
} }
} }
if(type==FOLDER) { if(type == FOLDER) {
updateSize(); updateSize();
updateProgress(); updateProgress();
} }
} }
// Only non-root folders use this function
void updatePriority() { void updatePriority() {
if(type == ROOT) return; if(type == ROOT) return;
Q_ASSERT(type == FOLDER); Q_ASSERT(type == FOLDER);
int priority = getPriority(); if(childItems.isEmpty()) return;
bool first = true; // If all children have the same priority
foreach(TreeItem* child, childItems) { // then the folder should have the same
if(first) { // priority
priority = child->getPriority(); const int prio = childItems.first()->getPriority();
first = false; for(int i=1; i<childItems.size(); ++i) {
} else { if(childItems.at(i)->getPriority() != prio) {
if(child->getPriority() != priority) { setPriority(PARTIAL);
setPriority(NORMAL, false); return;
return;
}
} }
} }
setPriority(priority); // All child items have the same priorrity
// Update mine if necessary
if(prio != getPriority())
setPriority(prio);
} }
TreeItem* childWithName(QString name) const { TreeItem* childWithName(QString name) const {
@ -366,13 +375,16 @@ public:
bool setData(const QModelIndex & index, const QVariant & value, int role = Qt::EditRole) { bool setData(const QModelIndex & index, const QVariant & value, int role = Qt::EditRole) {
if(!index.isValid()) return false; if(!index.isValid()) return false;
if (role == Qt::CheckStateRole) { if (index.column() == 0 && role == Qt::CheckStateRole) {
TreeItem *item = static_cast<TreeItem*>(index.internalPointer()); TreeItem *item = static_cast<TreeItem*>(index.internalPointer());
qDebug("setData(%s, %d", qPrintable(item->getName()), value.toInt());
if(item->getPriority() != value.toInt()) { if(item->getPriority() != value.toInt()) {
if(value.toInt() == Qt::Checked) if(value.toInt() == Qt::PartiallyChecked)
item->setPriority(NORMAL); item->setPriority(PARTIAL);
else else if (value.toInt() == Qt::Unchecked)
item->setPriority(IGNORED); item->setPriority(IGNORED);
else
item->setPriority(NORMAL);
emit filteredFilesChanged(); emit filteredFilesChanged();
emit dataChanged(this->index(0,0), this->index(rowCount(), 0)); emit dataChanged(this->index(0,0), this->index(rowCount(), 0));
} }
@ -402,8 +414,8 @@ public:
return false; return false;
} }
TreeItemType getType(const QModelIndex &index) { TreeItemType getType(const QModelIndex &index) const {
TreeItem *item = static_cast<TreeItem*>(index.internalPointer()); const TreeItem *item = static_cast<const TreeItem*>(index.internalPointer());
return item->getType(); return item->getType();
} }
@ -422,9 +434,11 @@ public:
else else
return QIcon(":/Icons/oxygen/file.png"); return QIcon(":/Icons/oxygen/file.png");
} }
if(role == Qt::CheckStateRole) { if(index.column() == 0 && role == Qt::CheckStateRole) {
if(item->data(3).toInt() == IGNORED) if(item->data(TreeItem::COL_PRIO).toInt() == IGNORED)
return Qt::Unchecked; return Qt::Unchecked;
if(item->data(TreeItem::COL_PRIO).toInt() == PARTIAL)
return Qt::PartiallyChecked;
return Qt::Checked; return Qt::Checked;
} }
if (role != Qt::DisplayRole) if (role != Qt::DisplayRole)
@ -436,7 +450,8 @@ public:
Qt::ItemFlags flags(const QModelIndex &index) const { Qt::ItemFlags flags(const QModelIndex &index) const {
if (!index.isValid()) if (!index.isValid())
return 0; return 0;
if(getType(index) == FOLDER)
return Qt::ItemIsEditable | Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsUserCheckable | Qt::ItemIsTristate;
return Qt::ItemIsEditable | Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsUserCheckable; return Qt::ItemIsEditable | Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsUserCheckable;
} }
@ -508,6 +523,7 @@ public:
qDebug("setup model data called"); qDebug("setup model data called");
if(t.num_files() == 0) return; if(t.num_files() == 0) return;
// Initialize files_index array // Initialize files_index array
qDebug("Torrent contains %d files", t.num_files());
files_index = new TreeItem*[t.num_files()]; files_index = new TreeItem*[t.num_files()];
TreeItem *parent = this->rootItem; TreeItem *parent = this->rootItem;

1
src/torrentpersistentdata.h
View file

@ -33,6 +33,7 @@
#include <QVariant> #include <QVariant>
#include <QDateTime> #include <QDateTime>
#include <QDebug>
#include <libtorrent/version.hpp> #include <libtorrent/version.hpp>
#include <libtorrent/magnet_uri.hpp> #include <libtorrent/magnet_uri.hpp>
#include "qtorrenthandle.h" #include "qtorrenthandle.h"