flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-27 02:55:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

#42 CRemoteFile name can include directory path components

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

8
src/blackgui/components/downloadcomponent.cpp
View File

@@ -197,7 +197,7 @@ namespace BlackGui
this->showStartedFileMessage(remoteFile); this->showStartedFileMessage(remoteFile);
m_fileInProgress = 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); const QFileInfo fiSaveAs(saveAsFile);
if (fiSaveAs.exists()) if (fiSaveAs.exists())
{ {
@@ -294,7 +294,7 @@ namespace BlackGui
for (const CRemoteFile &rf : executables) 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); const QFile executableFile(executable);
if (!executableFile.exists()) { continue; } if (!executableFile.exists()) { continue; }
@@ -360,7 +360,7 @@ namespace BlackGui
void CDownloadComponent::showStartedFileMessage(const CRemoteFile &rf) void CDownloadComponent::showStartedFileMessage(const CRemoteFile &rf)
{ {
const int current = m_remoteFiles.size() - m_waitingForDownload.size(); 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_StartedNumber->setText(QStringLiteral("%1/%2").arg(current).arg(m_remoteFiles.size()));
ui->le_StartedUrl->setText(rf.getUrl().getFullUrl()); ui->le_StartedUrl->setText(rf.getUrl().getFullUrl());
ui->prb_Total->setMaximum(m_remoteFiles.size()); ui->prb_Total->setMaximum(m_remoteFiles.size());
@@ -370,7 +370,7 @@ namespace BlackGui
void CDownloadComponent::showCompletedFileMessage(const CRemoteFile &rf) void CDownloadComponent::showCompletedFileMessage(const CRemoteFile &rf)
{ {
const int current = m_remoteFiles.size() - m_waitingForDownload.size(); 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_CompletedNumber->setText(QStringLiteral("%1/%2").arg(current).arg(m_remoteFiles.size()));
ui->le_CompletedUrl->setText(rf.getUrl().getFullUrl()); ui->le_CompletedUrl->setText(rf.getUrl().getFullUrl());
ui->prb_Total->setMaximum(m_remoteFiles.size()); ui->prb_Total->setMaximum(m_remoteFiles.size());

6
src/blackmisc/network/remotefile.cpp
View File

@@ -36,9 +36,9 @@ namespace BlackMisc
bool CRemoteFile::matchesName(const QString &name) const bool CRemoteFile::matchesName(const QString &name) const
{ {
if (name.isEmpty()) { return false; } if (name.isEmpty()) { return false; }
if (caseInsensitiveStringCompare(name, this->getName())) { return true; } if (caseInsensitiveStringCompare(name, this->getBaseName())) { return true; }
if (name.startsWith(this->getName(), Qt::CaseInsensitive)) { return true; } if (name.startsWith(this->getBaseName(), Qt::CaseInsensitive)) { return true; }
if (this->getName().startsWith(name, Qt::CaseInsensitive)) { return true; } if (this->getBaseName().startsWith(name, Qt::CaseInsensitive)) { return true; }
return false; return false;
} }

3
src/blackmisc/network/remotefile.h
View File

@@ -59,6 +59,9 @@ namespace BlackMisc
//! Name //! Name
const QString &getName() const { return m_name; } const QString &getName() const { return m_name; }
//! Name with directory stripped
QString getBaseName() const { return m_name.section('/', -1); }
//! Has name? //! Has name?
bool hasName() const { return !m_name.isEmpty(); } bool hasName() const { return !m_name.isEmpty(); }