Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-05-16 21:12:31 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

turtle tunnel management

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1289 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2009-06-03 18:47:14 +00:00
parent 2bd3899c05
commit 48218e98cb
14 changed files with 351 additions and 99 deletions
Download patch file Download diff file Expand all files Collapse all files

23
retroshare-gui/src/gui/TransfersDialog.cpp
View file

@ -611,9 +611,9 @@ void TransfersDialog::insertTransfers()
int dlPeers = 0;
for (pit = info.peers.begin(); pit != info.peers.end(); pit++) {
symbol = "";
name = QString::fromStdString(rsPeers->getPeerName(pit->peerId));
name = getPeerName(pit->peerId);
//unique combination: fileName + peerName, variant: hash + peerName (too long)
coreId = QString::fromStdString(info.fname + rsPeers->getPeerName(pit->peerId));
coreId = QString::fromStdString(info.fname) + getPeerName(pit->peerId);
fileSize = info.size;
progress = (info.transfered * 100.0) / info.size;
dlspeed = pit->tfRate * 1024.0;
@ -645,7 +645,7 @@ void TransfersDialog::insertTransfers()
continue;
/* if peers found in selectedIds, select again */
if (selectedIds.end() != std::find(selectedIds.begin(), selectedIds.end(), info.fname + rsPeers->getPeerName(pit->peerId))) {
if (selectedIds.end() != std::find(selectedIds.begin(), selectedIds.end(), info.fname + getPeerName(pit->peerId).toStdString())) {
QStandardItem *dlItem = DLListModel->item(addedRow);
QModelIndex childIndex = DLListModel->indexFromItem(dlItem).child(dlPeers, 0);
selection->select(childIndex, QItemSelectionModel::Rows | QItemSelectionModel::SelectCurrent);
@ -669,7 +669,7 @@ void TransfersDialog::insertTransfers()
symbol = "";
coreId = QString::fromStdString(info.hash);
name = QString::fromStdString(info.fname);
sources = QString::fromStdString(rsPeers->getPeerName(pit->peerId));
sources = getPeerName(pit->peerId);
switch(pit->status)
{
@ -749,6 +749,19 @@ void TransfersDialog::insertTransfers()
}
}
QString TransfersDialog::getPeerName(const std::string& id) const
{
QString res = QString::fromStdString(rsPeers->getPeerName(id)) ;
// This is because turtle tunnels have no name (I didn't want to bother with
// connect mgr). In such a case their id can suitably hold for a name.
//
if(res == "")
return QString::fromStdString(id) ;
else
return res ;
}
void TransfersDialog::cancel()
{
QString queryWrn2;
@ -764,11 +777,13 @@ void TransfersDialog::cancel()
if(selection->isRowSelected(i, QModelIndex()))
{
std::string id = getID(i, DLListModel).toStdString();
#ifdef UNUSED
QString qname = getFileName(i, DLListModel);
/* XXX -> Should not have to 'trim' filename ... something wrong here..
* but otherwise, not exact filename .... BUG
*/
std::string name = (qname.trimmed()).toStdString();
#endif
rsFiles->FileCancel(id); /* hash */
}

2
retroshare-gui/src/gui/TransfersDialog.h
View file

@ -74,6 +74,8 @@ class TransfersDialog : public MainPage
void playFiles(QStringList files);
private:
QString getPeerName(const std::string& peer_id) const ;
QStandardItemModel *DLListModel;
QStandardItemModel *ULListModel;
QItemSelectionModel *selection;

4
retroshare-gui/src/gui/TurtleSearchDialog.cpp
View file

@ -259,12 +259,14 @@ void TurtleSearchDialog::download()
"", 0, srcIds);
#endif
std::list<std::string> srcIds;
std::cout << "Issuing file request from search dialog: -"
<< (item->text(SR_NAME_COL)).toStdString() << "-"
<< (item->text(SR_HASH_COL)).toStdString() << "-"
<< (item->text(SR_REALSIZE_COL)).toInt() << std::endl ;
rsTurtle->turtleDownload(item->text(SR_NAME_COL).toStdString(),item->text(SR_HASH_COL).toStdString(),item->text(SR_REALSIZE_COL).toInt()) ;
rsTurtle->monitorFileTunnels(item->text(SR_NAME_COL).toStdString(),item->text(SR_HASH_COL).toStdString(),item->text(SR_REALSIZE_COL).toInt()) ;
rsFiles->FileRequest(item->text(SR_NAME_COL).toStdString(),item->text(SR_HASH_COL).toStdString(),item->text(SR_REALSIZE_COL).toInt(),"",0,srcIds) ;
}
}