Fixes an issue reported by @rphohl that XSwiftBus is not found

* only download non-restricted versions
* utility functions to find non-restricted versions
This commit is contained in:
Klaus Basan
2018-01-29 07:52:20 +01:00
parent 39533a7508
commit c6b942dc15
7 changed files with 29 additions and 3 deletions

View File

@@ -200,7 +200,9 @@ namespace BlackGui
{
const CUpdateInfo updateInfo = m_updates.get();
if (updateInfo.getArtifactsXSwiftBus().isEmpty()) { return; }
const CArtifactList artifacts = updateInfo.getArtifactsXSwiftBusLatestVersionFirst();
const CArtifactList artifacts = updateInfo.getArtifactsXSwiftBusLatestVersionFirst().findWithUnrestrictedDistributions();
if (artifacts.isEmpty()) { return; }
const CRemoteFileList remoteFiles = artifacts.asRemoteFiles();
if (!remoteFiles.isEmpty())
{

View File

@@ -183,9 +183,10 @@ namespace BlackGui
const CDistribution selectedDistribution(this->getSelectedOrDefaultDistribution());
const CPlatform selectedPlatform(this->getSelectedOrDefaultPlatform());
// for XSwiftBus we only show public (unrestricted) ones, as the follow up dialog will only show unrestricted
const CUpdateInfo updateInfo(m_updateInfo.get());
const CArtifactList artifactsPilotClient = updateInfo.getArtifactsPilotClient().findByDistributionAndPlatform(selectedDistribution, selectedPlatform, true);
const CArtifactList artifactsXsb = updateInfo.getArtifactsXSwiftBus().findByDistributionAndPlatform(selectedDistribution, selectedPlatform, true);
const CArtifactList artifactsXsb = updateInfo.getArtifactsXSwiftBus().findWithUnrestrictedDistributions().findByDistributionAndPlatform(selectedDistribution, selectedPlatform, true);
const QStringList sortedPilotClientVersions = artifactsPilotClient.getSortedVersions();
ui->cb_ArtifactsPilotClient->clear();