Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-06-20 04:14:27 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merged revision 7165 from v0.5.5

Browse source 
Create a hard link for preview on Windows with the real name of the downloading file


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7309 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2014-04-28 23:20:29 +00:00
parent 4569c21cb0
commit 07e57836bf
5 changed files with 126 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

33
retroshare-gui/src/gui/FileTransfer/TransfersDialog.cpp
View file

@ -19,10 +19,6 @@
* Boston, MA 02110-1301, USA.
****************************************************************/
#ifdef WIN32
#include <windows.h>
#endif
#include <QMenu>
#include <QInputDialog>
#include <QFileDialog>
@ -55,6 +51,7 @@
#include <gui/common/RsCollectionFile.h>
#include "TransferUserNotify.h"
#include "util/QtVersion.h"
#include "util/RsFile.h"
#include <retroshare/rsfiles.h>
#include <retroshare/rspeers.h>
@ -1718,8 +1715,10 @@ void TransfersDialog::previewTransfer()
break;
}
QFileInfo fileNameInfo(QString::fromUtf8(info.fname.c_str()));
/* check if the file is a media file */
if (!misc::isPreviewable(QFileInfo(QString::fromUtf8(info.fname.c_str())).suffix())) return;
if (!misc::isPreviewable(fileNameInfo.suffix())) return;
/* make path for downloaded or downloading files */
QFileInfo fileInfo;
@ -1728,8 +1727,16 @@ void TransfersDialog::previewTransfer()
} else {
fileInfo = QFileInfo(QString::fromUtf8(rsFiles->getPartialsDirectory().c_str()), QString::fromUtf8(info.hash.toStdString().c_str()));
QString linkName = QFileInfo(QDir::temp(), QString::fromUtf8(info.fname.c_str())).absoluteFilePath();
if (QFile::link(fileInfo.absoluteFilePath(), linkName)) {
QDir temp;
#ifdef WINDOWS_SYS
/* the symbolic link must be created on the same drive like the real file, use partial directory */
temp = fileInfo.absoluteDir();
#else
temp = QDir::temp();
#endif
QString linkName = QFileInfo(temp, fileNameInfo.fileName()).absoluteFilePath();
if (RsFile::CreateLink(fileInfo.absoluteFilePath(), linkName)) {
fileInfo.setFile(linkName);
} else {
std::cerr << "previewTransfer(): can't create link for file " << fileInfo.absoluteFilePath().toStdString() << std::endl;
@ -1752,7 +1759,17 @@ void TransfersDialog::previewTransfer()
/* wait for the file to open then remove the link */
QMessageBox::information(this, tr("File preview"), tr("Click OK when program terminates!"));
}
QFile::remove(fileInfo.absoluteFilePath());
/* try to delete the preview file */
forever {
if (QFile::remove(fileInfo.absoluteFilePath())) {
/* preview file could be removed */
break;
}
/* ask user to try it again */
if (QMessageBox::question(this, tr("File preview"), QString("%1\n\n%2\n\n%3").arg(tr("Could not delete preview file"), fileInfo.absoluteFilePath(), tr("Try it again?")), QMessageBox::Yes, QMessageBox::No) == QMessageBox::No) {
break;
}
}
}
}