napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[tracking] stub implementation of neon machine feedback configuration

Browse Source
This commit is contained in:
Adriaan de Groot 2017-11-22 07:39:52 -05:00
parent 4a96e83203
commit 22f5a121cb
4 changed files with 53 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/modules/tracking/TrackingJobs.cpp
View File

@ -97,3 +97,24 @@ void TrackingInstallJob::dataIsHere( QNetworkReply* reply )
cDebug() << "Install-tracking request OK";
reply->deleteLater();
}
QString TrackingMachineNeonJob::prettyName() const
{
return tr( "Machine feedback" );
}
QString TrackingMachineNeonJob::prettyDescription() const
{
return prettyName();
}
QString TrackingMachineNeonJob::prettyStatusMessage() const
{
return tr( "Configuring machine feedback." );
}
Calamares::JobResult TrackingMachineNeonJob::exec()
{
return Calamares::JobResult::error( tr( "Error in machine feedback configuration." ),
tr( "Could not configure machine feedback correctly." ) );
}

11
src/modules/tracking/TrackingJobs.h
View File

@ -46,4 +46,15 @@ private:
QNetworkAccessManager* m_networkManager;
};
class TrackingMachineNeonJob : public Calamares::Job
{
Q_OBJECT
public:
QString prettyName() const override;
QString prettyDescription() const override;
QString prettyStatusMessage() const override;
Calamares::JobResult exec() override;
};
#endif

23
src/modules/tracking/TrackingViewStep.cpp
View File

@ -31,6 +31,13 @@
CALAMARES_PLUGIN_FACTORY_DEFINITION( TrackingViewStepFactory, registerPlugin<TrackingViewStep>(); )
/** @brief Is @p s a valid machine-tracking style. */
static bool isValidStyle( const QString& s )
{
static QStringList knownStyles { "neon" };
return knownStyles.contains( s );
}
TrackingViewStep::TrackingViewStep( QObject* parent )
: Calamares::ViewStep( parent )
, m_widget( new TrackingPage )
@ -117,7 +124,7 @@ TrackingViewStep::jobs() const
Calamares::JobList l;
cDebug() << "Creating tracking jobs ..";
if ( m_installTracking.enabled() )
if ( m_installTracking.enabled() && !m_installTrackingUrl.isEmpty() )
{
QString installUrl = m_installTrackingUrl;
const auto s = CalamaresUtils::System::instance();
@ -135,6 +142,13 @@ TrackingViewStep::jobs() const
l.append( Calamares::job_ptr( new TrackingInstallJob( installUrl ) ) );
}
if ( m_machineTracking.enabled() && !m_machineTrackingStyle.isEmpty() )
{
Q_ASSERT( isValidStyle( m_machineTrackingStyle ) );
if ( m_machineTrackingStyle == "neon" )
l.append( Calamares::job_ptr( new TrackingMachineNeonJob() ) );
}
return l;
}
@ -161,7 +175,6 @@ QVariantMap TrackingViewStep::setTrackingOption(const QVariantMap& configuration
return config;
}
void
TrackingViewStep::setConfigurationMap( const QVariantMap& configurationMap )
{
@ -170,7 +183,11 @@ TrackingViewStep::setConfigurationMap( const QVariantMap& configurationMap )
config = setTrackingOption( configurationMap, "install", TrackingType::InstallTracking );
m_installTrackingUrl = CalamaresUtils::getString( config, "url" );
setTrackingOption( configurationMap, "machine", TrackingType::MachineTracking );
config = setTrackingOption( configurationMap, "machine", TrackingType::MachineTracking );
auto s = CalamaresUtils::getString( config, "style" );
if ( isValidStyle( s ) )
m_machineTrackingStyle = s;
setTrackingOption( configurationMap, "user", TrackingType::UserTracking );
m_widget->setGeneralPolicy( CalamaresUtils::getString( configurationMap, "policy" ) );

1
src/modules/tracking/TrackingViewStep.h
View File

@ -63,6 +63,7 @@ private:
TrackingPage* m_widget;
QString m_installTrackingUrl;
QString m_machineTrackingStyle;
struct TrackingEnabled
{