diff --git a/src/modules/flatpakinfo/CMakeLists.txt b/src/modules/flatpakinfo/CMakeLists.txt deleted file mode 100644 index 4c6c31ddf..000000000 --- a/src/modules/flatpakinfo/CMakeLists.txt +++ /dev/null @@ -1,17 +0,0 @@ -# === This file is part of Calamares - === -# -# SPDX-FileCopyrightText: 2020 Adriaan de Groot -# SPDX-License-Identifier: BSD-2-Clause -# -calamares_add_plugin(flatpakInfo - TYPE job - EXPORT_MACRO PLUGINDLLEXPORT_PRO - SOURCES - flatpakInfoJob.h - ItemFlatpak.h - PackagePool.h - flatpakInfoJob.cpp - ItemFlatpak.cpp - PackagePool.cpp - SHARED_LIB -) diff --git a/src/modules/flatpakinfo/ItemFlatpak.cpp b/src/modules/flatpakinfo/ItemFlatpak.cpp deleted file mode 100644 index 842fafd7c..000000000 --- a/src/modules/flatpakinfo/ItemFlatpak.cpp +++ /dev/null @@ -1,32 +0,0 @@ -#include -#include -#include - -#include "utils/Logger.h" -#include "utils/Variant.h" -#include "ItemFlatpak.h" - -PackageItem -fromFlatpak( const QVariantMap& item_map ) -{ - // check if it is installed - PackageItem item(CalamaresUtils::getString( item_map, "appstream" )); - int status; - int pid = fork(); - if (0 == pid) - { - execlp("flatpak", "flatpak", "info", item.getAppStreamId().toStdString().c_str(), NULL); - } - waitpid(pid, &status, 0); - - if (WEXITSTATUS(status) == 0) - { - item.setInstalled(true); - } - else - { - item.setInstalled(false); - } - - return item; -} diff --git a/src/modules/flatpakinfo/ItemFlatpak.h b/src/modules/flatpakinfo/ItemFlatpak.h deleted file mode 100644 index a76793748..000000000 --- a/src/modules/flatpakinfo/ItemFlatpak.h +++ /dev/null @@ -1,47 +0,0 @@ -/* === This file is part of Calamares - === - * - * SPDX-FileCopyrightText: 2019 Adriaan de Groot - * SPDX-License-Identifier: GPL-3.0-or-later - * - * Calamares is Free Software: see the License-Identifier above. - * - */ - -#ifndef ITEMFLATPAK_H -#define ITEMFLATPAK_H - -#include -#include -#include - -class PackageItem -{ -public: - PackageItem(QString appstreamid): - appstreamid(appstreamid), - installed(false) - { - - } - QString& getAppStreamId(void) - { - return this->appstreamid; - } - void setInstalled(bool installed) - { - this->installed = installed; - } - bool getInstalled(void) - { - return this->installed; - } -private: - QString appstreamid; - bool installed; -}; - - - -PackageItem fromFlatpak( const QVariantMap& map ); - -#endif diff --git a/src/modules/flatpakinfo/PackagePool.cpp b/src/modules/flatpakinfo/PackagePool.cpp deleted file mode 100644 index 88d73b513..000000000 --- a/src/modules/flatpakinfo/PackagePool.cpp +++ /dev/null @@ -1,90 +0,0 @@ - -#include -#include -#include - -#include -#include -#include - -#include -#include -#include - -#include "GlobalStorage.h" -#include "JobQueue.h" -#include "packages/Globals.h" -#include "utils/Logger.h" -#include "utils/Variant.h" -#include "ItemFlatpak.h" - - -void serializePackagesInfo(void); - -QVector < PackageItem > packages; - -void downloadPackagesInfo(void) -{ - int pid; - int pipefd[2]; - bool poolOk = false; - pipe(pipefd); - - pid = fork(); - if (0 == pid) - { - close(pipefd[0]); - dup2(pipefd[1], 1); - execlp("flatpak", "flatpak", "search", "--columns=application", "", NULL); - exit(1); - } - close(pipefd[1]); - - std::string line; - __gnu_cxx::stdio_filebuf filebuf(pipefd[0], std::ios::in); - std::istream stream(&filebuf); - - while (!stream.eof()) - { - getline(stream, line); - QVariantMap item_map; - - //std::cerr << line; - item_map.insert("appstream", QVariant(QString::fromStdString(line))); - item_map.insert("id", QVariant(QString::fromStdString(line))); - - PackageItem item = fromFlatpak(item_map); - packages.append(item); - } - - waitpid(pid, nullptr, 0); - - serializePackagesInfo(); -} - -void serializePackagesInfo(void) -{ - QList changedValue; - auto* gs = Calamares::JobQueue::instance()->globalStorage(); - - // If an earlier packagechooser instance added this data to global storage, combine them - if ( gs->contains( "groups" ) ) - { - auto selectedOrig = gs->value( "groups" ); - - changedValue = selectedOrig.toList(); - for (auto current: packages) - { - QStringList selfInstall; - QVariantMap newValue; - newValue.insert("name", current.getAppStreamId()); - - selfInstall.append(current.getAppStreamId()); - newValue.insert("packages", selfInstall); - changedValue.append(newValue); - } - - gs->remove( "groups" ); - } - gs->insert( "gropus", changedValue ); -} diff --git a/src/modules/flatpakinfo/PackagePool.h b/src/modules/flatpakinfo/PackagePool.h deleted file mode 100644 index 611212458..000000000 --- a/src/modules/flatpakinfo/PackagePool.h +++ /dev/null @@ -1,15 +0,0 @@ -/* === This file is part of Calamares - === - * - * SPDX-FileCopyrightText: 2021 Evan James - * SPDX-License-Identifier: GPL-3.0-or-later - * - * Calamares is Free Software: see the License-Identifier above. - */ - -#ifndef ___PACKAGEPOOL__H___ -#define ___PACKAGEPOOL__H___ - -void downloadPackagesInfo(void); -void serializePackagesInfo(void); - -#endif diff --git a/src/modules/flatpakinfo/flatpakInfo.cfg b/src/modules/flatpakinfo/flatpakInfo.cfg deleted file mode 100644 index 92aec69c6..000000000 --- a/src/modules/flatpakinfo/flatpakInfo.cfg +++ /dev/null @@ -1,8 +0,0 @@ -# SPDX-FileCopyrightText: no -# SPDX-License-Identifier: CC0-1.0 -# -# The zfs module creates the zfs pools and datasets -# -# -# ---- diff --git a/src/modules/flatpakinfo/flatpakInfoJob.cpp b/src/modules/flatpakinfo/flatpakInfoJob.cpp deleted file mode 100644 index d537e1082..000000000 --- a/src/modules/flatpakinfo/flatpakInfoJob.cpp +++ /dev/null @@ -1,59 +0,0 @@ -/* === This file is part of Calamares - === - * - * SPDX-FileCopyrightText: 2021 Evan James - * SPDX-License-Identifier: GPL-3.0-or-later - * - * Calamares is Free Software: see the License-Identifier above. - * - */ - -#include "flatpakInfoJob.h" - -#include "utils/CalamaresUtilsSystem.h" -#include "utils/Logger.h" -#include "utils/Variant.h" - -#include "GlobalStorage.h" -#include "JobQueue.h" -#include "Settings.h" - -#include - -#include - -#include "PackagePool.h" - -FlatpakInfoJob::FlatpakInfoJob( QObject* parent ) - : Calamares::CppJob( parent ) -{ -} - -FlatpakInfoJob::~FlatpakInfoJob() {} - -QString -FlatpakInfoJob::prettyName() const -{ - return tr( "Fill netinstall with flatpak packages" ); -} - - -Calamares::JobResult -FlatpakInfoJob::exec() -{ - QVariantList partitions; - Calamares::GlobalStorage* gs = Calamares::JobQueue::instance()->globalStorage(); - - - downloadPackagesInfo(); - - return Calamares::JobResult::ok(); -} - - -void -FlatpakInfoJob::setConfigurationMap( const QVariantMap& map ) -{ - -} - -CALAMARES_PLUGIN_FACTORY_DEFINITION( FlatpakInfoJobFactory, registerPlugin< FlatpakInfoJob >(); ) diff --git a/src/modules/flatpakinfo/flatpakInfoJob.h b/src/modules/flatpakinfo/flatpakInfoJob.h deleted file mode 100644 index 0a273699d..000000000 --- a/src/modules/flatpakinfo/flatpakInfoJob.h +++ /dev/null @@ -1,43 +0,0 @@ -/* === This file is part of Calamares - === - * - * SPDX-FileCopyrightText: 2021 Evan James - * SPDX-License-Identifier: GPL-3.0-or-later - * - * Calamares is Free Software: see the License-Identifier above. - * - */ - -#ifndef FLATPAKINFOJOB_H -#define FLATPAKINFOJOB_H - -#include -#include -#include - -#include "CppJob.h" - -#include "utils/PluginFactory.h" - -#include "DllMacro.h" - -/** @brief Create zpools and zfs datasets - * - */ -class PLUGINDLLEXPORT FlatpakInfoJob : public Calamares::CppJob -{ - Q_OBJECT - -public: - explicit FlatpakInfoJob( QObject* parent = nullptr ); - ~FlatpakInfoJob() override; - - QString prettyName() const override; - - Calamares::JobResult exec() override; - - void setConfigurationMap( const QVariantMap& configurationMap ) override; -}; - -CALAMARES_PLUGIN_FACTORY_DECLARATION( FlatpakInfoJobFactory ) - -#endif // ZFSJOB_H diff --git a/src/modules/flatpakinfo/module.desc b/src/modules/flatpakinfo/module.desc deleted file mode 100644 index b5ac4cbd6..000000000 --- a/src/modules/flatpakinfo/module.desc +++ /dev/null @@ -1,7 +0,0 @@ -# SPDX-FileCopyrightText: no -# SPDX-License-Identifier: CC0-1.0 ---- -type: "job" -name: "flatpakinfo" -interface: "qtplugin" -load: "libcalamares_job_flatpakInfo.so"