diff --git a/CMakeLists.txt b/CMakeLists.txt index 476316f..e6e25c8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,90 +1,91 @@ cmake_minimum_required(VERSION 3.5) set(KF5_VERSION "5.57.0") # handled by release scripts project(Attica VERSION ${KF5_VERSION}) # ECM setup include(FeatureSummary) find_package(ECM 5.56.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://projects.kde.org/projects/kdesupport/extra-cmake-modules") feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) include(GenerateExportHeader) include(ECMSetupVersion) include(ECMGenerateHeaders) include(CMakePackageConfigHelpers) # Used to create CMake config files include(ECMQtDeclareLoggingCategory) include(ECMAddQch) include(KDEInstallDirs) # Used to set installation paths include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) include(KDECMakeSettings) option(BUILD_QCH "Build API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)" OFF) add_feature_info(QCH ${BUILD_QCH} "API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)") ecm_setup_version(PROJECT VARIABLE_PREFIX ATTICA VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/attica_version.h" PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5AtticaConfigVersion.cmake" SOVERSION 5) # Dependencies set(REQUIRED_QT_VERSION 5.10.0) # Required Qt5 components to build this framework find_package(Qt5 ${REQUIRED_QT_VERSION} NO_MODULE REQUIRED Core Network) set(ATTICA_LIB_SONAME KF5Attica) # Enable static build option(ATTICA_STATIC_BUILD "Build a static library" Off) add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050d00) +add_definitions(-DQT_NO_FOREACH) add_subdirectory(src) # Enable unit testing if (BUILD_TESTING) add_subdirectory(autotests) add_subdirectory(tests) endif () # Create a Config.cmake and a ConfigVersion.cmake file and install them set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KF5Attica") # Create the CMake Config files if (BUILD_QCH) ecm_install_qch_export( TARGETS KF5Attica_QCH FILE KF5AtticaQchTargets.cmake DESTINATION "${CMAKECONFIG_INSTALL_DIR}" COMPONENT Devel ) set(PACKAGE_INCLUDE_QCHTARGETS "include(\"\${CMAKE_CURRENT_LIST_DIR}/KF5AtticaQchTargets.cmake\")") endif() configure_package_config_file( "${CMAKE_CURRENT_SOURCE_DIR}/KF5AtticaConfig.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/KF5AtticaConfig.cmake" INSTALL_DESTINATION "${CMAKECONFIG_INSTALL_DIR}" ) install(FILES "${CMAKE_CURRENT_BINARY_DIR}/KF5AtticaConfig.cmake" "${CMAKE_CURRENT_BINARY_DIR}/KF5AtticaConfigVersion.cmake" DESTINATION "${CMAKECONFIG_INSTALL_DIR}" COMPONENT Devel) install(EXPORT KF5AtticaTargets DESTINATION "${CMAKECONFIG_INSTALL_DIR}" FILE KF5AtticaTargets.cmake NAMESPACE KF5::) install(FILES "${CMAKE_CURRENT_BINARY_DIR}/attica_version.h" DESTINATION "${KDE_INSTALL_INCLUDEDIR_KF5}" COMPONENT Devel) install( FILES attica.categories DESTINATION ${KDE_INSTALL_CONFDIR}) feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) diff --git a/src/provider.cpp b/src/provider.cpp index f31a32b..8841440 100644 --- a/src/provider.cpp +++ b/src/provider.cpp @@ -1,1744 +1,1748 @@ /* This file is part of KDE. Copyright (c) 2008 Cornelius Schumacher Copyright (c) 2010 Sebastian Kügler Copyright (c) 2011 Laszlo Papp This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) version 3, or any later version accepted by the membership of KDE e.V. (or its successor approved by the membership of KDE e.V.), which shall act as a proxy defined in Section 6 of version 3 of the license. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public License along with this library. If not, see . */ #include "provider.h" #include "accountbalance.h" #include "accountbalanceparser.h" #include "achievement.h" #include "achievementparser.h" #include "activity.h" #include "activityparser.h" #include "buildservice.h" #include "buildserviceparser.h" #include "buildservicejob.h" #include "buildservicejobparser.h" #include "buildservicejoboutput.h" #include "buildservicejoboutputparser.h" #include "privatedata.h" #include "privatedataparser.h" #include "category.h" #include "categoryparser.h" #include "comment.h" #include "commentparser.h" #include "config.h" #include "content.h" #include "contentparser.h" #include "distribution.h" #include "distributionparser.h" #include "downloaditem.h" #include "downloaditemparser.h" #include "event.h" #include "eventparser.h" #include "folder.h" #include "folderparser.h" #include "forum.h" #include "forumparser.h" #include "homepagetype.h" #include "homepagetypeparser.h" #include "knowledgebaseentry.h" #include "knowledgebaseentryparser.h" #include "license.h" #include "licenseparser.h" #include "message.h" #include "messageparser.h" #include "person.h" #include "personparser.h" #include "platformdependent_v2.h" #include "postjob.h" #include "postfiledata.h" #include "project.h" #include "projectparser.h" #include "publisher.h" #include "publisherparser.h" #include "publisherfield.h" #include "publisherfieldparser.h" #include "remoteaccount.h" #include "remoteaccountparser.h" #include "topic.h" #include "topicparser.h" #include "itemjob.h" #include "listjob.h" #include #include #include #include #include #include #include using namespace Attica; QDebug operator<<(QDebug s, const Attica::Provider& prov) { if (prov.isValid()) s.nospace() << "Provider(" << prov.name() << ':' << prov.baseUrl() << ')'; else s.nospace() << "Provider(Invalid)"; return s.space(); } class Provider::Private : public QSharedData { public: QUrl m_baseUrl; QUrl m_icon; QString m_name; QString m_credentialsUserName; QString m_credentialsPassword; QString m_personVersion; QString m_friendVersion; QString m_messageVersion; QString m_achievementVersion; QString m_activityVersion; QString m_contentVersion; QString m_fanVersion; QString m_forumVersion; QString m_knowledgebaseVersion; QString m_eventVersion; QString m_commentVersion; QString m_registerUrl; PlatformDependent *m_internals; Private() : m_internals(nullptr) {} Private(const Private &other) : QSharedData(other), m_baseUrl(other.m_baseUrl), m_name(other.m_name) , m_credentialsUserName(other.m_credentialsUserName) , m_credentialsPassword(other.m_credentialsPassword) , m_personVersion(other.m_personVersion) , m_friendVersion(other.m_friendVersion) , m_messageVersion(other.m_messageVersion) , m_achievementVersion(other.m_achievementVersion) , m_activityVersion(other.m_activityVersion) , m_contentVersion(other.m_contentVersion) , m_fanVersion(other.m_fanVersion) , m_forumVersion(other.m_forumVersion) , m_knowledgebaseVersion(other.m_knowledgebaseVersion) , m_eventVersion(other.m_eventVersion) , m_commentVersion(other.m_commentVersion) , m_registerUrl(other.m_registerUrl) , m_internals(other.m_internals) { } Private(PlatformDependent *internals, const QUrl &baseUrl, const QString &name, const QUrl &icon, const QString &person, const QString &friendV, const QString &message, const QString &achievement, const QString &activity, const QString &content, const QString &fan, const QString &forum, const QString &knowledgebase, const QString &event, const QString &comment, const QString ®isterUrl) : m_baseUrl(baseUrl), m_icon(icon), m_name(name) , m_personVersion(person) , m_friendVersion(friendV) , m_messageVersion(message) , m_achievementVersion(achievement) , m_activityVersion(activity) , m_contentVersion(content) , m_fanVersion(fan) , m_forumVersion(forum) , m_knowledgebaseVersion(knowledgebase) , m_eventVersion(event) , m_commentVersion(comment) , m_registerUrl(registerUrl) , m_internals(internals) { if (m_baseUrl.isEmpty()) { return; } QString user; QString pass; if (m_internals->hasCredentials(m_baseUrl) && m_internals->loadCredentials(m_baseUrl, user, pass)) { m_credentialsUserName = user; m_credentialsPassword = pass; } } ~Private() { } }; Provider::Provider() : d(new Private) { } Provider::Provider(const Provider &other) : d(other.d) { } Provider::Provider(PlatformDependent *internals, const QUrl &baseUrl, const QString &name, const QUrl &icon, const QString &person, const QString &friendV, const QString &message, const QString &achievement, const QString &activity, const QString &content, const QString &fan, const QString &forum, const QString &knowledgebase, const QString &event, const QString &comment) : d(new Private(internals, baseUrl, name, icon, person, friendV, message, achievement, activity, content, fan, forum, knowledgebase, event, comment, QString())) { } Provider::Provider(PlatformDependent *internals, const QUrl &baseUrl, const QString &name, const QUrl &icon, const QString &person, const QString &friendV, const QString &message, const QString &achievement, const QString &activity, const QString &content, const QString &fan, const QString &forum, const QString &knowledgebase, const QString &event, const QString &comment, const QString ®isterUrl) : d(new Private(internals, baseUrl, name, icon, person, friendV, message, achievement, activity, content, fan, forum, knowledgebase, event, comment, registerUrl)) { } Provider &Provider::operator=(const Attica::Provider &other) { d = other.d; return *this; } Provider::~Provider() { } QUrl Provider::baseUrl() const { return d->m_baseUrl; } bool Provider::isValid() const { return d->m_baseUrl.isValid(); } bool Provider::isEnabled() const { if (!isValid()) { return false; } return d->m_internals->isEnabled(d->m_baseUrl); } void Provider::setEnabled(bool enabled) { if (!isValid()) { return; } d->m_internals->enableProvider(d->m_baseUrl, enabled); } QString Provider::name() const { return d->m_name; } bool Provider::hasCredentials() { if (!isValid()) { return false; } return d->m_internals->hasCredentials(d->m_baseUrl); } bool Provider::hasCredentials() const { if (!isValid()) { return false; } return d->m_internals->hasCredentials(d->m_baseUrl); } bool Provider::loadCredentials(QString &user, QString &password) { if (!isValid()) { return false; } if (d->m_internals->loadCredentials(d->m_baseUrl, user, password)) { d->m_credentialsUserName = user; d->m_credentialsPassword = password; return true; } return false; } bool Provider::saveCredentials(const QString &user, const QString &password) { if (!isValid()) { return false; } d->m_credentialsUserName = user; d->m_credentialsPassword = password; return d->m_internals->saveCredentials(d->m_baseUrl, user, password); } PostJob *Provider::checkLogin(const QString &user, const QString &password) { if (!isValid()) { return nullptr; } QMap postParameters; postParameters.insert(QLatin1String("login"), user); postParameters.insert(QLatin1String("password"), password); return new PostJob(d->m_internals, createRequest(QLatin1String("person/check")), postParameters); } ItemJob *Provider::requestConfig() { if (!isValid()) { return nullptr; } QUrl url = createUrl(QLatin1String("config")); return doRequestConfig(url); } PostJob *Provider::registerAccount(const QString &id, const QString &password, const QString &mail, const QString &firstName, const QString &lastName) { if (!isValid()) { return nullptr; } QMap postParameters; postParameters.insert(QLatin1String("login"), id); postParameters.insert(QLatin1String("password"), password); postParameters.insert(QLatin1String("firstname"), firstName); postParameters.insert(QLatin1String("lastname"), lastName); postParameters.insert(QLatin1String("email"), mail); return new PostJob(d->m_internals, createRequest(QLatin1String("person/add")), postParameters); } const QString &Provider::getRegisterAccountUrl() const { return d->m_registerUrl; } ItemJob *Provider::requestPerson(const QString &id) { if (!isValid()) { return nullptr; } QUrl url = createUrl(QLatin1String("person/data/") + id); return doRequestPerson(url); } ItemJob *Provider::requestPersonSelf() { if (!isValid()) { return nullptr; } QUrl url = createUrl(QLatin1String("person/self")); return doRequestPerson(url); } ItemJob *Provider::requestAccountBalance() { if (!isValid()) { return nullptr; } QUrl url = createUrl(QLatin1String("person/balance")); return doRequestAccountBalance(url); } ListJob *Provider::requestPersonSearchByName(const QString &name) { if (!isValid()) { return nullptr; } QUrl url = createUrl(QStringLiteral("person/data")); QUrlQuery q(url); q.addQueryItem(QStringLiteral("name"), name); url.setQuery(q); return doRequestPersonList(url); } ListJob *Provider::requestPersonSearchByLocation(qreal latitude, qreal longitude, qreal distance, int page, int pageSize) { if (!isValid()) { return nullptr; } QUrl url = createUrl(QStringLiteral("person/data")); QUrlQuery q(url); q.addQueryItem(QStringLiteral("latitude"), QString::number(latitude)); q.addQueryItem(QStringLiteral("longitude"), QString::number(longitude)); if (distance > 0.0) { q.addQueryItem(QStringLiteral("distance"), QString::number(distance)); } q.addQueryItem(QStringLiteral("page"), QString::number(page)); q.addQueryItem(QStringLiteral("pagesize"), QString::number(pageSize)); url.setQuery(q); return doRequestPersonList(url); } ListJob *Provider::requestFriends(const QString &id, int page, int pageSize) { if (!isValid()) { return nullptr; } QUrl url = createUrl(QLatin1String("friend/data/") + id); QUrlQuery q(url); q.addQueryItem(QLatin1String("page"), QString::number(page)); q.addQueryItem(QLatin1String("pagesize"), QString::number(pageSize)); url.setQuery(q); return doRequestPersonList(url); } ListJob *Provider::requestSentInvitations(int page, int pageSize) { if (!isValid()) { return nullptr; } QUrl url = createUrl(QStringLiteral("friend/sentinvitations")); QUrlQuery q(url); q.addQueryItem(QStringLiteral("page"), QString::number(page)); q.addQueryItem(QStringLiteral("pagesize"), QString::number(pageSize)); url.setQuery(q); return doRequestPersonList(url); } ListJob *Provider::requestReceivedInvitations(int page, int pageSize) { if (!isValid()) { return nullptr; } QUrl url = createUrl(QStringLiteral("friend/receivedinvitations")); QUrlQuery q(url); q.addQueryItem(QStringLiteral("page"), QString::number(page)); q.addQueryItem(QStringLiteral("pagesize"), QString::number(pageSize)); url.setQuery(q); return doRequestPersonList(url); } ListJob *Provider::requestAchievements(const QString &contentId, const QString &achievementId, const QString &userId) { if (!isValid()) { return nullptr; } QUrl url = createUrl(QStringLiteral("achievements/content/") + contentId + achievementId); QUrlQuery q(url); q.addQueryItem(QStringLiteral("user_id"), userId); url.setQuery(q); return doRequestAchievementList(url); } ItemPostJob *Provider::addNewAchievement(const QString &contentId, const Achievement &newAchievement) { if (!isValid()) { return nullptr; } StringMap postParameters; int i = 0, j = 0; postParameters.insert(QLatin1String("name"), newAchievement.name()); postParameters.insert(QLatin1String("description"), newAchievement.description()); postParameters.insert(QLatin1String("explanation"), newAchievement.explanation()); postParameters.insert(QLatin1String("points"), QString::number(newAchievement.points())); postParameters.insert(QLatin1String("image"), newAchievement.image().toLocalFile()); - foreach (const QString &dependency, newAchievement.dependencies()) { + const auto dependenciesList = newAchievement.dependencies(); + for (const QString &dependency : dependenciesList) { postParameters.insert(QString::fromLatin1("dependencies[%1]").arg(QString::number(i++)), dependency); } postParameters.insert(QLatin1String("type"), Achievement::achievementTypeToString(newAchievement.type())); - foreach (const QString &option, newAchievement.options()) { + const auto optionsList = newAchievement.options(); + for (const QString &option : optionsList) { postParameters.insert(QString::fromLatin1("options[%1]").arg(QString::number(j++)), option); } postParameters.insert(QLatin1String("steps"), QString::number(newAchievement.steps())); postParameters.insert(QLatin1String("visibility"), Achievement::achievementVisibilityToString(newAchievement.visibility())); return new ItemPostJob(d->m_internals, createRequest(QLatin1String("achievements/content/") + contentId), postParameters); } PutJob *Provider::editAchievement(const QString &contentId, const QString &achievementId, const Achievement &achievement) { if (!isValid()) { return nullptr; } if (!dynamic_cast(d->m_internals)) { return nullptr; } StringMap postParameters; int i = 0, j = 0; postParameters.insert(QLatin1String("name"), achievement.name()); postParameters.insert(QLatin1String("description"), achievement.description()); postParameters.insert(QLatin1String("explanation"), achievement.explanation()); postParameters.insert(QLatin1String("points"), QString::number(achievement.points())); postParameters.insert(QLatin1String("image"), achievement.image().toLocalFile()); - foreach (const QString &dependency, achievement.dependencies()) { + const auto dependenciesList = achievement.dependencies(); + for (const QString &dependency : dependenciesList) { postParameters.insert(QString::fromLatin1("dependencies[%1]").arg(QString::number(i++)), dependency); } postParameters.insert(QLatin1String("type"), Achievement::achievementTypeToString(achievement.type())); - foreach (const QString &option, achievement.options()) { + const auto optionsList = achievement.options(); + for (const QString &option : optionsList) { postParameters.insert(QString::fromLatin1("options[%1]").arg(QString::number(j++)), option); } postParameters.insert(QLatin1String("steps"), QString::number(achievement.steps())); postParameters.insert(QLatin1String("visibility"), Achievement::achievementVisibilityToString(achievement.visibility())); return new ItemPutJob(d->m_internals, createRequest(QLatin1String("achievement/content/") + contentId + achievementId), postParameters); } DeleteJob *Provider::deleteAchievement(const QString &contentId, const QString &achievementId) { if (!isValid()) { return nullptr; } if (!dynamic_cast(d->m_internals)) { return nullptr; } return new ItemDeleteJob(d->m_internals, createRequest(QLatin1String("achievements/progress/") + contentId + achievementId)); } PostJob *Provider::setAchievementProgress(const QString &id, const QVariant &progress, const QDateTime ×tamp) { if (!isValid()) { return nullptr; } StringMap postParameters; postParameters.insert(QLatin1String("progress"), progress.toString()); postParameters.insert(QLatin1String("timestamp"), timestamp.toString()); return new ItemPostJob(d->m_internals, createRequest(QLatin1String("achievements/progress/") + id), postParameters); } DeleteJob *Provider::resetAchievementProgress(const QString &id) { if (!isValid()) { return nullptr; } if (!dynamic_cast(d->m_internals)) { return nullptr; } return new ItemDeleteJob(d->m_internals, createRequest(QLatin1String("achievements/progress/") + id)); } ListJob *Provider::requestActivities() { if (!isValid()) { return nullptr; } //qCDebug(ATTICA) << "request activity"; QUrl url = createUrl(QLatin1String("activity")); return doRequestActivityList(url); } ListJob *Provider::requestProjects() { if (!isValid()) { return nullptr; } //qCDebug(ATTICA) << "request projects"; QUrl url = createUrl(QLatin1String("buildservice/project/list")); return new ListJob(d->m_internals, createRequest(url)); } ItemJob *Provider::requestProject(const QString &id) { if (!isValid()) { return nullptr; } QUrl url = createUrl(QLatin1String("buildservice/project/get/") + id); //qCDebug(ATTICA) << url; return new ItemJob(d->m_internals, createRequest(url)); } QMap projectPostParameters(const Project &project) { QMap postParameters; if (!project.name().isEmpty()) { postParameters.insert(QLatin1String("name"), project.name()); } if (!project.summary().isEmpty()) { postParameters.insert(QLatin1String("summary"), project.summary()); } if (!project.description().isEmpty()) { postParameters.insert(QLatin1String("description"), project.description()); } if (!project.url().isEmpty()) { postParameters.insert(QLatin1String("url"), project.url()); } if (!project.developers().isEmpty()) { postParameters.insert(QLatin1String("developers"), project.developers().join(QLatin1String("\n"))); } if (!project.version().isEmpty()) { postParameters.insert(QLatin1String("version"), project.version()); } if (!project.license().isEmpty()) { postParameters.insert(QLatin1String("license"), project.license()); } if (!project.requirements().isEmpty()) { postParameters.insert(QLatin1String("requirements"), project.requirements()); } // The specfile generator expects an empty string parameter if it is supposed to regenerate the spec file // So we need to check for nullity here as opposed to an empty string. if (!project.specFile().isNull()) { postParameters.insert(QLatin1String("specfile"), project.specFile()); } return postParameters; } PostJob *Provider::createProject(const Project &project) { if (!isValid()) { return nullptr; } return new PostJob(d->m_internals, createRequest(QLatin1String("buildservice/project/create")), projectPostParameters(project)); } PostJob *Provider::editProject(const Project &project) { if (!isValid()) { return nullptr; } return new PostJob(d->m_internals, createRequest( QLatin1String("buildservice/project/edit/") + project.id()), projectPostParameters(project)); } PostJob *Provider::deleteProject(const Project &project) { if (!isValid()) { return nullptr; } return new PostJob(d->m_internals, createRequest( QLatin1String("buildservice/project/delete/") + project.id()), projectPostParameters(project)); } ItemJob *Provider::requestBuildService(const QString &id) { if (!isValid()) { return nullptr; } QUrl url = createUrl(QLatin1String("buildservice/buildservices/get/") + id); return new ItemJob(d->m_internals, createRequest(url)); } ItemJob *Provider::requestPublisher(const QString &id) { if (!isValid()) { return nullptr; } //qCDebug(ATTICA) << "request publisher" << id; QUrl url = createUrl(QLatin1String("buildservice/publishing/getpublisher/") + id); return new ItemJob(d->m_internals, createRequest(url)); } PostJob *Provider::savePublisherField(const Project &project, const PublisherField &field) { if (!isValid()) { return nullptr; } StringMap postParameters; postParameters.insert(QLatin1String("fields[0][name]"), field.name()); postParameters.insert(QLatin1String("fields[0][fieldtype]"), field.type()); postParameters.insert(QLatin1String("fields[0][data]"), field.data()); QString url = QLatin1String("buildservice/publishing/savefields/") + project.id(); //qCDebug(ATTICA) << "saving field values..."; return new PostJob(d->m_internals, createRequest(url), postParameters); } PostJob *Provider::publishBuildJob(const BuildServiceJob &buildjob, const Publisher &publisher) { if (!isValid()) { return nullptr; } StringMap postParameters; postParameters.insert(QLatin1String("dummyparameter"), QLatin1String("dummyvalue")); QString url = QLatin1String("buildservice/publishing/publishtargetresult/") + buildjob.id() + QLatin1Char('/') + publisher.id(); //qCDebug(ATTICA) << "pub'ing"; return new PostJob(d->m_internals, createRequest(url), postParameters); } // Buildservices and their jobs ItemJob *Provider::requestBuildServiceJobOutput(const QString &id) { if (!isValid()) { return nullptr; } QUrl url = createUrl(QLatin1String("buildservice/jobs/getoutput/") + id); //qCDebug(ATTICA) << url; return new ItemJob(d->m_internals, createRequest(url)); } ItemJob *Provider::requestBuildServiceJob(const QString &id) { if (!isValid()) { return nullptr; } QUrl url = createUrl(QLatin1String("buildservice/jobs/get/") + id); //qCDebug(ATTICA) << url; return new ItemJob(d->m_internals, createRequest(url)); } QMap buildServiceJobPostParameters(const BuildServiceJob &buildjob) { QMap postParameters; if (!buildjob.name().isEmpty()) { postParameters.insert(QLatin1String("name"), buildjob.name()); } if (!buildjob.projectId().isEmpty()) { postParameters.insert(QLatin1String("projectid"), buildjob.projectId()); } if (!buildjob.target().isEmpty()) { postParameters.insert(QLatin1String("target"), buildjob.target()); } if (!buildjob.buildServiceId().isEmpty()) { postParameters.insert(QLatin1String("buildservice"), buildjob.buildServiceId()); } return postParameters; } PostJob *Provider::cancelBuildServiceJob(const BuildServiceJob &job) { if (!isValid()) { return nullptr; } StringMap postParameters; postParameters.insert(QLatin1String("dummyparameter"), QLatin1String("dummyvalue")); //qCDebug(ATTICA) << "b....................b"; return new PostJob(d->m_internals, createRequest( QLatin1String("buildservice/jobs/cancel/") + job.id()), postParameters); } PostJob *Provider::createBuildServiceJob(const BuildServiceJob &job) { if (!isValid()) { return nullptr; } StringMap postParameters; // A postjob won't be run without parameters. // so even while we don't need any in this case, // we add dummy data to the request postParameters.insert(QLatin1String("dummyparameter"), QLatin1String("dummyvalue")); //qCDebug(ATTICA) << "Creating new BSJ on" << job.buildServiceId(); return new PostJob(d->m_internals, createRequest( QLatin1String("buildservice/jobs/create/") + job.projectId() + QLatin1Char('/') + job.buildServiceId() + QLatin1Char('/') + job.target()), postParameters); } ListJob *Provider::requestBuildServices() { if (!isValid()) { return nullptr; } //qCDebug(ATTICA) << "request projects"; QUrl url = createUrl(QLatin1String("buildservice/buildservices/list")); return new ListJob(d->m_internals, createRequest(url)); } ListJob *Provider::requestPublishers() { if (!isValid()) { return nullptr; } QUrl url = createUrl(QLatin1String("buildservice/publishing/getpublishingcapabilities")); //qCDebug(ATTICA) << "request publishers" << url; return new ListJob(d->m_internals, createRequest(url)); } ListJob *Provider::requestBuildServiceJobs(const Project &project) { if (!isValid()) { return nullptr; } //qCDebug(ATTICA) << "request projects"; QUrl url = createUrl(QLatin1String("buildservice/jobs/list/") + project.id()); return new ListJob(d->m_internals, createRequest(url)); } ListJob *Provider::requestRemoteAccounts() { if (!isValid()) { return nullptr; } //qCDebug(ATTICA) << "request remoteaccounts"; QUrl url = createUrl(QLatin1String("buildservice/remoteaccounts/list/")); return new ListJob(d->m_internals, createRequest(url)); } PostJob *Provider::createRemoteAccount(const RemoteAccount &account) { if (!isValid()) { return nullptr; } StringMap postParameters; // A postjob won't be run without parameters. // so even while we don't need any in this case, // we add dummy data to the request postParameters.insert(QLatin1String("login"), account.login()); postParameters.insert(QLatin1String("password"), account.password()); postParameters.insert(QLatin1String("type"), account.type()); postParameters.insert(QLatin1String("typeid"), account.remoteServiceId()); // FIXME: remoteserviceid? postParameters.insert(QLatin1String("data"), account.data()); //qCDebug(ATTICA) << "Creating new Remoteaccount" << account.id() << account.login() << account.password(); return new PostJob(d->m_internals, createRequest(QLatin1String("buildservice/remoteaccounts/add")), postParameters); } PostJob *Provider::editRemoteAccount(const RemoteAccount &account) { if (!isValid()) { return nullptr; } StringMap postParameters; // A postjob won't be run without parameters. // so even while we don't need any in this case, // we add dummy data to the request postParameters.insert(QLatin1String("login"), account.login()); postParameters.insert(QLatin1String("password"), account.password()); postParameters.insert(QLatin1String("type"), account.type()); postParameters.insert(QLatin1String("typeid"), account.remoteServiceId()); // FIXME: remoteserviceid? postParameters.insert(QLatin1String("data"), account.data()); //qCDebug(ATTICA) << "Creating new Remoteaccount" << account.id() << account.login() << account.password(); return new PostJob(d->m_internals, createRequest(QLatin1String("buildservice/remoteaccounts/edit/") + account.id()), postParameters); } ItemJob *Provider::requestRemoteAccount(const QString &id) { if (!isValid()) { return nullptr; } QUrl url = createUrl(QLatin1String("buildservice/remoteaccounts/get/") + id); //qCDebug(ATTICA) << url; return new ItemJob(d->m_internals, createRequest(url)); } PostJob *Provider::deleteRemoteAccount(const QString &id) { if (!isValid()) { return nullptr; } StringMap postParameters; return new PostJob(d->m_internals, createRequest( QLatin1String("buildservice/remoteaccounts/remove/") + id), postParameters); } PostJob *Provider::uploadTarballToBuildService(const QString &projectId, const QString &fileName, const QByteArray &payload) { if (!isValid()) { return nullptr; } QUrl url = createUrl(QLatin1String("buildservice/project/uploadsource/") + projectId); //qCDebug(ATTICA) << "Up'ing tarball" << url << projectId << fileName << payload; PostFileData postRequest(url); postRequest.addFile(fileName, payload, QLatin1String("application/octet-stream"), QLatin1String("source")); return new PostJob(d->m_internals, postRequest.request(), postRequest.data()); } // Activity PostJob *Provider::postActivity(const QString &message) { if (!isValid()) { return nullptr; } StringMap postParameters; postParameters.insert(QLatin1String("message"), message); return new PostJob(d->m_internals, createRequest(QLatin1String("activity")), postParameters); } PostJob *Provider::inviteFriend(const QString &to, const QString &message) { if (!isValid()) { return nullptr; } StringMap postParameters; postParameters.insert(QLatin1String("message"), message); return new PostJob(d->m_internals, createRequest(QLatin1String("friend/invite/") + to), postParameters); } PostJob *Provider::approveFriendship(const QString &to) { if (!isValid()) { return nullptr; } return new PostJob(d->m_internals, createRequest(QLatin1String("friend/approve/") + to)); } PostJob *Provider::declineFriendship(const QString &to) { if (!isValid()) { return nullptr; } return new PostJob(d->m_internals, createRequest(QLatin1String("friend/decline/") + to)); } PostJob *Provider::cancelFriendship(const QString &to) { if (!isValid()) { return nullptr; } return new PostJob(d->m_internals, createRequest(QLatin1String("friend/cancel/") + to)); } PostJob *Provider::postLocation(qreal latitude, qreal longitude, const QString &city, const QString &country) { if (!isValid()) { return nullptr; } StringMap postParameters; postParameters.insert(QLatin1String("latitude"), QString::number(latitude)); postParameters.insert(QLatin1String("longitude"), QString::number(longitude)); postParameters.insert(QLatin1String("city"), city); postParameters.insert(QLatin1String("country"), country); return new PostJob(d->m_internals, createRequest(QLatin1String("person/self")), postParameters); } ListJob *Provider::requestFolders() { if (!isValid()) { return nullptr; } return doRequestFolderList(createUrl(QLatin1String("message"))); } ListJob *Provider::requestMessages(const Folder &folder) { if (!isValid()) { return nullptr; } return doRequestMessageList(createUrl(QLatin1String("message/") + folder.id())); } ListJob *Provider::requestMessages(const Folder &folder, Message::Status status) { if (!isValid()) { return nullptr; } QUrl url = createUrl(QStringLiteral("message/") + folder.id()); QUrlQuery q(url); q.addQueryItem(QStringLiteral("status"), QString::number(status)); url.setQuery(q); return doRequestMessageList(url); } ItemJob *Provider::requestMessage(const Folder &folder, const QString &id) { if (!isValid()) { return nullptr; } return new ItemJob(d->m_internals, createRequest(QLatin1String("message/") + folder.id() + QLatin1Char('/') + id)); } PostJob *Provider::postMessage(const Message &message) { if (!isValid()) { return nullptr; } StringMap postParameters; postParameters.insert(QLatin1String("message"), message.body()); postParameters.insert(QLatin1String("subject"), message.subject()); postParameters.insert(QLatin1String("to"), message.to()); return new PostJob(d->m_internals, createRequest(QLatin1String("message/2")), postParameters); } ListJob *Provider::requestCategories() { if (!isValid()) { return nullptr; } QUrl url = createUrl(QLatin1String("content/categories")); ListJob *job = new ListJob(d->m_internals, createRequest(url)); return job; } ListJob< License > *Provider::requestLicenses() { if (!isValid()) { return nullptr; } QUrl url = createUrl(QLatin1String("content/licenses")); ListJob *job = new ListJob(d->m_internals, createRequest(url)); return job; } ListJob< Distribution > *Provider::requestDistributions() { if (!isValid()) { return nullptr; } QUrl url = createUrl(QLatin1String("content/distributions")); ListJob *job = new ListJob(d->m_internals, createRequest(url)); return job; } ListJob< HomePageType > *Provider::requestHomePageTypes() { if (!isValid()) { return nullptr; } QUrl url = createUrl(QLatin1String("content/homepages")); ListJob *job = new ListJob(d->m_internals, createRequest(url)); return job; } ListJob *Provider::searchContents(const Category::List &categories, const QString &search, SortMode sortMode, uint page, uint pageSize) { return searchContents(categories, QString(), Distribution::List(), License::List(), search, sortMode, page, pageSize); } ListJob *Provider::searchContentsByPerson(const Category::List &categories, const QString &person, const QString &search, SortMode sortMode, uint page, uint pageSize) { return searchContents(categories, person, Distribution::List(), License::List(), search, sortMode, page, pageSize); } ListJob *Provider::searchContents(const Category::List &categories, const QString &person, const Distribution::List &distributions, const License::List &licenses, const QString &search, SortMode sortMode, uint page, uint pageSize) { if (!isValid()) { return nullptr; } QUrl url = createUrl(QStringLiteral("content/data")); QUrlQuery q(url); QStringList categoryIds; categoryIds.reserve(categories.count()); for (const Category &category : categories) { categoryIds.append(category.id()); } q.addQueryItem(QStringLiteral("categories"), categoryIds.join(QLatin1String("x"))); QStringList distributionIds; - foreach (const Distribution &distribution, distributions) { + for (const Distribution &distribution : distributions) { distributionIds.append(QString(distribution.id())); } q.addQueryItem(QStringLiteral("distribution"), distributionIds.join(QLatin1String(","))); QStringList licenseIds; - foreach (const License &license, licenses) { + for (const License &license : licenses) { licenseIds.append(QString(license.id())); } q.addQueryItem(QStringLiteral("license"), licenseIds.join(QLatin1String(","))); if (!person.isEmpty()) { q.addQueryItem(QStringLiteral("user"), person); } q.addQueryItem(QStringLiteral("search"), search); QString sortModeString; switch (sortMode) { case Newest: sortModeString = QLatin1String("new"); break; case Alphabetical: sortModeString = QLatin1String("alpha"); break; case Rating: sortModeString = QLatin1String("high"); break; case Downloads: sortModeString = QLatin1String("down"); break; } if (!sortModeString.isEmpty()) { q.addQueryItem(QStringLiteral("sortmode"), sortModeString); } q.addQueryItem(QStringLiteral("page"), QString::number(page)); q.addQueryItem(QStringLiteral("pagesize"), QString::number(pageSize)); url.setQuery(q); ListJob *job = new ListJob(d->m_internals, createRequest(url)); return job; } ItemJob *Provider::requestContent(const QString &id) { if (!isValid()) { return nullptr; } QUrl url = createUrl(QLatin1String("content/data/") + id); ItemJob *job = new ItemJob(d->m_internals, createRequest(url)); return job; } ItemPostJob *Provider::addNewContent(const Category &category, const Content &cont) { if (!isValid() || !category.isValid()) { return nullptr; } QUrl url = createUrl(QLatin1String("content/add")); StringMap pars(cont.attributes()); pars.insert(QLatin1String("type"), category.id()); pars.insert(QLatin1String("name"), cont.name()); //qCDebug(ATTICA) << "Parameter map: " << pars; return new ItemPostJob(d->m_internals, createRequest(url), pars); } ItemPostJob *Provider::editContent(const Category &updatedCategory, const QString &contentId, const Content &updatedContent) { if (!isValid()) { return nullptr; } // FIXME I get a server error message here, though the name of the item is changed QUrl url = createUrl(QLatin1String("content/edit/") + contentId); StringMap pars(updatedContent.attributes()); pars.insert(QLatin1String("type"), updatedCategory.id()); pars.insert(QLatin1String("name"), updatedContent.name()); //qCDebug(ATTICA) << "Parameter map: " << pars; return new ItemPostJob(d->m_internals, createRequest(url), pars); } /* PostJob* Provider::setDownloadFile(const QString& contentId, QIODevice* payload) { QUrl url = createUrl("content/uploaddownload/" + contentId); PostFileData postRequest(url); // FIXME mime type //postRequest.addFile("localfile", payload, "application/octet-stream"); postRequest.addFile("localfile", payload, "image/jpeg"); return new PostJob(d->m_internals, postRequest.request(), postRequest.data()); } */ PostJob *Provider::deleteContent(const QString &contentId) { if (!isValid()) { return nullptr; } QUrl url = createUrl(QLatin1String("content/delete/") + contentId); PostFileData postRequest(url); postRequest.addArgument(QLatin1String("contentid"), contentId); return new PostJob(d->m_internals, postRequest.request(), postRequest.data()); } PostJob *Provider::setDownloadFile(const QString &contentId, const QString &fileName, const QByteArray &payload) { if (!isValid()) { return nullptr; } QUrl url = createUrl(QLatin1String("content/uploaddownload/") + contentId); PostFileData postRequest(url); postRequest.addArgument(QLatin1String("contentid"), contentId); // FIXME mime type postRequest.addFile(fileName, payload, QLatin1String("application/octet-stream")); return new PostJob(d->m_internals, postRequest.request(), postRequest.data()); } PostJob *Provider::deleteDownloadFile(const QString &contentId) { if (!isValid()) { return nullptr; } QUrl url = createUrl(QLatin1String("content/deletedownload/") + contentId); PostFileData postRequest(url); postRequest.addArgument(QLatin1String("contentid"), contentId); return new PostJob(d->m_internals, postRequest.request(), postRequest.data()); } PostJob *Provider::setPreviewImage(const QString &contentId, const QString &previewId, const QString &fileName, const QByteArray &image) { if (!isValid()) { return nullptr; } QUrl url = createUrl(QLatin1String("content/uploadpreview/") + contentId + QLatin1Char('/') + previewId); PostFileData postRequest(url); postRequest.addArgument(QLatin1String("contentid"), contentId); postRequest.addArgument(QLatin1String("previewid"), previewId); // FIXME mime type postRequest.addFile(fileName, image, QLatin1String("application/octet-stream")); return new PostJob(d->m_internals, postRequest.request(), postRequest.data()); } PostJob *Provider::deletePreviewImage(const QString &contentId, const QString &previewId) { if (!isValid()) { return nullptr; } QUrl url = createUrl(QLatin1String("content/deletepreview/") + contentId + QLatin1Char('/') + previewId); PostFileData postRequest(url); postRequest.addArgument(QLatin1String("contentid"), contentId); postRequest.addArgument(QLatin1String("previewid"), previewId); return new PostJob(d->m_internals, postRequest.request(), postRequest.data()); } PostJob *Provider::voteForContent(const QString &contentId, bool positiveVote) { if (!isValid()) { return nullptr; } StringMap postParameters; postParameters.insert(QLatin1String("vote"), positiveVote ? QLatin1String("good") : QLatin1String("bad")); //qCDebug(ATTICA) << "vote: " << positiveVote; return new PostJob(d->m_internals, createRequest(QLatin1String("content/vote/") + contentId), postParameters); } PostJob *Provider::voteForContent(const QString &contentId, uint rating) { if (!isValid()) { return nullptr; } // according to OCS API, the rating is 0..100 if (rating > 100) { qWarning() << "Rating cannot be superior to 100, fallback to 100."; rating = 100; } StringMap postParameters; postParameters.insert(QLatin1String("vote"), QString::number(rating)); //qCDebug(ATTICA) << "vote: " << QString::number(rating); return new PostJob(d->m_internals, createRequest(QLatin1String("content/vote/") + contentId), postParameters); } PostJob *Provider::becomeFan(const QString &contentId) { if (!isValid()) { return nullptr; } QUrl url = createUrl(QLatin1String("fan/add/") + contentId); PostFileData postRequest(url); postRequest.addArgument(QLatin1String("contentid"), contentId); return new PostJob(d->m_internals, postRequest.request(), postRequest.data()); } ListJob *Provider::requestFans(const QString &contentId, uint page, uint pageSize) { if (!isValid()) { return nullptr; } QUrl url = createUrl(QStringLiteral("fan/data/") + contentId); QUrlQuery q(url); q.addQueryItem(QStringLiteral("contentid"), contentId); q.addQueryItem(QStringLiteral("page"), QString::number(page)); q.addQueryItem(QStringLiteral("pagesize"), QString::number(pageSize)); url.setQuery(q); ListJob *job = new ListJob(d->m_internals, createRequest(url)); return job; } ListJob *Provider::requestForums(uint page, uint pageSize) { if (!isValid()) { return nullptr; } QUrl url = createUrl(QStringLiteral("forum/list")); QUrlQuery q(url); q.addQueryItem(QStringLiteral("page"), QString::number(page)); q.addQueryItem(QStringLiteral("pagesize"), QString::number(pageSize)); url.setQuery(q); return doRequestForumList(url); } ListJob *Provider::requestTopics(const QString &forum, const QString &search, const QString &description, Provider::SortMode mode, int page, int pageSize) { if (!isValid()) { return nullptr; } QUrl url = createUrl(QStringLiteral("forum/topics/list")); QUrlQuery q(url); q.addQueryItem(QStringLiteral("forum"), forum); q.addQueryItem(QStringLiteral("search"), search); q.addQueryItem(QStringLiteral("description"), description); QString sortModeString; switch (mode) { case Newest: sortModeString = QLatin1String("new"); break; case Alphabetical: sortModeString = QLatin1String("alpha"); break; default: break; } if (!sortModeString.isEmpty()) { q.addQueryItem(QStringLiteral("sortmode"), sortModeString); } q.addQueryItem(QStringLiteral("page"), QString::number(page)); q.addQueryItem(QStringLiteral("pagesize"), QString::number(pageSize)); url.setQuery(q); return doRequestTopicList(url); } PostJob *Provider::postTopic(const QString &forumId, const QString &subject, const QString &content) { if (!isValid()) { return nullptr; } StringMap postParameters; postParameters.insert(QLatin1String("subject"), subject); postParameters.insert(QLatin1String("content"), content); postParameters.insert(QLatin1String("forum"), forumId); return new PostJob(d->m_internals, createRequest(QLatin1String("forum/topic/add")), postParameters); } ItemJob *Provider::downloadLink(const QString &contentId, const QString &itemId) { if (!isValid()) { return nullptr; } QUrl url = createUrl(QLatin1String("content/download/") + contentId + QLatin1Char('/') + itemId); ItemJob *job = new ItemJob(d->m_internals, createRequest(url)); return job; } ItemJob *Provider::requestKnowledgeBaseEntry(const QString &id) { if (!isValid()) { return nullptr; } QUrl url = createUrl(QLatin1String("knowledgebase/data/") + id); ItemJob *job = new ItemJob(d->m_internals, createRequest(url)); return job; } ListJob *Provider::searchKnowledgeBase(const Content &content, const QString &search, Provider::SortMode sortMode, int page, int pageSize) { if (!isValid()) { return nullptr; } QUrl url = createUrl(QStringLiteral("knowledgebase/data")); QUrlQuery q(url); if (content.isValid()) { q.addQueryItem(QStringLiteral("content"), content.id()); } q.addQueryItem(QStringLiteral("search"), search); QString sortModeString; switch (sortMode) { case Newest: sortModeString = QLatin1String("new"); break; case Alphabetical: sortModeString = QLatin1String("alpha"); break; case Rating: sortModeString = QLatin1String("high"); break; //FIXME: knowledge base doesn't have downloads case Downloads: sortModeString = QLatin1String("new"); break; } if (!sortModeString.isEmpty()) { q.addQueryItem(QStringLiteral("sortmode"), sortModeString); } q.addQueryItem(QStringLiteral("page"), QString::number(page)); q.addQueryItem(QStringLiteral("pagesize"), QString::number(pageSize)); url.setQuery(q); ListJob *job = new ListJob(d->m_internals, createRequest(url)); return job; } ItemJob *Provider::requestEvent(const QString &id) { if (!isValid()) { return nullptr; } ItemJob *job = new ItemJob(d->m_internals, createRequest(QLatin1String("event/data/") + id)); return job; } ListJob *Provider::requestEvent(const QString &country, const QString &search, const QDate &startAt, Provider::SortMode mode, int page, int pageSize) { if (!isValid()) { return nullptr; } QUrl url = createUrl(QStringLiteral("event/data")); QUrlQuery q(url); if (!search.isEmpty()) { q.addQueryItem(QStringLiteral("search"), search); } QString sortModeString; switch (mode) { case Newest: sortModeString = QLatin1String("new"); break; case Alphabetical: sortModeString = QLatin1String("alpha"); break; default: break; } if (!sortModeString.isEmpty()) { q.addQueryItem(QStringLiteral("sortmode"), sortModeString); } if (!country.isEmpty()) { q.addQueryItem(QStringLiteral("country"), country); } q.addQueryItem(QStringLiteral("startat"), startAt.toString(Qt::ISODate)); q.addQueryItem(QStringLiteral("page"), QString::number(page)); q.addQueryItem(QStringLiteral("pagesize"), QString::number(pageSize)); url.setQuery(q); ListJob *job = new ListJob(d->m_internals, createRequest(url)); return job; } ListJob *Provider::requestComments(const Comment::Type commentType, const QString &id, const QString &id2, int page, int pageSize) { if (!isValid()) { return nullptr; } QString commentTypeString; commentTypeString = Comment::commentTypeToString(commentType); if (commentTypeString.isEmpty()) { return nullptr; } QUrl url = createUrl(QLatin1String("comments/data/") + commentTypeString + QLatin1Char('/') + id + QLatin1Char('/') + id2); QUrlQuery q(url); q.addQueryItem(QStringLiteral("page"), QString::number(page)); q.addQueryItem(QStringLiteral("pagesize"), QString::number(pageSize)); url.setQuery(q); ListJob *job = new ListJob(d->m_internals, createRequest(url)); return job; } ItemPostJob *Provider::addNewComment(const Comment::Type commentType, const QString &id, const QString &id2, const QString &parentId, const QString &subject, const QString &message) { if (!isValid()) { return nullptr; } QString commentTypeString; commentTypeString = Comment::commentTypeToString(commentType); if (commentTypeString.isEmpty()) { return nullptr; } QMap postParameters; postParameters.insert(QLatin1String("type"), commentTypeString); postParameters.insert(QLatin1String("content"), id); postParameters.insert(QLatin1String("content2"), id2); postParameters.insert(QLatin1String("parent"), parentId); postParameters.insert(QLatin1String("subject"), subject); postParameters.insert(QLatin1String("message"), message); return new ItemPostJob(d->m_internals, createRequest(QLatin1String("comments/add")), postParameters); } PostJob *Provider::voteForComment(const QString &id, uint rating) { if (!isValid() || (rating > 100)) { return nullptr; } QMap postParameters; postParameters.insert(QLatin1String("vote"), QString::number(rating)); QUrl url = createUrl(QLatin1String("comments/vote/") + id); return new PostJob(d->m_internals, createRequest(url), postParameters); } PostJob *Provider::setPrivateData(const QString &app, const QString &key, const QString &value) { if (!isValid()) { return nullptr; } QUrl url = createUrl(QLatin1String("privatedata/setattribute/") + app + QLatin1Char('/') + key); PostFileData postRequest(url); postRequest.addArgument(QLatin1String("value"), value); return new PostJob(d->m_internals, postRequest.request(), postRequest.data()); } ItemJob *Provider::requestPrivateData(const QString &app, const QString &key) { if (!isValid()) { return nullptr; } ItemJob *job = new ItemJob(d->m_internals, createRequest(QLatin1String("privatedata/getattribute/") + app + QLatin1Char('/') + key)); return job; } QUrl Provider::createUrl(const QString &path) { QUrl url(d->m_baseUrl.toString() + path); return url; } QNetworkRequest Provider::createRequest(const QUrl &url) { QNetworkRequest request(url); request.setHeader(QNetworkRequest::ContentTypeHeader,QStringLiteral("application/x-www-form-urlencoded")); if (!d->m_credentialsUserName.isEmpty()) { request.setAttribute((QNetworkRequest::Attribute) BaseJob::UserAttribute, QVariant(d->m_credentialsUserName)); request.setAttribute((QNetworkRequest::Attribute) BaseJob::PasswordAttribute, QVariant(d->m_credentialsPassword)); } return request; } QNetworkRequest Provider::createRequest(const QString &path) { return createRequest(createUrl(path)); } ItemJob* Provider::doRequestConfig(const QUrl& url) { return new ItemJob(d->m_internals, createRequest(url)); } ItemJob *Provider::doRequestPerson(const QUrl &url) { return new ItemJob(d->m_internals, createRequest(url)); } ItemJob *Provider::doRequestAccountBalance(const QUrl &url) { return new ItemJob(d->m_internals, createRequest(url)); } ListJob *Provider::doRequestPersonList(const QUrl &url) { return new ListJob(d->m_internals, createRequest(url)); } ListJob *Provider::doRequestAchievementList(const QUrl &url) { return new ListJob(d->m_internals, createRequest(url)); } ListJob *Provider::doRequestActivityList(const QUrl &url) { return new ListJob(d->m_internals, createRequest(url)); } ListJob *Provider::doRequestFolderList(const QUrl &url) { return new ListJob(d->m_internals, createRequest(url)); } ListJob *Provider::doRequestForumList(const QUrl &url) { return new ListJob(d->m_internals, createRequest(url)); } ListJob *Provider::doRequestTopicList(const QUrl &url) { return new ListJob(d->m_internals, createRequest(url)); } ListJob *Provider::doRequestMessageList(const QUrl &url) { return new ListJob(d->m_internals, createRequest(url)); } QString Provider::achievementServiceVersion() const { return d->m_achievementVersion; } QString Provider::activityServiceVersion() const { return d->m_activityVersion; } QString Provider::commentServiceVersion() const { return d->m_commentVersion; } QString Provider::contentServiceVersion() const { return d->m_contentVersion; } QString Provider::fanServiceVersion() const { return d->m_fanVersion; } QString Provider::forumServiceVersion() const { return d->m_forumVersion; } QString Provider::friendServiceVersion() const { return d->m_friendVersion; } QString Provider::knowledgebaseServiceVersion() const { return d->m_knowledgebaseVersion; } QString Provider::messageServiceVersion() const { return d->m_messageVersion; } QString Provider::personServiceVersion() const { return d->m_personVersion; } bool Provider::hasAchievementService() const { return !d->m_achievementVersion.isEmpty(); } bool Provider::hasActivityService() const { return !d->m_activityVersion.isEmpty(); } bool Provider::hasCommentService() const { return !d->m_commentVersion.isEmpty(); } bool Provider::hasContentService() const { return !d->m_contentVersion.isEmpty(); } bool Provider::hasFanService() const { return !d->m_fanVersion.isEmpty(); } bool Provider::hasForumService() const { return !d->m_forumVersion.isEmpty(); } bool Provider::hasFriendService() const { return !d->m_friendVersion.isEmpty(); } bool Provider::hasKnowledgebaseService() const { return !d->m_knowledgebaseVersion.isEmpty(); } bool Provider::hasMessageService() const { return !d->m_messageVersion.isEmpty(); } bool Provider::hasPersonService() const { return !d->m_personVersion.isEmpty(); } diff --git a/src/providermanager.cpp b/src/providermanager.cpp index 77d9d16..80fb9a8 100644 --- a/src/providermanager.cpp +++ b/src/providermanager.cpp @@ -1,325 +1,326 @@ /* This file is part of KDE. Copyright (c) 2009 Eckhart Wörner Copyright (c) 2009 Frederik Gladhorn This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) version 3, or any later version accepted by the membership of KDE e.V. (or its successor approved by the membership of KDE e.V.), which shall act as a proxy defined in Section 6 of version 3 of the license. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public License along with this library. If not, see . */ #include "providermanager.h" #include "attica_debug.h" #include "atticautils.h" #include #include #include #include #include #include #include #include #include #include #include #include #include "platformdependent.h" #include "qtplatformdependent_p.h" #include using namespace Attica; class ProviderManager::Private { public: PlatformDependent *m_internals; QHash m_providers; QHash m_providerTargets; QHash m_downloads; bool m_authenticationSuppressed; Private() : m_internals(nullptr) , m_authenticationSuppressed(false) { } ~Private() { // do not delete m_internals: it is the root component of a plugin! } }; PlatformDependent *ProviderManager::loadPlatformDependent(const ProviderFlags &flags) { if (flags & ProviderManager::DisablePlugins) { return new QtPlatformDependent; } QPluginLoader loader(QStringLiteral("attica_kde")); PlatformDependent * ret = qobject_cast(loader.instance()); return ret ? ret : new QtPlatformDependent; } ProviderManager::ProviderManager(const ProviderFlags &flags) : d(new Private) { d->m_internals = loadPlatformDependent(flags); connect(d->m_internals->nam(), &QNetworkAccessManager::authenticationRequired, this, &ProviderManager::authenticate); } void ProviderManager::loadDefaultProviders() { QTimer::singleShot(0, this, &ProviderManager::slotLoadDefaultProvidersInternal); } void ProviderManager::setAuthenticationSuppressed(bool suppressed) { d->m_authenticationSuppressed = suppressed; } void ProviderManager::clear() { d->m_providerTargets.clear(); d->m_providers.clear(); } void ProviderManager::slotLoadDefaultProvidersInternal() { - foreach (const QUrl &url, d->m_internals->getDefaultProviderFiles()) { + const auto providerFiles = d->m_internals->getDefaultProviderFiles(); + for (const QUrl &url : providerFiles) { addProviderFile(url); } if (d->m_downloads.isEmpty()) { emit defaultProvidersLoaded(); } } QList ProviderManager::defaultProviderFiles() { return d->m_internals->getDefaultProviderFiles(); } ProviderManager::~ProviderManager() { delete d; } void ProviderManager::addProviderFileToDefaultProviders(const QUrl &url) { d->m_internals->addDefaultProviderFile(url); addProviderFile(url); } void ProviderManager::removeProviderFileFromDefaultProviders(const QUrl &url) { d->m_internals->removeDefaultProviderFile(url); } void ProviderManager::addProviderFile(const QUrl &url) { if (url.isLocalFile()) { QFile file(url.toLocalFile()); if (!file.open(QIODevice::ReadOnly)) { qWarning() << "ProviderManager::addProviderFile: could not open provider file: " << url.toString(); return; } parseProviderFile(QLatin1String(file.readAll()), url); } else { if (!d->m_downloads.contains(url.toString())) { QNetworkRequest req(url); req.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true); QNetworkReply *reply = d->m_internals->get(req); qCDebug(ATTICA) << "executing" << Utils::toString(reply->operation()) << "for" << reply->url(); connect(reply, &QNetworkReply::finished, this, [this, url]() { fileFinished(url.toString()); }); d->m_downloads.insert(url.toString(), reply); } } } void ProviderManager::fileFinished(const QString &url) { QNetworkReply *reply = d->m_downloads.take(url); if (reply->error()) Q_EMIT failedToLoad(QUrl(url), reply->error()); else parseProviderFile(QLatin1String(reply->readAll()), QUrl(url)); reply->deleteLater(); } void ProviderManager::addProviderFromXml(const QString &providerXml) { parseProviderFile(providerXml, QUrl()); } void ProviderManager::parseProviderFile(const QString &xmlString, const QUrl &url) { QXmlStreamReader xml(xmlString); while (!xml.atEnd() && xml.readNext()) { if (xml.isStartElement() && xml.name() == QLatin1String("provider")) { QUrl baseUrl; QString name; QUrl icon; QString person; QString friendV; QString message; QString achievement; QString activity; QString content; QString fan; QString forum; QString knowledgebase; QString event; QString comment; QString registerUrl; while (!xml.atEnd() && xml.readNext()) { if (xml.isStartElement()) { if (xml.name() == QLatin1String("location")) { baseUrl = QUrl(xml.readElementText()); } else if (xml.name() == QLatin1String("name")) { name = xml.readElementText(); } else if (xml.name() == QLatin1String("icon")) { icon = QUrl(xml.readElementText()); } else if (xml.name() == QLatin1String("person")) { person = xml.attributes().value(QLatin1String("ocsversion")).toString(); } else if (xml.name() == QLatin1String("friend")) { friendV = xml.attributes().value(QLatin1String("ocsversion")).toString(); } else if (xml.name() == QLatin1String("message")) { message = xml.attributes().value(QLatin1String("ocsversion")).toString(); } else if (xml.name() == QLatin1String("achievement")) { achievement = xml.attributes().value(QLatin1String("ocsversion")).toString(); } else if (xml.name() == QLatin1String("activity")) { activity = xml.attributes().value(QLatin1String("ocsversion")).toString(); } else if (xml.name() == QLatin1String("content")) { content = xml.attributes().value(QLatin1String("ocsversion")).toString(); } else if (xml.name() == QLatin1String("fan")) { fan = xml.attributes().value(QLatin1String("ocsversion")).toString(); } else if (xml.name() == QLatin1String("forum")) { forum = xml.attributes().value(QLatin1String("ocsversion")).toString(); } else if (xml.name() == QLatin1String("knowledgebase")) { knowledgebase = xml.attributes().value(QLatin1String("ocsversion")).toString(); } else if (xml.name() == QLatin1String("event")) { event = xml.attributes().value(QLatin1String("ocsversion")).toString(); } else if (xml.name() == QLatin1String("comment")) { comment = xml.attributes().value(QLatin1String("ocsversion")).toString(); } else if (xml.name() == QLatin1String("register")) { registerUrl = xml.readElementText(); } } else if (xml.isEndElement() && xml.name() == QLatin1String("provider")) { break; } } if (!baseUrl.isEmpty()) { //qCDebug(ATTICA) << "Adding provider" << baseUrl; d->m_providers.insert(baseUrl, Provider(d->m_internals, baseUrl, name, icon, person, friendV, message, achievement, activity, content, fan, forum, knowledgebase, event, comment, registerUrl)); d->m_providerTargets[url] = baseUrl; emit providerAdded(d->m_providers.value(baseUrl)); } } } if (xml.error() != QXmlStreamReader::NoError) { qCDebug(ATTICA) << "error:" << xml.errorString() << "in" << url; } if (d->m_downloads.isEmpty()) { emit defaultProvidersLoaded(); } } Provider ProviderManager::providerFor(const QUrl &url) const { return providerByUrl(d->m_providerTargets.value(url)); } Provider ProviderManager::providerByUrl(const QUrl &url) const { return d->m_providers.value(url); } QList ProviderManager::providers() const { return d->m_providers.values(); } bool ProviderManager::contains(const QString &provider) const { return d->m_providers.contains(QUrl(provider)); } QList ProviderManager::providerFiles() const { return d->m_providerTargets.keys(); } void ProviderManager::authenticate(QNetworkReply *reply, QAuthenticator *auth) { QUrl baseUrl; const QList urls = d->m_providers.keys(); for (const QUrl &url : urls) { if (url.isParentOf(reply->url())) { baseUrl = url; break; } } //qCDebug(ATTICA) << "ProviderManager::authenticate" << baseUrl; QString user; QString password; if (auth->user().isEmpty() && auth->password().isEmpty()) { if (d->m_internals->hasCredentials(baseUrl)) { if (d->m_internals->loadCredentials(baseUrl, user, password)) { //qCDebug(ATTICA) << "ProviderManager::authenticate: loading authentication"; auth->setUser(user); auth->setPassword(password); return; } } } if (!d->m_authenticationSuppressed && d->m_internals->askForCredentials(baseUrl, user, password)) { //qCDebug(ATTICA) << "ProviderManager::authenticate: asking internals for new credentials"; //auth->setUser(user); //auth->setPassword(password); return; } qWarning() << "ProviderManager::authenticate: No authentication credentials provided, aborting." << reply->url().toString(); emit authenticationCredentialsMissing(d->m_providers.value(baseUrl)); reply->abort(); } void ProviderManager::proxyAuthenticationRequired(const QNetworkProxy &proxy, QAuthenticator *authenticator) { Q_UNUSED(proxy) Q_UNUSED(authenticator) } void ProviderManager::initNetworkAccesssManager() { connect(d->m_internals->nam(), &QNetworkAccessManager::authenticationRequired, this, &ProviderManager::authenticate); connect(d->m_internals->nam(), &QNetworkAccessManager::proxyAuthenticationRequired, this, &ProviderManager::proxyAuthenticationRequired); } diff --git a/tests/projecttest/projecttest.cpp b/tests/projecttest/projecttest.cpp index 66b1416..648980a 100644 --- a/tests/projecttest/projecttest.cpp +++ b/tests/projecttest/projecttest.cpp @@ -1,489 +1,492 @@ /* This file is part of KDE. Copyright 2010 Sebastian Kügler This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) version 3, or any later version accepted by the membership of KDE e.V. (or its successor approved by the membership of KDE e.V.), which shall act as a proxy defined in Section 6 of version 3 of the license. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public License along with this library. If not, see . */ #include "projecttest.h" #include #include #include #include #include #include #include #include #include #include #include #include #include using namespace Attica; ProjectTest::ProjectTest() : QMainWindow(), m_mainWidget(nullptr) { m_mainWidget = new QWidget(); setCentralWidget(m_mainWidget); m_editor = new Ui::EditProject(); m_editor->setupUi(m_mainWidget); // Project page connect(m_editor->save, &QAbstractButton::clicked, this, &ProjectTest::save); connect(m_editor->create, SIGNAL(clicked()), this, SLOT(create())); connect(m_editor->deleteProject, SIGNAL(clicked()), this, SLOT(deleteProject())); // build service / job page connect(m_editor->build, &QAbstractButton::clicked, this, &ProjectTest::createBuildServiceJob); connect(m_editor->cancelJob, &QAbstractButton::clicked, this, &ProjectTest::cancelBuildServiceJob); connect(m_editor->updateJob, &QAbstractButton::clicked, this, &ProjectTest::updateCurrentProject); connect(m_editor->buildServices, &QListWidget::currentItemChanged, this, &ProjectTest::selectedBuildServiceChanged); QAction *a = new QAction(this); a->setText(QLatin1String("Quit")); connect(a, &QAction::triggered, this, &QWidget::close); menuBar()->addMenu(QLatin1String("File"))->addAction(a); initOcs(); } ProjectTest::~ProjectTest() {} void ProjectTest::initOcs() { m_pm.setAuthenticationSuppressed(true); connect(&m_pm, &ProviderManager::providerAdded, this, &ProjectTest::providerAdded); m_pm.loadDefaultProviders(); m_mainWidget->setEnabled(false); setStatus(QLatin1String("Loading providers...")); //connect(m_serviceUpdates.data(), SIGNAL(mapped(QString)), SLOT(serviceUpdates(QString))); } void ProjectTest::providerAdded(const Attica::Provider &provider) { qDebug() << "providerAdded" << provider.baseUrl(); setStatus(QLatin1String("Provider found:") + provider.baseUrl().toString()); m_mainWidget->setEnabled(true); if (provider.isValid()) { QString _id = QLatin1String("1"); m_provider = provider; getProject(_id); listProjects(); listBuildServices(); Project p; p.setId(_id); listBuildServiceJobs(p); } } void ProjectTest::getProject(QString id) { ItemJob *job = m_provider.requestProject(id); connect(job, &BaseJob::finished, this, &ProjectTest::projectResult); job->start(); setStatus(QString(QLatin1String("Loading project %")).arg(id)); m_mainWidget->setEnabled(false); } void ProjectTest::listProjects() { ListJob *job = m_provider.requestProjects(); connect(job, &BaseJob::finished, this, &ProjectTest::projectListResult); job->start(); } void ProjectTest::listBuildServices() { ListJob *job = m_provider.requestBuildServices(); connect(job, &BaseJob::finished, this, &ProjectTest::buildServiceListResult); job->start(); } void ProjectTest::listBuildServiceJobs(const Project &p) { ListJob *job = m_provider.requestBuildServiceJobs(p); connect(job, &BaseJob::finished, this, &ProjectTest::buildServiceJobListResult); job->start(); } void ProjectTest::projectResult(Attica::BaseJob *j) { qDebug() << "Project job returned"; QString output; m_mainWidget->setEnabled(true); if (j->metadata().error() == Metadata::NoError) { Attica::ItemJob *itemJob = static_cast *>(j); Attica::Project p = itemJob->result(); output.append(QLatin1String("Project loaded.")); projectToUi(p); } else if (j->metadata().error() == Metadata::OcsError) { output.append(QString(QLatin1String("OCS Error: %1")).arg(j->metadata().message())); } else if (j->metadata().error() == Metadata::NetworkError) { output.append(QString(QLatin1String("Network Error: %1")).arg(j->metadata().message())); } else { output.append(QString(QLatin1String("Unknown Error: %1")).arg(j->metadata().message())); } setStatus(output); } void ProjectTest::projectToUi(const Project &p) { m_editor->id->setText(p.id()); m_editor->name->setText(p.name()); m_editor->description->setText(p.description()); m_editor->url->setText(p.url()); m_editor->summary->setText(p.summary()); m_editor->developers->setText(p.developers().join(QLatin1String(", "))); m_editor->license->setText(p.license()); m_editor->version->setText(p.version()); m_editor->requirements->setText(p.requirements()); m_editor->specFile->setPlainText(p.specFile()); } Project ProjectTest::uiToProject() { qDebug() << "Saving project"; Project project = Project(); project.setId(m_editor->id->text()); project.setName(m_editor->name->text()); project.setVersion(m_editor->version->text()); project.setLicense(m_editor->license->text()); project.setUrl(m_editor->url->text()); - QStringList _d = m_editor->developers->text().split(QLatin1Char(',')); + const QStringList _d = m_editor->developers->text().split(QLatin1Char(',')); QStringList devs; - foreach (const QString &dev, _d) { + for (const QString &dev : _d) { devs << dev.trimmed(); } project.setDevelopers(devs); project.setSummary(m_editor->summary->text()); project.setDescription(m_editor->description->text()); project.setRequirements(m_editor->requirements->text()); project.setSpecFile(m_editor->specFile->toPlainText()); return project; } void ProjectTest::save() { Attica::PostJob *postjob = m_provider.editProject(uiToProject()); connect(postjob, &BaseJob::finished, this, &ProjectTest::saveProjectResult); postjob->start(); m_mainWidget->setEnabled(false); } void ProjectTest::create() { Attica::PostJob *postjob = m_provider.createProject(uiToProject()); connect(postjob, &BaseJob::finished, this, &ProjectTest::createProjectResult); postjob->start(); m_mainWidget->setEnabled(false); } void ProjectTest::deleteProject() { Attica::PostJob *postjob = m_provider.deleteProject(uiToProject()); connect(postjob, &BaseJob::finished, this, &ProjectTest::deleteProjectResult); postjob->start(); m_mainWidget->setEnabled(false); } void ProjectTest::createProjectResult(Attica::BaseJob *j) { qDebug() << "createProject() job returned"; QString output; m_mainWidget->setEnabled(true); if (j->metadata().error() == Metadata::NoError) { m_currentProjectId = j->metadata().resultingId(); qDebug() << "Yay, no errors ... resulting ID:" << m_currentProjectId; output.append(QString(QLatin1String("Project [%1] successfully created:")).arg(m_currentProjectId)); } else if (j->metadata().error() == Metadata::OcsError) { output.append(QString(QLatin1String("OCS Error: %1")).arg(j->metadata().message())); } else if (j->metadata().error() == Metadata::NetworkError) { output.append(QString(QLatin1String("Network Error: %1")).arg(j->metadata().message())); } else { output.append(QString(QLatin1String("Unknown Error: %1")).arg(j->metadata().message())); } setStatus(output); } void ProjectTest::saveProjectResult(Attica::BaseJob *j) { qDebug() << "editProject() job returned"; QString output; m_mainWidget->setEnabled(true); if (j->metadata().error() == Metadata::NoError) { m_currentProjectId = j->metadata().resultingId(); qDebug() << "Yay, no errors ... resulting ID:" << m_currentProjectId; output.append(QString(QLatin1String("Project [%1] successfully saved.")).arg(m_currentProjectId)); } else if (j->metadata().error() == Metadata::OcsError) { output.append(QString(QLatin1String("OCS Error: %1")).arg(j->metadata().message())); } else if (j->metadata().error() == Metadata::NetworkError) { output.append(QString(QLatin1String("Network Error: %1")).arg(j->metadata().message())); } else { output.append(QString(QLatin1String("Unknown Error: %1")).arg(j->metadata().message())); } setStatus(output); } void ProjectTest::deleteProjectResult(Attica::BaseJob *j) { qDebug() << "deleteProject() job returned"; QString output; m_mainWidget->setEnabled(true); if (j->metadata().error() == Metadata::NoError) { qDebug() << "Yay, no errors ... deleted project."; output.append(QString(QLatin1String("Project [%1] successfully deleted")).arg(m_currentProjectId)); } else if (j->metadata().error() == Metadata::OcsError) { output.append(QString(QLatin1String("OCS Error: %1")).arg(j->metadata().message())); } else if (j->metadata().error() == Metadata::NetworkError) { output.append(QString(QLatin1String("Network Error: %1")).arg(j->metadata().message())); } else { output.append(QString(QLatin1String("Unknown Error: %1")).arg(j->metadata().message())); } setStatus(output); m_currentProjectId.clear(); projectToUi(Project()); } void ProjectTest::projectListResult(Attica::BaseJob *j) { qDebug() << "Project list job returned"; QString output = QLatin1String("Projects:"); m_mainWidget->setEnabled(true); if (j->metadata().error() == Metadata::NoError) { Attica::ListJob *listJob = static_cast *>(j); qDebug() << "Yay, no errors ..."; QStringList projectIds; - foreach (const Project &p, listJob->itemList()) { + const auto itemList = listJob->itemList(); + for (const Project &p : itemList) { m_projects[p.id()] = p; qDebug() << "New project:" << p.id() << p.name(); output.append(QString(QLatin1String("
%1 (%2)")).arg(p.name(), p.id())); projectIds << p.id(); m_editor->projects->insertItem(0, p.name(), p.id()); // TODO: start project jobs here } if (listJob->itemList().isEmpty()) { output.append(QLatin1String("No Projects found.")); } } else if (j->metadata().error() == Metadata::OcsError) { output.append(QString(QLatin1String("OCS Error: %1")).arg(j->metadata().message())); } else if (j->metadata().error() == Metadata::NetworkError) { output.append(QString(QLatin1String("Network Error: %1")).arg(j->metadata().message())); } else { output.append(QString(QLatin1String("Unknown Error: %1")).arg(j->metadata().message())); } qDebug() << output; setStatus(output); } void ProjectTest::buildServiceListResult(Attica::BaseJob *j) { qDebug() << "BuildService list job returned"; QString output = QLatin1String("BuildServices:"); //m_mainWidget->setEnabled(true); // fixme: tab if (j->metadata().error() == Metadata::NoError) { Attica::ListJob *listJob = static_cast *>(j); qDebug() << "Yay, no errors ..."; - foreach (const BuildService &bs, listJob->itemList()) { + const auto itemList = listJob->itemList(); + for (const BuildService &bs : itemList) { m_buildServices[bs.id()] = bs; qDebug() << "New OBS:" << bs.id() << bs.name() << bs.url(); output.append(QString(QLatin1String("
%1 (%2) at %3")).arg(bs.name(), bs.id(), bs.url())); QListWidgetItem *new_bs = new QListWidgetItem(bs.name(), m_editor->buildServices); new_bs->setData(Qt::UserRole, QVariant(bs.id())); m_editor->accountsServers->insertItem(0, bs.name(), bs.id()); //QListWidgetItem* new_bsa = new QListWidgetItem(bs.name(), m_editor->accountsServers); //new_bsa->setData(Qt::UserRole, QVariant(bs.id())); } if (listJob->itemList().isEmpty()) { output.append(QLatin1String("No OBS'en found.")); } } else if (j->metadata().error() == Metadata::OcsError) { output.append(QString(QLatin1String("OCS Error: %1")).arg(j->metadata().message())); } else if (j->metadata().error() == Metadata::NetworkError) { output.append(QString(QLatin1String("Network Error: %1")).arg(j->metadata().message())); } else { output.append(QString(QLatin1String("Unknown Error: %1")).arg(j->metadata().message())); } qDebug() << output; //setBuildStatus(output); } void ProjectTest::buildServiceJobListResult(Attica::BaseJob *j) { qDebug() << "BuildServiceJobList list job returned"; QString output = QLatin1String("BuildServiceJobs: "); //m_mainWidget->setEnabled(true); // fixme: tab if (j->metadata().error() == Metadata::NoError) { Attica::ListJob *listJob = static_cast *>(j); qDebug() << "Yay, no errors. Items found:" << listJob->itemList().count(); - foreach (const BuildServiceJob &bsj, listJob->itemList()) { + const auto itemList = listJob->itemList(); + for (const BuildServiceJob &bsj : itemList) { m_buildServiceJobs[bsj.id()] = bsj; qDebug() << "New BuildServiceJob:" << bsj.id() << bsj.name() << bsj.target(); output.append(QString(QLatin1String("
%1 (%2) for %3")).arg(bsj.name(), bsj.id(), bsj.target())); QListWidgetItem *new_bsj = new QListWidgetItem(bsj.name(), m_editor->buildServiceJobs); new_bsj->setData(Qt::UserRole, QVariant(bsj.id())); } if (listJob->itemList().isEmpty()) { output.append(QLatin1String("No jobs found.")); } } else if (j->metadata().error() == Metadata::OcsError) { output.append(QString(QLatin1String("OCS Error: %1")).arg(j->metadata().message())); } else if (j->metadata().error() == Metadata::NetworkError) { output.append(QString(QLatin1String("Network Error: %1")).arg(j->metadata().message())); } else { output.append(QString(QLatin1String("Unknown Error: %1")).arg(j->metadata().message())); } qDebug() << output; //setBuildStatus(output); } void ProjectTest::selectedBuildServiceChanged(QListWidgetItem *current, QListWidgetItem *previous) { Q_UNUSED(previous) qDebug() << "current item changed to " << current->data(Qt::UserRole).toString(); m_editor->targets->clear(); - QList targetlist = m_buildServices[current->data(Qt::UserRole).toString()].targets(); - foreach (const Target &t, targetlist) { + const QList targetlist = m_buildServices[current->data(Qt::UserRole).toString()].targets(); + for (const Target &t : targetlist) { //m_editor->targets->insertItems(0, m_buildServices[current->data(Qt::UserRole).toString()].targets()); m_editor->targets->insertItem(0, t.name, t.id); // FIXME: target id. qDebug() << "target:" << t.name << t.id; } } void ProjectTest::createBuildServiceJob() { BuildServiceJob b = BuildServiceJob(); b.setProjectId(m_editor->projects->itemData(m_editor->projects->currentIndex()).toString()); b.setTarget(m_editor->targets->itemData(m_editor->targets->currentIndex()).toString()); b.setBuildServiceId(m_editor->buildServices->currentItem()->data(Qt::UserRole).toString()); b.setTarget(m_editor->targets->itemData(m_editor->targets->currentIndex()).toString()); ///* qDebug() << "Create build job:" << m_editor->targets->itemData(m_editor->targets->currentIndex()).toString() << m_editor->targets->currentIndex() << m_editor->targets->itemData(m_editor->targets->currentIndex()); qDebug() << "Project:" << b.projectId(); qDebug() << "Target:" << b.target(); qDebug() << "Buildservice:" << b.buildServiceId(); //*/ Attica::PostJob *j = m_provider.createBuildServiceJob(b); connect(j, &BaseJob::finished, this, &ProjectTest::buildServiceJobCreated); j->start(); setStatus(QLatin1String("Starting a build job on the server.")); } void ProjectTest::cancelBuildServiceJob() { const QString bsj_id = m_editor->buildServiceJobs->currentItem()->data(Qt::UserRole).toString(); qDebug() << "Cancelling build job:" << bsj_id; BuildServiceJob b = BuildServiceJob(); b.setId(bsj_id); Attica::PostJob *j = m_provider.cancelBuildServiceJob(b); connect(j, &BaseJob::finished, this, &ProjectTest::buildServiceJobCanceled); j->start(); } void ProjectTest::buildServiceJobCanceled(Attica::BaseJob *j) { //m_mainWidget->setEnabled(true); // fixme: tab QString output; if (j->metadata().error() == Metadata::NoError) { qDebug() << "job canceled."; // TODO: refresh jobs } else if (j->metadata().error() == Metadata::OcsError) { output.append(QString(QLatin1String("OCS Error: %1")).arg(j->metadata().message())); } else if (j->metadata().error() == Metadata::NetworkError) { output.append(QString(QLatin1String("Network Error: %1")).arg(j->metadata().message())); } else { output.append(QString(QLatin1String("Unknown Error: %1")).arg(j->metadata().message())); } qDebug() << output; updateCurrentProject(); setStatus(output); } void ProjectTest::buildServiceJobCreated(Attica::BaseJob *j) { qDebug() << "JOB CREATED!!!!!!!!!!!!!!!!"; //m_mainWidget->setEnabled(true); // fixme: tab QString output; if (j->metadata().error() == Metadata::NoError) { qDebug() << "job created. I think."; // TODO: refresh jobs } else if (j->metadata().error() == Metadata::OcsError) { output.append(QString(QLatin1String("OCS Error: %1")).arg(j->metadata().message())); } else if (j->metadata().error() == Metadata::NetworkError) { output.append(QString(QLatin1String("Network Error: %1")).arg(j->metadata().message())); } else { output.append(QString(QLatin1String("Unknown Error: %1")).arg(j->metadata().message())); } qDebug() << "New BuildServiceJob created with ID:" << j->metadata().resultingId(); qDebug() << output; updateCurrentProject(); setStatus(output); } void ProjectTest::setStatus(QString status) { qDebug() << "[ii] Status:" << status; m_editor->status->setText(status); } QString ProjectTest::currentProject() { return m_editor->projects->itemData(m_editor->projects->currentIndex()).toString(); } void ProjectTest::updateCurrentProject() { m_editor->buildServiceJobs->clear(); qDebug() << "Updating project ..."; Project p = Project(); p.setId(currentProject()); listBuildServiceJobs(p); }