Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-15 10:54:22 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

suppressed bug in dynamic removal of sources. suppressed bug in string search. Suppressed some warnings.

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2497 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2010-03-07 14:10:51 +00:00
parent ade3e50b3d
commit 1c2683f613
2 changed files with 36 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
retroshare-gui/src/gui/TransfersDialog.cpp
View File

@ -248,7 +248,8 @@ void TransfersDialog::downloadListCostumPopupMenu( QPoint point )
addOpenFileOption = true; addOpenFileOption = true;
size_t pos = info.fname.find_last_of('.'); size_t pos = info.fname.find_last_of('.');
if (pos == -1) return; /* can't identify type of file */
if (pos == std::string::npos) return; /* can't identify type of file */
/* check if the file is a media file */ /* check if the file is a media file */
if (misc::isPreviewable(info.fname.substr(pos + 1).c_str())) if (misc::isPreviewable(info.fname.substr(pos + 1).c_str()))
@ -267,7 +268,6 @@ void TransfersDialog::downloadListCostumPopupMenu( QPoint point )
connect( playAct , SIGNAL( triggered() ), this, SLOT( openTransfer() ) ); connect( playAct , SIGNAL( triggered() ), this, SLOT( openTransfer() ) );
} }
QAction *detailsAct = NULL;
pauseAct = new QAction(QIcon(IMAGE_PAUSE), tr("Pause"), this); pauseAct = new QAction(QIcon(IMAGE_PAUSE), tr("Pause"), this);
connect(pauseAct, SIGNAL(triggered()), this, SLOT(pauseFileTransfer())); connect(pauseAct, SIGNAL(triggered()), this, SLOT(pauseFileTransfer()));
@ -368,10 +368,12 @@ void TransfersDialog::downloadListCostumPopupMenu( QPoint point )
all_paused = false ; all_paused = false ;
if ( lst[i].column() == 0) if ( lst[i].column() == 0)
{
if(lst[i].model ()->data (lst[i].model ()->index (lst[i].row (), STATUS )).toString() == "Queued") if(lst[i].model ()->data (lst[i].model ()->index (lst[i].row (), STATUS )).toString() == "Queued")
all_downloading = false ; all_downloading = false ;
else else
all_queued = false ; all_queued = false ;
}
} }
if(all_downloading) if(all_downloading)
@ -426,12 +428,11 @@ TransfersDialog::~TransfersDialog()
} }
int TransfersDialog::addItem(const QString& symbol, const QString& name, const QString& coreID, qlonglong fileSize, const FileProgressInfo& pinfo, double dlspeed, int TransfersDialog::addItem(const QString&, const QString& name, const QString& coreID, qlonglong fileSize, const FileProgressInfo& pinfo, double dlspeed,
const QString& sources, const QString& status, const QString& priority, qlonglong completed, qlonglong remaining, qlonglong downloadtime) const QString& sources, const QString& status, const QString& priority, qlonglong completed, qlonglong remaining, qlonglong downloadtime)
{ {
int row; int row;
QList<QStandardItem *> list = DLListModel->findItems(coreID, Qt::MatchExactly, ID); QList<QStandardItem *> list = DLListModel->findItems(coreID, Qt::MatchExactly, ID);
QStandardItem* item;
if (list.size() > 0) { if (list.size() > 0) {
row = list.front()->row(); row = list.front()->row();
} else { } else {
@ -486,10 +487,10 @@ int TransfersDialog::addItem(const QString& symbol, const QString& name, const Q
return row; return row;
} }
bool TransfersDialog::addPeerToItem(int row, const QString& name, const QString& coreID, double dlspeed, const QString& status, const FileProgressInfo& peerInfo) int TransfersDialog::addPeerToItem(int row, const QString& name, const QString& coreID, double dlspeed, const QString& status, const FileProgressInfo& peerInfo)
{ {
QStandardItem *dlItem = DLListModel->item(row); QStandardItem *dlItem = DLListModel->item(row);
if (!dlItem) return false; if (!dlItem) return -1;
//try to find the item //try to find the item
int childRow = -1; int childRow = -1;
@ -497,14 +498,12 @@ bool TransfersDialog::addPeerToItem(int row, const QString& name, const QString&
QStandardItem* childId=NULL ; QStandardItem* childId=NULL ;
for(count=0; (childId = dlItem->child(count, ID)) != NULL;++count) for(count=0; (childId = dlItem->child(count, ID)) != NULL;++count)
{
std::cerr << "data = " << childId->data(Qt::DisplayRole).toString().toStdString() << ", compared to " << coreID.toStdString() << std::endl ;
if (childId->data(Qt::DisplayRole).toString() == coreID) if (childId->data(Qt::DisplayRole).toString() == coreID)
{ {
childRow = count; childRow = count;
break; break;
} }
}
if (childRow == -1) { if (childRow == -1) {
//set this false if you want to expand on double click //set this false if you want to expand on double click
dlItem->setEditable(false); dlItem->setEditable(false);
@ -548,6 +547,8 @@ bool TransfersDialog::addPeerToItem(int row, const QString& name, const QString&
items.append(i10); items.append(i10);
items.append(i11); items.append(i11);
dlItem->appendRow(items); dlItem->appendRow(items);
childRow = dlItem->rowCount()-1 ;
} else { } else {
//just update the child (peer) //just update the child (peer)
dlItem->child(childRow, DLSPEED)->setData(QVariant((double)dlspeed), Qt::DisplayRole); dlItem->child(childRow, DLSPEED)->setData(QVariant((double)dlspeed), Qt::DisplayRole);
@ -568,15 +569,14 @@ bool TransfersDialog::addPeerToItem(int row, const QString& name, const QString&
} }
} }
return true; return childRow;
} }
int TransfersDialog::addUploadItem(const QString& symbol, const QString& name, const QString& coreID, qlonglong fileSize, const FileProgressInfo& pinfo, double dlspeed, const QString& source, const QString& status, qlonglong completed, qlonglong remaining) int TransfersDialog::addUploadItem(const QString&, const QString& name, const QString& coreID, qlonglong fileSize, const FileProgressInfo& pinfo, double dlspeed, const QString& source, const QString& status, qlonglong completed, qlonglong)
{ {
int row; int row;
QList<QStandardItem *> list = ULListModel->findItems(coreID, Qt::MatchExactly, UHASH); QList<QStandardItem *> list = ULListModel->findItems(coreID, Qt::MatchExactly, UHASH);
QStandardItem* item;
if (list.size() > 0) { if (list.size() > 0) {
row = list.front()->row(); row = list.front()->row();
} else { } else {
@ -669,7 +669,6 @@ void TransfersDialog::insertTransfers()
QString fileName = QString::fromUtf8(info.fname.c_str()); QString fileName = QString::fromUtf8(info.fname.c_str());
QString fileHash = QString::fromStdString(info.hash); QString fileHash = QString::fromStdString(info.hash);
qlonglong fileSize = info.size; qlonglong fileSize = info.size;
double fileProgress = (info.transfered * 100.0) / info.size;
double fileDlspeed = info.tfRate * 1024.0; double fileDlspeed = info.tfRate * 1024.0;
/* get the sources (number of online peers) */ /* get the sources (number of online peers) */
@ -729,7 +728,10 @@ void TransfersDialog::insertTransfers()
std::map<std::string, std::string> versions; std::map<std::string, std::string> versions;
bool retv = rsDisc->getDiscVersions(versions); bool retv = rsDisc->getDiscVersions(versions);
for (pit = info.peers.begin(); pit != info.peers.end(); pit++) { std::set<int> used_rows ;
for (pit = info.peers.begin(); pit != info.peers.end(); pit++)
{
QString peerName = getPeerName(pit->peerId); QString peerName = getPeerName(pit->peerId);
//unique combination: fileHash + peerId, variant: hash + peerName (too long) //unique combination: fileHash + peerId, variant: hash + peerName (too long)
QString hashFileAndPeerId = fileHash + QString::fromStdString(pit->peerId); QString hashFileAndPeerId = fileHash + QString::fromStdString(pit->peerId);
@ -748,7 +750,8 @@ void TransfersDialog::insertTransfers()
default: status = tr(""); break; default: status = tr(""); break;
} }
double peerDlspeed = 0; double peerDlspeed = 0;
if (pit->status == FT_STATE_DOWNLOADING) { if ((uint32_t)pit->status == FT_STATE_DOWNLOADING)
{
peerDlspeed = pit->tfRate * 1024.0; peerDlspeed = pit->tfRate * 1024.0;
} }
@ -766,8 +769,19 @@ void TransfersDialog::insertTransfers()
// std::cerr << std::endl ; // std::cerr << std::endl ;
std::cout << "adding peer " << peerName.toStdString() << " to row " << addedRow << ", hashfile and peerid=" << hashFileAndPeerId.toStdString() << std::endl ; std::cout << "adding peer " << peerName.toStdString() << " to row " << addedRow << ", hashfile and peerid=" << hashFileAndPeerId.toStdString() << std::endl ;
addPeerToItem(addedRow, peerName, hashFileAndPeerId, peerDlspeed, status, peerpinfo); int row_id = addPeerToItem(addedRow, peerName, hashFileAndPeerId, peerDlspeed, status, peerpinfo);
used_rows.insert(row_id) ;
} }
QStandardItem *dlItem = DLListModel->item(addedRow);
// This is not optimal, but we deal with a small number of elements. The reverse order is really important,
// because rows after the deleted rows change positions !
//
for(int r=dlItem->rowCount()-1;r>=0;--r)
if(used_rows.find(r) == used_rows.end())
dlItem->takeRow(r) ;
} }
/* here i will insert files from the download queue - which are /* here i will insert files from the download queue - which are
@ -1186,7 +1200,8 @@ void TransfersDialog::previewTransfer()
} }
size_t pos = info.fname.find_last_of('.'); size_t pos = info.fname.find_last_of('.');
if (pos == -1) return; /* can't identify type of file */ if (pos == std::string::npos)
return; /* can't identify type of file */
/* check if the file is a media file */ /* check if the file is a media file */
if (!misc::isPreviewable(info.fname.substr(pos + 1).c_str())) return; if (!misc::isPreviewable(info.fname.substr(pos + 1).c_str())) return;
@ -1389,7 +1404,7 @@ void TransfersDialog::showFileDetails()
std::cout << "done" << std::endl ; std::cout << "done" << std::endl ;
} }
double TransfersDialog::getProgress(int row, QStandardItemModel *model) double TransfersDialog::getProgress(int , QStandardItemModel *)
{ {
// return model->data(model->index(row, PROGRESS), Qt::DisplayRole).toDouble(); // return model->data(model->index(row, PROGRESS), Qt::DisplayRole).toDouble();
return 0.0 ; return 0.0 ;

4
retroshare-gui/src/gui/TransfersDialog.h
View File

@ -171,8 +171,10 @@ private:
Ui::TransfersDialog ui; Ui::TransfersDialog ui;
public slots: public slots:
// these two functions add entries to the transfers dialog, and return the row id of the entry modified/added
//
int addItem(const QString& symbol, const QString& name, const QString& coreID, qlonglong size, const FileProgressInfo& pinfo, double dlspeed, const QString& sources, const QString& status, const QString& priority, qlonglong completed, qlonglong remaining, qlonglong downloadtime); int addItem(const QString& symbol, const QString& name, const QString& coreID, qlonglong size, const FileProgressInfo& pinfo, double dlspeed, const QString& sources, const QString& status, const QString& priority, qlonglong completed, qlonglong remaining, qlonglong downloadtime);
bool addPeerToItem(int row, const QString& name, const QString& coreID, double dlspeed, const QString& status, const FileProgressInfo& peerInfo); int addPeerToItem(int row, const QString& name, const QString& coreID, double dlspeed, const QString& status, const FileProgressInfo& peerInfo);
void delItem(int row); void delItem(int row);
int addUploadItem(const QString& symbol, const QString& name, const QString& coreID, qlonglong size, const FileProgressInfo& pinfo, double dlspeed, const QString& sources, const QString& status, qlonglong completed, qlonglong remaining); int addUploadItem(const QString& symbol, const QString& name, const QString& coreID, qlonglong size, const FileProgressInfo& pinfo, double dlspeed, const QString& sources, const QString& status, qlonglong completed, qlonglong remaining);