[netinstall] Add data-loading to the Config object
- Mostly copied from NetInstallPage
This commit is contained in:
parent
938536c0c3
commit
f5b4e5d5e1
@ -21,14 +21,115 @@
|
|||||||
|
|
||||||
#include "Config.h"
|
#include "Config.h"
|
||||||
|
|
||||||
|
#include "network/Manager.h"
|
||||||
|
#include "utils/Logger.h"
|
||||||
|
#include "utils/Yaml.h"
|
||||||
|
|
||||||
|
#include <QNetworkReply>
|
||||||
|
|
||||||
Config::Config( QObject* parent )
|
Config::Config( QObject* parent )
|
||||||
: m_model( nullptr )
|
: QObject( parent )
|
||||||
|
, m_model( new PackageModel( this ) )
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Config::~Config() {}
|
||||||
|
|
||||||
void
|
void
|
||||||
Config::setStatus( const QString& s )
|
Config::setStatus( const QString& s )
|
||||||
{
|
{
|
||||||
m_status = s;
|
m_status = s;
|
||||||
emit statusChanged( m_status );
|
emit statusChanged( m_status );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
Config::loadGroupList( const QVariantList& groupData )
|
||||||
|
{
|
||||||
|
m_model->setupModelData( groupData );
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
Config::loadGroupList( const QUrl& url )
|
||||||
|
{
|
||||||
|
if ( !url.isValid() )
|
||||||
|
{
|
||||||
|
setStatus( tr( "Network Installation. (Disabled: Incorrect configuration)" ) );
|
||||||
|
}
|
||||||
|
|
||||||
|
using namespace CalamaresUtils::Network;
|
||||||
|
|
||||||
|
cDebug() << "NetInstall loading groups from" << url;
|
||||||
|
QNetworkReply* reply = Manager::instance().asynchronouseGet(
|
||||||
|
url,
|
||||||
|
RequestOptions( RequestOptions::FakeUserAgent | RequestOptions::FollowRedirect, std::chrono::seconds( 30 ) ) );
|
||||||
|
|
||||||
|
if ( !reply )
|
||||||
|
{
|
||||||
|
cDebug() << Logger::Continuation << "request failed immediately.";
|
||||||
|
setStatus( tr( "Network Installation. (Disabled: Incorrect configuration)" ) );
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
m_reply = reply;
|
||||||
|
connect( reply, &QNetworkReply::finished, this, &Config::receivedGroupData );
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// @brief Convenience to zero out and deleteLater on the reply, used in dataIsHere
|
||||||
|
struct ReplyDeleter
|
||||||
|
{
|
||||||
|
QNetworkReply*& p;
|
||||||
|
|
||||||
|
~ReplyDeleter()
|
||||||
|
{
|
||||||
|
if ( p )
|
||||||
|
{
|
||||||
|
p->deleteLater();
|
||||||
|
}
|
||||||
|
p = nullptr;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
void
|
||||||
|
Config::receivedGroupData()
|
||||||
|
{
|
||||||
|
if ( !m_reply || !m_reply->isFinished() )
|
||||||
|
{
|
||||||
|
cWarning() << "NetInstall data called too early.";
|
||||||
|
setStatus( tr( "Network Installation. (Disabled: internal error)" ) );
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
cDebug() << "NetInstall group data received" << m_reply->size() << "bytes from" << m_reply->url();
|
||||||
|
|
||||||
|
ReplyDeleter d { m_reply };
|
||||||
|
|
||||||
|
// If m_required is *false* then we still say we're ready
|
||||||
|
// even if the reply is corrupt or missing.
|
||||||
|
if ( m_reply->error() != QNetworkReply::NoError )
|
||||||
|
{
|
||||||
|
cWarning() << "unable to fetch netinstall package lists.";
|
||||||
|
cDebug() << Logger::SubEntry << "Netinstall reply error: " << m_reply->error();
|
||||||
|
cDebug() << Logger::SubEntry << "Request for url: " << m_reply->url().toString()
|
||||||
|
<< " failed with: " << m_reply->errorString();
|
||||||
|
setStatus( tr( "Network Installation. (Disabled: Unable to fetch package lists, check your network connection)" ) );
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
QByteArray yamlData = m_reply->readAll();
|
||||||
|
try
|
||||||
|
{
|
||||||
|
YAML::Node groups = YAML::Load( yamlData.constData() );
|
||||||
|
|
||||||
|
if ( !groups.IsSequence() )
|
||||||
|
{
|
||||||
|
cWarning() << "NetInstall groups data does not form a sequence.";
|
||||||
|
}
|
||||||
|
loadGroupList( CalamaresUtils::yamlSequenceToVariant( groups ) );
|
||||||
|
}
|
||||||
|
catch ( YAML::Exception& e )
|
||||||
|
{
|
||||||
|
CalamaresUtils::explainYamlException( e, yamlData, "netinstall groups data" );
|
||||||
|
setStatus( tr( "Network Installation. (Disabled: Received invalid groups data)" ) );
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@ -24,6 +24,9 @@
|
|||||||
#include "PackageModel.h"
|
#include "PackageModel.h"
|
||||||
|
|
||||||
#include <QObject>
|
#include <QObject>
|
||||||
|
#include <QUrl>
|
||||||
|
|
||||||
|
class QNetworkReply;
|
||||||
|
|
||||||
class Config : public QObject
|
class Config : public QObject
|
||||||
{
|
{
|
||||||
@ -35,16 +38,35 @@ class Config : public QObject
|
|||||||
|
|
||||||
public:
|
public:
|
||||||
Config( QObject* parent = nullptr );
|
Config( QObject* parent = nullptr );
|
||||||
|
virtual ~Config();
|
||||||
|
|
||||||
QString status() const { return m_status; }
|
QString status() const { return m_status; }
|
||||||
void setStatus( const QString& s );
|
void setStatus( const QString& s );
|
||||||
|
|
||||||
|
/** @brief Retrieves the groups, with name, description and packages
|
||||||
|
*
|
||||||
|
* Loads data from the given URL. Once done, the data is parsed
|
||||||
|
* and passed on to the other loadGroupList() method.
|
||||||
|
*/
|
||||||
|
void loadGroupList( const QUrl& url );
|
||||||
|
|
||||||
|
/** @brief Fill model from parsed data.
|
||||||
|
*
|
||||||
|
* Fills the model with a list of groups -- which can contain
|
||||||
|
* subgroups and packages -- from @p groupData.
|
||||||
|
*/
|
||||||
|
void loadGroupList( const QVariantList& groupData );
|
||||||
|
|
||||||
signals:
|
signals:
|
||||||
void statusChanged( QString status );
|
void statusChanged( QString status );
|
||||||
|
|
||||||
|
private slots:
|
||||||
|
void receivedGroupData(); ///< From async-loading group data
|
||||||
|
|
||||||
private:
|
private:
|
||||||
QString m_status;
|
QString m_status;
|
||||||
PackageModel* m_model = nullptr;
|
PackageModel* m_model;
|
||||||
|
QNetworkReply* m_reply = nullptr; // For fetching data
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
Loading…
Reference in New Issue
Block a user