@@ -60,6 +60,9 @@ set (AQPM_CONFIGURATION_FILE "/etc/aqpm.conf" CACHE STRING "The configuration fi set (AUR_JSON_URL "http://aur.archlinux.org/rpc.php?" CACHE STRING "The URL that will be used by aqpmaur to access the aur. Change if you want to use your own installation. It needs to end with an '?'") +set (AUR_BASE_URL "http://aur.archlinux.org" CACHE STRING "The URL that will be used by aqpmaur to download pkgbuilds from + aur. Change if you want to use your own installation. It should not + end with an '/'") configure_file( "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules/cmake_uninstall.cmake.in" CMakeLists.txt @@ -33,6 +33,7 @@ #define AQPM_CONFIGURATION_FILE "${AQPM_CONFIGURATION_FILE}" #define AQPM_AUR_REQUEST_URL "${AUR_JSON_URL}" +#define AQPM_AUR_BASE_URL "${AUR_BASE_URL}" /* KDE4 Integration */ #cmakedefine KDE4_INTEGRATION 1 config-aqpm.h.cmake @@ -27,6 +27,10 @@ #include <QtNetwork/QNetworkRequest> #include <QtNetwork/QNetworkReply> +#include <QTemporaryFile> +#include <QDir> +#include <QProcess> + #include <qjson/parser.h> #ifndef KDE4_INTEGRATION @@ -47,6 +51,7 @@ class Backend::Private Private() : manager(new AqpmNetworkAccessManager) {} QNetworkRequest createNetworkRequest(const QString &type, const QString &arg) const; + QNetworkRequest createDownloadRequest(const Package &package) const; Package packageFromMap(const QVariantMap &map) const; // Private slots @@ -65,8 +70,36 @@ QNetworkRequest Backend::Private::createNetworkRequest(const QString& type, cons return request; } +QNetworkRequest Backend::Private::createDownloadRequest(const Aqpm::Aur::Package& package) const +{ + QNetworkRequest request; + QUrl url(AQPM_AUR_BASE_URL + package.path); + request.setUrl(url); + request.setRawHeader("User-Agent", ("Aqpm/" + QString(AQPM_VERSION)).toUtf8()); + return request; +} + void Backend::Private::__k__replyFinished(QNetworkReply* reply) { + if (reply->property("aqpm_AUR_is_archive_Download").toBool()) { + // We got an archive. Let's save and extract it where requested + QTemporaryFile file; + file.open(); + file.write(reply->readAll()); + file.flush(); + + QString filepath = QDir::tempPath() + '/' + file.fileName(); + QProcess process; + process.setWorkingDirectory(reply->property("aqpm_AUR_extract_path").toString()); + process.start(QString("tar -zxf %1").arg(filepath)); + process.waitForFinished(); + file.close(); + + // Stream the success + emit q->buildEnvironmentReady(reply->property("aqpm_AUR_ID").toInt(), reply->property("aqpm_AUR_pkg_name").toString()); + return; + } + // Parse it! QJson::Parser parser; bool ok; @@ -87,7 +120,18 @@ void Backend::Private::__k__replyFinished(QNetworkReply* reply) emit q->searchCompleted(reply->property("aqpm_AUR_Subject").toString(), retlist); } else if (reply->property("aqpm_AUR_Request_Type").toString() == "info") { - emit q->infoCompleted(reply->property("aqpm_AUR_ID").toInt(), packageFromMap(result["results"].toMap())); + if (reply->property("aqpm_AUR_is_Download").toBool()) { + // We are not really looking for info, we actually need to download the package we got. + Package p = packageFromMap(result["results"].toMap()); + QNetworkReply *nreply = manager->get(createDownloadRequest(p)); + nreply->setProperty("aqpm_AUR_is_archive_Download", true); + nreply->setProperty("aqpm_AUR_extract_path", reply->property("aqpm_AUR_extract_path").toString()); + nreply->setProperty("aqpm_AUR_ID", reply->property("aqpm_AUR_ID").toInt()); + nreply->setProperty("aqpm_AUR_pkg_name", p.name); + } else { + // A simple info request, just notify and pass by + emit q->infoCompleted(reply->property("aqpm_AUR_ID").toInt(), packageFromMap(result["results"].toMap())); + } } } @@ -181,6 +225,16 @@ Package Backend::infoSync(int id) const return e.package(); } +void Backend::prepareBuildEnvironment(int id, const QString& envpath) const +{ + // First we have to do an info request to get the URL. We will add an additional property + QNetworkReply *reply = d->manager->get(d->createNetworkRequest("info", QString::number(id))); + reply->setProperty("aqpm_AUR_Request_Type", "info"); + reply->setProperty("aqpm_AUR_ID", id); + reply->setProperty("aqpm_AUR_is_Download", true); + reply->setProperty("aqpm_AUR_extract_path", envpath); +} + } } libaqpmaur/AurBackend.cpp @@ -56,14 +56,17 @@ public: virtual ~Backend(); void search(const QString &subject) const; - void info(int id) const; - Package::List searchSync(const QString &subject) const; + + void info(int id) const; Package infoSync(int id) const; + void prepareBuildEnvironment(int id, const QString &envpath) const; + Q_SIGNALS: void searchCompleted(const QString &searchSubject, const Aqpm::Aur::Package::List &results); void infoCompleted(int id, const Aqpm::Aur::Package &result); + void buildEnvironmentReady(int id, const QString &envpath); private: Backend(QObject* parent = 0); libaqpmaur/AurBackend.h 2b49a472ff2afada7e4541aa09118c4beeaa8c0b Dario Freddi drf@kde.org http://github.com/drf/aqpm/commit/5d1579beced6bc91f4e21f0bf6523a432f08bc48 5d1579beced6bc91f4e21f0bf6523a432f08bc48 2009-10-19T15:45:20-07:00 2009-10-19T15:45:20-07:00 Get a prepare environment function Signed-off-by: Dario Freddi <drf@kde.org> 8fdad88a6fa6526f884a59835885a02de0e07c71 Dario Freddi drf@kde.org