#42 CRemoteFile name can include directory path components

This commit is contained in:
Mat Sutcliffe
2020-07-03 21:05:37 +01:00
parent 5ad0e83cea
commit eae0f5c008
3 changed files with 10 additions and 7 deletions

View File

@@ -197,7 +197,7 @@ namespace BlackGui
this->showStartedFileMessage(remoteFile);
m_fileInProgress = remoteFile;
const QString saveAsFile = CFileUtils::appendFilePaths(ui->le_DownloadDir->text(), remoteFile.getName());
const QString saveAsFile = CFileUtils::appendFilePaths(ui->le_DownloadDir->text(), remoteFile.getBaseName());
const QFileInfo fiSaveAs(saveAsFile);
if (fiSaveAs.exists())
{
@@ -294,7 +294,7 @@ namespace BlackGui
for (const CRemoteFile &rf : executables)
{
const QString executable = CFileUtils::appendFilePaths(dir.absolutePath(), rf.getName());
const QString executable = CFileUtils::appendFilePaths(dir.absolutePath(), rf.getBaseName());
const QFile executableFile(executable);
if (!executableFile.exists()) { continue; }
@@ -360,7 +360,7 @@ namespace BlackGui
void CDownloadComponent::showStartedFileMessage(const CRemoteFile &rf)
{
const int current = m_remoteFiles.size() - m_waitingForDownload.size();
ui->le_Started->setText(rf.getName());
ui->le_Started->setText(rf.getBaseName());
ui->le_StartedNumber->setText(QStringLiteral("%1/%2").arg(current).arg(m_remoteFiles.size()));
ui->le_StartedUrl->setText(rf.getUrl().getFullUrl());
ui->prb_Total->setMaximum(m_remoteFiles.size());
@@ -370,7 +370,7 @@ namespace BlackGui
void CDownloadComponent::showCompletedFileMessage(const CRemoteFile &rf)
{
const int current = m_remoteFiles.size() - m_waitingForDownload.size();
ui->le_Completed->setText(rf.getName());
ui->le_Completed->setText(rf.getBaseName());
ui->le_CompletedNumber->setText(QStringLiteral("%1/%2").arg(current).arg(m_remoteFiles.size()));
ui->le_CompletedUrl->setText(rf.getUrl().getFullUrl());
ui->prb_Total->setMaximum(m_remoteFiles.size());