diff --git a/spark-store-project.pro b/spark-store-project.pro index b0cbbc7..be3ac22 100644 --- a/spark-store-project.pro +++ b/spark-store-project.pro @@ -80,9 +80,9 @@ INSTALLS += \ polkit-1 # 暂时不添加 -SUBDIRS += src/spark-update-tool +SUBDIRS += spark-update-tool -spark-update-tool.subdir = src/spark-update-tool -spark-update-tool.file = src/spark-update-tool/spark-update-tool.pro +spark-update-tool.subdir = spark-update-tool +spark-update-tool.file = spark-update-tool/spark-update-tool.pro spark-update-tool.target = spark-update-tool spark-update-tool.depends = spark-store diff --git a/src/spark-update-tool/.gitignore b/spark-update-tool/.gitignore similarity index 100% rename from src/spark-update-tool/.gitignore rename to spark-update-tool/.gitignore diff --git a/spark-update-tool/CMakeLists.txt b/spark-update-tool/CMakeLists.txt new file mode 100644 index 0000000..a76b1e2 --- /dev/null +++ b/spark-update-tool/CMakeLists.txt @@ -0,0 +1,59 @@ +cmake_minimum_required(VERSION 3.16) + +project(spark-update-tool VERSION 0.1 LANGUAGES CXX) + +set(CMAKE_AUTOUIC ON) +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTORCC ON) + +set(CMAKE_CXX_STANDARD 17) +set(CMAKE_CXX_STANDARD_REQUIRED ON) + +find_package(Qt5 REQUIRED COMPONENTS Widgets Network Concurrent) + +set(PROJECT_SOURCES + src/main.cpp + src/mainwindow.cpp + src/mainwindow.h + src/mainwindow.ui + src/aptssupdater.h + src/aptssupdater.cpp + src/icons.qrc + src/appdelegate.h + src/appdelegate.cpp + src/applistmodel.h + src/applistmodel.cpp + src/downloadmanager.h + src/downloadmanager.cpp + src/ignoreconfig.h + src/ignoreconfig.cpp +) + +if(ANDROID) + add_library(spark-update-tool SHARED + ${PROJECT_SOURCES} + ) +# Define properties for Android with Qt 5 after find_package() calls as: +# set(ANDROID_PACKAGE_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/android") +else() + add_executable(spark-update-tool + ${PROJECT_SOURCES} + ) +endif() + +target_link_libraries(spark-update-tool PRIVATE Qt5::Widgets Qt5::Network Qt5::Concurrent) + +set_target_properties(spark-update-tool PROPERTIES + MACOSX_BUNDLE_GUI_IDENTIFIER com.example.spark-update-tool + MACOSX_BUNDLE_BUNDLE_VERSION ${PROJECT_VERSION} + MACOSX_BUNDLE_SHORT_VERSION_STRING ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR} + MACOSX_BUNDLE TRUE + WIN32_EXECUTABLE TRUE +) + +include(GNUInstallDirs) +install(TARGETS spark-update-tool + BUNDLE DESTINATION . + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} +) \ No newline at end of file diff --git a/src/spark-update-tool/LICENSE b/spark-update-tool/LICENSE similarity index 100% rename from src/spark-update-tool/LICENSE rename to spark-update-tool/LICENSE diff --git a/spark-update-tool/README.md b/spark-update-tool/README.md new file mode 100644 index 0000000..778029c --- /dev/null +++ b/spark-update-tool/README.md @@ -0,0 +1,15 @@ +### Spark Update Tool +#### Introduction + +Welcome to Spark Software Updater. Use this tool to update applications on your Linux system. +This version is specifically designed for Linux distributions with Qt6 support. +Please run under root privileges (recommended: use `sudo`). +#### Currently Supported Linux Distributions +- [x] GXDE OS +- [x] Ubuntu +- [x] deepin +- [ ] Kylin + + +#### Contact & Feedback +momen@momen.world diff --git a/src/spark-update-tool/README.zh.md b/spark-update-tool/README.zh.md similarity index 72% rename from src/spark-update-tool/README.zh.md rename to spark-update-tool/README.zh.md index 3e30de3..c597ce4 100644 --- a/src/spark-update-tool/README.zh.md +++ b/spark-update-tool/README.zh.md @@ -1,14 +1,10 @@ ### 星火软件更新器 - #### 简介 -欢迎使用星火软件更新器！本工具可帮助您便捷地更新 Linux 计算机上的各类程序。 - -本版本专为仅包含 Qt5 的 Linux 发行版设计。 -**请在 root 权限下运行本程序。** - +欢迎使用星火软件更新器，您可以使用此更新器更新位于您 Linux 计算机的程序。 +此版本专为有qt6的Linux发行版所使用。 +请在root环境下运行。 #### 当前支持的 Linux 发行版 - - [x] GXDE OS - [x] Ubuntu - [x] deepin @@ -26,5 +22,4 @@ 如您已安装星火应用商店，则会附带本程序。 #### 联系与反馈 - -如有问题或建议，欢迎联系：momen@momen.world \ No newline at end of file +momen@momen.world \ No newline at end of file diff --git a/spark-update-tool/debian/changelog b/spark-update-tool/debian/changelog new file mode 100644 index 0000000..01eb32d --- /dev/null +++ b/spark-update-tool/debian/changelog @@ -0,0 +1,23 @@ +spark-update-tool (1.0.3) unstable; urgency=low + + * 修复默认图标加载失败的问题 + * 修复更新器在安装阶段强制关闭窗口后再次更新无法安装软件包的问题。 + + -- momen Fri, 17 Oct 2025 00:00:00 +0000 +spark-update-tool (1.0.2) unstable; urgency=low + + * 添加复选框，选择多个包更新 + * 修复缩放问题 + * 添加忽略应用功能 + + -- momen Mon, 29 Sep 2025 00:00:00 +0000 +spark-update-tool (1.0.1) unstable; urgency=low + + * 修复窗口调整大小时的错误 + + -- momen Wed, 18 Jun 2025 00:00:00 +0000 +spark-update-tool (1.0.0) unstable; urgency=low + + * Initial release. + + -- momen Wed, 18 Jun 2025 00:00:00 +0000 \ No newline at end of file diff --git a/spark-update-tool/debian/compat b/spark-update-tool/debian/compat new file mode 100644 index 0000000..ca7bf83 --- /dev/null +++ b/spark-update-tool/debian/compat @@ -0,0 +1 @@ +13 \ No newline at end of file diff --git a/src/spark-update-tool/debian/control b/spark-update-tool/debian/control similarity index 100% rename from src/spark-update-tool/debian/control rename to spark-update-tool/debian/control diff --git a/src/spark-update-tool/debian/copyright b/spark-update-tool/debian/copyright similarity index 100% rename from src/spark-update-tool/debian/copyright rename to spark-update-tool/debian/copyright diff --git a/src/spark-update-tool/debian/install b/spark-update-tool/debian/install similarity index 100% rename from src/spark-update-tool/debian/install rename to spark-update-tool/debian/install diff --git a/src/spark-update-tool/debian/postrm b/spark-update-tool/debian/postrm similarity index 100% rename from src/spark-update-tool/debian/postrm rename to spark-update-tool/debian/postrm diff --git a/spark-update-tool/debian/rules b/spark-update-tool/debian/rules new file mode 100755 index 0000000..d9cedc7 --- /dev/null +++ b/spark-update-tool/debian/rules @@ -0,0 +1,27 @@ +#!/usr/bin/make -f + +# 声明兼容性级别 +export DH_VERBOSE=1 + +%: + dh $@ --buildsystem=cmake + +# 确保使用CMake进行配置 +override_dh_auto_configure: + dh_auto_configure -- -DCMAKE_INSTALL_PREFIX=/usr + +# 确保使用CMake进行构建 +override_dh_auto_build: + dh_auto_build + +# 确保使用CMake进行安装 +override_dh_auto_install: + dh_auto_install + +# 确保使用CMake进行清理 +override_dh_auto_clean: + dh_auto_clean + +# 确保使用CMake进行依赖解析 +override_dh_shlibdeps: + dh_shlibdeps --dpkg-shlibdeps-params=--ignore-missing-info \ No newline at end of file diff --git a/src/spark-update-tool/debian/source/format b/spark-update-tool/debian/source/format similarity index 100% rename from src/spark-update-tool/debian/source/format rename to spark-update-tool/debian/source/format diff --git a/src/spark-update-tool/debian/spark-update-tool.desktop b/spark-update-tool/debian/spark-update-tool.desktop similarity index 100% rename from src/spark-update-tool/debian/spark-update-tool.desktop rename to spark-update-tool/debian/spark-update-tool.desktop diff --git a/src/spark-update-tool/resources/128*128/spark-update-tool.png b/spark-update-tool/resources/128*128/spark-update-tool.png similarity index 100% rename from src/spark-update-tool/resources/128*128/spark-update-tool.png rename to spark-update-tool/resources/128*128/spark-update-tool.png diff --git a/spark-update-tool/resources/default_icon.png b/spark-update-tool/resources/default_icon.png new file mode 100644 index 0000000..bffa379 Binary files /dev/null and b/spark-update-tool/resources/default_icon.png differ diff --git a/src/spark-update-tool/resources/default_icon.svg b/spark-update-tool/resources/default_icon.svg similarity index 100% rename from src/spark-update-tool/resources/default_icon.svg rename to spark-update-tool/resources/default_icon.svg diff --git a/src/spark-update-tool/resources/down_arrow.svg b/spark-update-tool/resources/down_arrow.svg similarity index 100% rename from src/spark-update-tool/resources/down_arrow.svg rename to spark-update-tool/resources/down_arrow.svg diff --git a/src/spark-update-tool/resources/spark-update-tool.svg b/spark-update-tool/resources/spark-update-tool.svg similarity index 100% rename from src/spark-update-tool/resources/spark-update-tool.svg rename to spark-update-tool/resources/spark-update-tool.svg diff --git a/src/spark-update-tool/spark-update-tool.pro b/spark-update-tool/spark-update-tool.pro similarity index 53% rename from src/spark-update-tool/spark-update-tool.pro rename to spark-update-tool/spark-update-tool.pro index 69dc500..45bf818 100644 --- a/src/spark-update-tool/spark-update-tool.pro +++ b/spark-update-tool/spark-update-tool.pro @@ -1,5 +1,4 @@ -# spark-update-tool.pro -QT += core gui widgets network concurrent +QT += core gui widgets network concurrent TARGET = spark-update-tool TEMPLATE = app @@ -8,9 +7,8 @@ CONFIG += c++17 # Enable auto features (uic, moc, rcc) CONFIG += qt warn_on release -QT_CONFIG += no-pkg-config -# Version info (replace with your actual version) +# Version info VERSION = 0.1.0 DEFINES += APP_VERSION=\\\"$$VERSION\\\" @@ -21,14 +19,16 @@ SOURCES += \ src/aptssupdater.cpp \ src/appdelegate.cpp \ src/applistmodel.cpp \ - src/downloadmanager.cpp + src/downloadmanager.cpp \ + src/ignoreconfig.cpp HEADERS += \ src/mainwindow.h \ src/aptssupdater.h \ src/appdelegate.h \ src/applistmodel.h \ - src/downloadmanager.h + src/downloadmanager.h \ + src/ignoreconfig.h FORMS += \ src/mainwindow.ui @@ -36,13 +36,14 @@ FORMS += \ RESOURCES += \ src/icons.qrc -# macOS bundle properties (optional) -macx { - QMAKE_INFO_PLIST = Info.plist - ICON = resources/spark-update-tool.icns - BUNDLE_IDENTIFIER = org.spark.store.update-tool +# Linux-specific settings +unix:!macx { + # Installation paths for Linux + target.path = $$[QT_INSTALL_BINS] + INSTALLS += target + + # Additional Linux specific configurations if needed + QMAKE_CXXFLAGS += -Wall -Wextra } -# Installation paths (matches CMake install) -target.path = $$[QT_INSTALL_BINS] -INSTALLS += target \ No newline at end of file +# Remove Windows and macOS specific sections since we're focusing on Linux diff --git a/spark-update-tool/src/appdelegate.cpp b/spark-update-tool/src/appdelegate.cpp new file mode 100644 index 0000000..792c249 --- /dev/null +++ b/spark-update-tool/src/appdelegate.cpp @@ -0,0 +1,506 @@ +#include "appdelegate.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include + +AppDelegate::AppDelegate(QObject *parent) + : QStyledItemDelegate(parent), m_downloadManager(new DownloadManager(this)), m_installProcess(nullptr) { + connect(m_downloadManager, &DownloadManager::downloadFinished, this, + [this](const QString &packageName, bool success) { + if (m_downloads.contains(packageName)) { + m_downloads[packageName].isDownloading = false; + // 不要提前设置 isInstalled + emit updateDisplay(packageName); + qDebug() << (success ? "下载完成:" : "下载失败:") << packageName; + if (success) { + enqueueInstall(packageName); // 安装完成后再设置 isInstalled + } + } + }); + + connect(m_downloadManager, &DownloadManager::downloadProgress, this, + [this](const QString &packageName, int progress) { + if (m_downloads.contains(packageName)) { + m_downloads[packageName].progress = progress; + qDebug()<save(); + + // 检查是否为忽略状态 + bool isIgnored = index.data(Qt::UserRole + 8).toBool(); + + if (option.state & QStyle::State_Selected) + painter->fillRect(option.rect, option.palette.highlight()); + else + painter->fillRect(option.rect, QColor("#F3F4F6")); + + // 绘制复选框 + QString packageName = index.data(Qt::UserRole + 1).toString(); + bool isSelected = m_selectedPackages.contains(packageName); + + QRect checkboxRect(option.rect.left() + 10, option.rect.top() + (option.rect.height() - 20) / 2, 20, 20); + + // 绘制复选框边框 + QColor checkboxColor = isIgnored ? QColor("#CCCCCC") : QColor("#888888"); + painter->setPen(checkboxColor); + painter->setBrush(Qt::NoBrush); + painter->drawRect(checkboxRect); + + // 如果选中，绘制勾选标记 + if (isSelected && !isIgnored) { + painter->setPen(QPen(QColor("#2563EB"), 2)); + painter->setBrush(QColor("#2563EB")); + painter->drawRect(checkboxRect.adjusted(4, 4, -4, -4)); + } + + QFont boldFont = option.font; + boldFont.setBold(true); + QFont normalFont = option.font; + + QString name = index.data(Qt::DisplayRole).toString(); + QString currentVersion = index.data(Qt::UserRole + 2).toString(); + QString newVersion = index.data(Qt::UserRole + 3).toString(); + QString iconPath = index.data(Qt::UserRole + 4).toString(); + QString size = index.data(Qt::UserRole + 5).toString(); + QString description = index.data(Qt::UserRole + 6).toString(); + + QRect rect = option.rect; + int margin = 10, spacing = 6, iconSize = 40; + + // 调整图标位置，为复选框留出空间 + QRect iconRect(rect.left() + 40, rect.top() + (rect.height() - iconSize) / 2, iconSize, iconSize); + + + // 如果是忽略状态，绘制灰色图标 + if (isIgnored) { + // 创建灰度效果 + QPixmap originalPixmap = QIcon(iconPath).pixmap(iconSize, iconSize); + QPixmap grayPixmap(originalPixmap.size()); + grayPixmap.fill(Qt::transparent); + QPainter grayPainter(&grayPixmap); + grayPainter.setOpacity(0.3); // 设置透明度使其变灰 + grayPainter.drawPixmap(0, 0, originalPixmap); + grayPainter.end(); + painter->drawPixmap(iconRect, grayPixmap); + } else { + QIcon(iconPath).paint(painter, iconRect); + } + + int textX = iconRect.right() + margin; + int textWidth = rect.width() - textX - 100; + + QRect nameRect(textX, rect.top() + margin, textWidth, 20); + painter->setFont(boldFont); + QColor nameColor = isIgnored ? QColor("#999999") : QColor("#333333"); + painter->setPen(nameColor); + painter->drawText(nameRect, Qt::AlignLeft | Qt::AlignVCenter, name); + + QRect versionRect(textX, nameRect.bottom() + spacing, textWidth, 20); + painter->setFont(normalFont); + QColor versionColor = isIgnored ? QColor("#AAAAAA") : QColor("#888888"); + painter->setPen(versionColor); + painter->drawText(versionRect, Qt::AlignLeft | Qt::AlignVCenter, + QString("当前版本: %1 → 新版本: %2").arg(currentVersion, newVersion)); + + QRect descRect(textX, versionRect.bottom() + spacing, textWidth, 40); + painter->setFont(normalFont); + QColor descColor = isIgnored ? QColor("#CCCCCC") : QColor("#AAAAAA"); + painter->setPen(descColor); + painter->drawText(descRect, Qt::TextWordWrap, + QString("包大小：%1 MB").arg(QString::number(size.toDouble() / (1024 * 1024), 'f', 2))); + + bool isDownloading = m_downloads.contains(packageName) && m_downloads[packageName].isDownloading; + int progress = m_downloads.value(packageName, DownloadInfo{0, false}).progress; + bool isInstalled = m_downloads.value(packageName).isInstalled; + bool isInstalling = m_downloads.value(packageName).isInstalling; + + // 如果是忽略状态，显示"已忽略"文本和"取消忽略"按钮 + if (isIgnored) { + QRect ignoredTextRect(rect.right() - 170, rect.top() + (rect.height() - 30) / 2, 80, 30); + painter->setPen(QColor("#999999")); + painter->setFont(option.font); + painter->drawText(ignoredTextRect, Qt::AlignCenter, "已忽略"); + + // 绘制取消忽略按钮 + QRect unignoreButtonRect(rect.right() - 80, rect.top() + (rect.height() - 30) / 2, 70, 30); + painter->setPen(Qt::NoPen); + painter->setBrush(QColor("#F3F4F6")); + painter->drawRoundedRect(unignoreButtonRect, 4, 4); + painter->setPen(QColor("#6B7280")); + painter->drawText(unignoreButtonRect, Qt::AlignCenter, "取消忽略"); + } else if (isDownloading) { + QRect progressRect(rect.right() - 270, rect.top() + (rect.height() - 20) / 2, 150, 20); + QStyleOptionProgressBar progressBarOption; + progressBarOption.rect = progressRect; + progressBarOption.minimum = 0; + progressBarOption.maximum = 100; + progressBarOption.progress = progress; + progressBarOption.text = QString("%1%").arg(progress); + progressBarOption.textVisible = true; + QApplication::style()->drawControl(QStyle::CE_ProgressBar, &progressBarOption, painter); + + QRect cancelButtonRect(rect.right() - 80, rect.top() + (rect.height() - 30) / 2, 70, 30); + painter->setPen(Qt::NoPen); + painter->setBrush(QColor("#ff4444")); + painter->drawRoundedRect(cancelButtonRect, 4, 4); + + painter->setPen(Qt::white); + painter->setFont(option.font); + painter->drawText(cancelButtonRect, Qt::AlignCenter, "取消"); + } else if (isInstalling) { + QRect spinnerRect(option.rect.right() - 80, option.rect.top() + (option.rect.height() - 30) / 2, 30, 30); + + // 修改：使用 m_spinnerAngle + QPen pen(QColor("#2563EB"), 3); + painter->setPen(pen); + painter->setRenderHint(QPainter::Antialiasing, true); + QRectF arcRect = spinnerRect.adjusted(3, 3, -3, -3); + painter->drawArc(arcRect, m_spinnerAngle * 16, 120 * 16); // 120度弧 + + QRect textRect(option.rect.right() - 120, option.rect.top() + (option.rect.height() - 30) / 2, 110, 30); + painter->setPen(QColor("#2563EB")); + painter->setFont(option.font); + painter->drawText(textRect, Qt::AlignLeft | Qt::AlignVCenter, "正在安装中"); + } else { + // 绘制忽略按钮 + QRect ignoreButtonRect(option.rect.right() - 160, option.rect.top() + (option.rect.height() - 30) / 2, 70, 30); + painter->setPen(Qt::NoPen); + painter->setBrush(QColor("#F3F4F6")); + painter->drawRoundedRect(ignoreButtonRect, 4, 4); + painter->setPen(QColor("#6B7280")); + painter->drawText(ignoreButtonRect, Qt::AlignCenter, "忽略"); + + // 绘制更新按钮 + QRect updateButtonRect(option.rect.right() - 80, option.rect.top() + (option.rect.height() - 30) / 2, 70, 30); + painter->setPen(Qt::NoPen); + if (isInstalled) { + painter->setBrush(QColor("#10B981")); + painter->drawRoundedRect(updateButtonRect, 4, 4); + painter->setPen(Qt::white); + painter->drawText(updateButtonRect, Qt::AlignCenter, "已安装"); + } else if (m_downloads.contains(packageName) && !m_downloads[packageName].isDownloading) { + painter->setBrush(QColor("#10B981")); + painter->drawRoundedRect(updateButtonRect, 4, 4); + painter->setPen(Qt::white); + painter->drawText(updateButtonRect, Qt::AlignCenter, "下载完成"); + } else { + painter->setBrush(QColor("#e9effd")); + painter->drawRoundedRect(updateButtonRect, 4, 4); + painter->setPen(QColor("#2563EB")); + painter->drawText(updateButtonRect, Qt::AlignCenter, "更新"); + } + } + + painter->restore(); +} + +QSize AppDelegate::sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const { + return QSize(option.rect.width(), 110); +} + +bool AppDelegate::editorEvent(QEvent *event, QAbstractItemModel *model, + const QStyleOptionViewItem &option, const QModelIndex &index) { + if (event->type() == QEvent::MouseButtonRelease) { + QMouseEvent *mouseEvent = static_cast(event); + QRect rect = option.rect; + QString packageName = index.data(Qt::UserRole + 1).toString(); + + // 检查是否为忽略状态，如果是则只允许取消忽略按钮的交互 + bool isIgnored = index.data(Qt::UserRole + 8).toBool(); + if (isIgnored) { + QRect unignoreButtonRect(option.rect.right() - 80, option.rect.top() + (option.rect.height() - 30) / 2, 70, 30); + if (unignoreButtonRect.contains(mouseEvent->pos())) { + // 发送取消忽略信号 + emit unignoreApp(packageName); + return true; + } + return true; // 消耗其他事件，不允许其他交互 + } + + // 检查是否点击了复选框 + QRect checkboxRect(rect.left() + 10, rect.top() + (rect.height() - 20) / 2, 20, 20); + if (checkboxRect.contains(mouseEvent->pos())) { + if (m_selectedPackages.contains(packageName)) { + m_selectedPackages.remove(packageName); + } else { + m_selectedPackages.insert(packageName); + } + emit updateDisplay(packageName); + return true; + } + + if (m_downloads.contains(packageName) && m_downloads[packageName].isDownloading) { + QRect cancelButtonRect(rect.right() - 70, rect.top() + (rect.height() - 20) / 2, 60, 20); + if (cancelButtonRect.contains(mouseEvent->pos())) { + m_downloadManager->cancelDownload(packageName); + m_downloads.remove(packageName); + emit updateDisplay(packageName); + return true; + } + } else { + // 检查是否点击了忽略按钮 + QRect ignoreButtonRect(rect.right() - 160, rect.top() + (rect.height() - 30) / 2, 70, 30); + if (ignoreButtonRect.contains(mouseEvent->pos())) { + QString currentVersion = index.data(Qt::UserRole + 2).toString(); + emit ignoreApp(packageName, currentVersion); + return true; + } + + // 检查是否点击了更新按钮 + QRect updateButtonRect(rect.right() - 80, rect.top() + (rect.height() - 30) / 2, 70, 30); + if (updateButtonRect.contains(mouseEvent->pos())) { + if (m_downloads.contains(packageName) && !m_downloads[packageName].isDownloading) { + return false; + } + + // 检查/tmp目录下是否已经存在deb包 + QDir tempDir(QDir::tempPath()); + QStringList debs = tempDir.entryList(QStringList() << QString("%1_*.deb").arg(packageName), QDir::Files); + QString debPath; + if (!debs.isEmpty()) { + debPath = tempDir.absoluteFilePath(debs.first()); + } else { + debs = tempDir.entryList(QStringList() << QString("%1*.deb").arg(packageName), QDir::Files); + if (!debs.isEmpty()) { + debPath = tempDir.absoluteFilePath(debs.first()); + } + } + + // 如果存在deb包，直接进行安装 + if (!debPath.isEmpty() && QFile::exists(debPath)) { + qDebug() << "发现已存在的deb包，直接进行安装:" << debPath; + enqueueInstall(packageName); + } else { + // 否则触发下载流程 + QString downloadUrl = index.data(Qt::UserRole + 7).toString(); + QString outputPath = QString("%1/%2.metalink").arg(QDir::tempPath(), packageName); + + m_downloads[packageName] = {0, true}; + m_downloadManager->startDownload(packageName, downloadUrl, outputPath); + emit updateDisplay(packageName); + } + return true; + } + } + } + + return QStyledItemDelegate::editorEvent(event, model, option, index); +} + +void AppDelegate::startDownloadForAll() { + if (!m_model) return; + for (int row = 0; row < m_model->rowCount(); ++row) { + QModelIndex index = m_model->index(row, 0); + QString packageName = index.data(Qt::UserRole + 1).toString(); + if (m_downloads.contains(packageName) && (m_downloads[packageName].isDownloading || m_downloads[packageName].isInstalled)) + continue; + QString downloadUrl = index.data(Qt::UserRole + 7).toString(); + QString outputPath = QString("%1/%2.metalink").arg(QDir::tempPath(), packageName); + m_downloads[packageName] = {0, true, false}; + m_downloadManager->startDownload(packageName, downloadUrl, outputPath); + emit updateDisplay(packageName); + } +} + +void AppDelegate::enqueueInstall(const QString &packageName) { + m_installQueue.enqueue(packageName); + if (!m_isInstalling) { + startNextInstall(); + } +} + +void AppDelegate::startNextInstall() { + if (m_installQueue.isEmpty()) { + m_isInstalling = false; + m_installingPackage.clear(); + m_spinnerUpdateTimer.stop(); // 新增：停止定时器 + return; + } + m_isInstalling = true; + QString packageName = m_installQueue.dequeue(); + m_installingPackage = packageName; + m_downloads[packageName].isInstalling = true; + m_spinnerUpdateTimer.start(); // 新增：启动定时器 + emit updateDisplay(packageName); + + QDir tempDir(QDir::tempPath()); + QStringList debs = tempDir.entryList(QStringList() << QString("%1_*.deb").arg(packageName), QDir::Files); + QString debPath; + if (!debs.isEmpty()) { + debPath = tempDir.absoluteFilePath(debs.first()); + } else { + debs = tempDir.entryList(QStringList() << QString("%1*.deb").arg(packageName), QDir::Files); + if (!debs.isEmpty()) { + debPath = tempDir.absoluteFilePath(debs.first()); + } + } + + if (debPath.isEmpty()) { + qWarning() << "未找到deb文件，包名:" << packageName; + m_downloads[packageName].isInstalling = false; + emit updateDisplay(packageName); + m_installingPackage.clear(); + startNextInstall(); + return; + } + + m_installProcess = new QProcess(this); + + QString logPath = QString("/tmp/%1_install.log").arg(packageName); + QFile *logFile = new QFile(logPath, m_installProcess); + if (logFile->open(QIODevice::Append | QIODevice::Text)) { + QFile::setPermissions(logPath, QFile::ReadOwner | QFile::WriteOwner | QFile::ExeOwner | + QFile::ReadGroup | QFile::WriteGroup | QFile::ExeGroup | + QFile::ReadOther | QFile::WriteOther | QFile::ExeOther); + connect(m_installProcess, &QProcess::readyReadStandardOutput, this, [this, packageName, logFile]() { + QByteArray out = m_installProcess->readAllStandardOutput(); + logFile->write(out); + logFile->flush(); + QString text = QString::fromLocal8Bit(out); + qDebug().noquote() << text; + if (text.contains(QStringLiteral("软件包已安装"))) { + m_downloads[packageName].isInstalling = false; + m_downloads[packageName].isInstalled = true; + emit updateDisplay(packageName); + } + }); + connect(m_installProcess, &QProcess::readyReadStandardError, this, [this, logFile]() { + QByteArray err = m_installProcess->readAllStandardError(); + logFile->write(err); + logFile->flush(); + qDebug().noquote() << QString::fromLocal8Bit(err); + }); + connect(m_installProcess, QOverload::of(&QProcess::finished), + this, [this, packageName, logFile, debPath](int exitCode, QProcess::ExitStatus status) { + if (logFile) logFile->close(); + m_downloads[packageName].isInstalling = false; + if (exitCode == 0) { + m_downloads[packageName].isInstalled = true; + + // 安装成功后删除deb包 + if (QFile::exists(debPath)) { + if (QFile::remove(debPath)) { + qDebug() << "已删除deb包:" << debPath; + } else { + qWarning() << "删除deb包失败:" << debPath; + } + } + } + emit updateDisplay(packageName); + m_installProcess->deleteLater(); + m_installProcess = nullptr; + m_installingPackage.clear(); + startNextInstall(); + }); + } else { + connect(m_installProcess, &QProcess::readyReadStandardOutput, this, [this, packageName, debPath]() { + QByteArray out = m_installProcess->readAllStandardOutput(); + QString text = QString::fromLocal8Bit(out); + qDebug().noquote() << text; + if (text.contains(QStringLiteral("软件包已安装"))) { + m_downloads[packageName].isInstalling = false; + m_downloads[packageName].isInstalled = true; + + // 安装成功后删除deb包 + if (QFile::exists(debPath)) { + if (QFile::remove(debPath)) { + qDebug() << "已删除deb包:" << debPath; + } else { + qWarning() << "删除deb包失败:" << debPath; + } + } + + emit updateDisplay(packageName); + } + }); + connect(m_installProcess, &QProcess::readyReadStandardError, this, [this]() { + QByteArray err = m_installProcess->readAllStandardError(); + qDebug().noquote() << QString::fromLocal8Bit(err); + }); + connect(m_installProcess, QOverload::of(&QProcess::finished), + this, [this, packageName, debPath](int exitCode, QProcess::ExitStatus /*status*/) { + // 如果通过退出码判断安装成功，也删除deb包 + if (exitCode == 0 && QFile::exists(debPath)) { + if (QFile::remove(debPath)) { + qDebug() << "已删除deb包:" << debPath; + } else { + qWarning() << "删除deb包失败:" << debPath; + } + } + + emit updateDisplay(packageName); + m_installProcess->deleteLater(); + m_installProcess = nullptr; + m_installingPackage.clear(); + startNextInstall(); + }); + } + + QStringList args; + args << debPath << "--no-create-desktop-entry" << "--delete-after-install"; + m_installProcess->start("ssinstall", args); +} + +// 新增槽函数，用于更新旋转角度并触发刷新 +void AppDelegate::updateSpinner() { + m_spinnerAngle = (m_spinnerAngle + 10) % 360; // 每次增加10度 + emit updateDisplay(m_installingPackage); // 仅刷新当前正在安装的项 +} + +// 新增：更新选中应用的方法 +void AppDelegate::startDownloadForSelected() { + if (!m_model) return; + for (int row = 0; row < m_model->rowCount(); ++row) { + QModelIndex index = m_model->index(row, 0); + QString packageName = index.data(Qt::UserRole + 1).toString(); + + // 只下载选中的应用 + if (m_selectedPackages.contains(packageName)) { + if (m_downloads.contains(packageName) && (m_downloads[packageName].isDownloading || m_downloads[packageName].isInstalled)) + continue; + QString downloadUrl = index.data(Qt::UserRole + 7).toString(); + QString outputPath = QString("%1/%2.metalink").arg(QDir::tempPath(), packageName); + m_downloads[packageName] = {0, true, false}; + m_downloadManager->startDownload(packageName, downloadUrl, outputPath); + emit updateDisplay(packageName); + } + } +} + +// 复选框相关方法实现 +void AppDelegate::setSelectedPackages(const QSet &selected) { + m_selectedPackages = selected; +} + +QSet AppDelegate::getSelectedPackages() const { + return m_selectedPackages; +} + +void AppDelegate::clearSelection() { + m_selectedPackages.clear(); +} + +// 实现获取下载状态信息的方法 +const QHash& AppDelegate::getDownloads() const { + return m_downloads; +} \ No newline at end of file diff --git a/src/spark-update-tool/src/appdelegate.h b/spark-update-tool/src/appdelegate.h similarity index 56% rename from src/spark-update-tool/src/appdelegate.h rename to spark-update-tool/src/appdelegate.h index 0545155..25ea337 100644 --- a/src/spark-update-tool/src/appdelegate.h +++ b/spark-update-tool/src/appdelegate.h @@ -5,13 +5,16 @@ #include #include #include +#include +#include + #include "downloadmanager.h" struct DownloadInfo { int progress = 0; bool isDownloading = false; bool isInstalled = false; - bool isInstalling = false; // 新增：标记是否正在安装 + bool isInstalling = false; }; class AppDelegate : public QStyledItemDelegate { @@ -26,21 +29,43 @@ public: bool editorEvent(QEvent *event, QAbstractItemModel *model, const QStyleOptionViewItem &option, const QModelIndex &index) override; void startDownloadForAll(); + void startDownloadForSelected(); + + // 复选框相关方法 + void setSelectedPackages(const QSet &selected); + QSet getSelectedPackages() const; + void clearSelection(); + + // 获取下载状态信息 + const QHash& getDownloads() const; + signals: void updateDisplay(const QString &packageName); + void updateFinished(bool success); //传递是否完成更新 + void ignoreApp(const QString &packageName, const QString &version); // 新增：忽略应用信号 + void unignoreApp(const QString &packageName); // 新增：取消忽略应用信号 + +private slots: + void updateSpinner(); // 新增槽函数 private: DownloadManager *m_downloadManager; QHash m_downloads; QAbstractItemModel *m_model = nullptr; + + // 复选框相关成员变量 + QSet m_selectedPackages; QQueue m_installQueue; bool m_isInstalling = false; QProcess *m_installProcess = nullptr; - QString m_installingPackage; // 当前正在安装的包名 - QElapsedTimer m_spinnerTimer; // 用于转圈动画 + QString m_installingPackage; + QElapsedTimer m_spinnerTimer; + + QTimer m_spinnerUpdateTimer; // 新增定时器 + int m_spinnerAngle = 0; // 新增角度变量 void enqueueInstall(const QString &packageName); void startNextInstall(); -}; +}; \ No newline at end of file diff --git a/src/spark-update-tool/src/applistmodel.cpp b/spark-update-tool/src/applistmodel.cpp similarity index 82% rename from src/spark-update-tool/src/applistmodel.cpp rename to spark-update-tool/src/applistmodel.cpp index e5acd96..9d7c83d 100644 --- a/src/spark-update-tool/src/applistmodel.cpp +++ b/spark-update-tool/src/applistmodel.cpp @@ -1,5 +1,4 @@ #include "applistmodel.h" -#include AppListModel::AppListModel(QObject *parent) : QAbstractListModel(parent) {} @@ -33,6 +32,8 @@ QVariant AppListModel::data(const QModelIndex &index, int role) const return map.value("description"); case Qt::UserRole + 7: // 下载 URL return map.value("download_url"); // 返回下载 URL + case Qt::UserRole + 8: // 忽略状态 + return map.value("ignored"); default: return QVariant(); } @@ -53,11 +54,21 @@ void AppListModel::setUpdateData(const QJsonArray &updateInfo) map["icon"] = obj["icon"].toString(); map["size"] = obj["size"].toString(); map["download_url"] = obj["download_url"].toString(); // 确保设置下载 URL + map["ignored"] = obj["ignored"].toBool(); // 设置忽略状态 m_data.append(map); // 添加到 QList - qDebug() << "设置到模型的包名:" << map["package"].toString(); + qDebug() << "设置到模型的包名:" << map["package"].toString() << "忽略状态:" << map["ignored"].toBool(); qDebug() << "设置到模型的下载 URL:" << map["download_url"].toString(); // 检查设置的数据 } endResetModel(); } + +bool AppListModel::isAppIgnored(const QModelIndex &index) const +{ + if (!index.isValid() || index.row() >= m_data.size()) + return false; + + const QVariantMap &map = m_data.at(index.row()); + return map.value("ignored").toBool(); +} \ No newline at end of file diff --git a/src/spark-update-tool/src/applistmodel.h b/spark-update-tool/src/applistmodel.h similarity index 82% rename from src/spark-update-tool/src/applistmodel.h rename to spark-update-tool/src/applistmodel.h index 2fb36c0..d3f304d 100644 --- a/src/spark-update-tool/src/applistmodel.h +++ b/spark-update-tool/src/applistmodel.h @@ -5,7 +5,7 @@ #include // 添加 QJsonObject 头文件 #include - +#include class AppListModel : public QAbstractListModel { Q_OBJECT @@ -18,9 +18,12 @@ public: // 设置更新数据 void setUpdateData(const QJsonArray &data); + + // 获取忽略状态 + bool isAppIgnored(const QModelIndex &index) const; private: QList m_data; // 修改类型为 QList }; -#endif // APPLISTMODEL_H +#endif // APPLISTMODEL_H \ No newline at end of file diff --git a/src/spark-update-tool/src/aptssupdater.cpp b/spark-update-tool/src/aptssupdater.cpp similarity index 87% rename from src/spark-update-tool/src/aptssupdater.cpp rename to spark-update-tool/src/aptssupdater.cpp index 71dc533..a199d32 100644 --- a/src/spark-update-tool/src/aptssupdater.cpp +++ b/spark-update-tool/src/aptssupdater.cpp @@ -15,16 +15,17 @@ QStringList aptssUpdater::getUpdateablePackages() { QStringList packageDetails; QProcess process; - QString command = R"(env LANGUAGE=en_US /usr/bin/apt -c /opt/durapps/spark-store/bin/apt-fast-conf/aptss-apt.conf list --upgradable -o Dir::Etc::sourcelist="/opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list" -o Dir::Etc::sourceparts="/dev/null" -o APT::Get::List-Cleanup="0" | awk 'NR>1')"; + QString command = R"(env LANGUAGE=en_US /usr/bin/apt -c /opt/durapps/spark-store/bin/apt-fast-conf/aptss-apt.conf list --upgradable -o Dir::Etc::sourcelist="/opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/aptss.list" -o Dir::Etc::sourceparts="/dev/null" -o APT::Get::List-Cleanup="0" | awk 'NR>1')"; process.start("bash", QStringList() << "-c" << command); - if (!process.waitForFinished()) { - qWarning() << "Process failed to finish."; + if (!process.waitForFinished(30000)) { // 30秒超时 + qWarning() << "Process failed to finish within 30 seconds."; + process.kill(); return packageDetails; } QString output = process.readAllStandardOutput(); - QStringList lines = output.split('\n', QString::SkipEmptyParts); + QStringList lines = output.split('\n', Qt::SkipEmptyParts); // 创建临时文件 QTemporaryFile tempFile; @@ -68,7 +69,6 @@ QStringList aptssUpdater::getUpdateablePackages() QStringList aptssUpdater::getPackageSizes() { QStringList packageDetails; - QProcess process; // 获取可更新包名列表 QStringList updateablePackages; @@ -77,14 +77,17 @@ QStringList aptssUpdater::getPackageSizes() } foreach (const QString &packageName, updateablePackages) { + QProcess process; // 在循环内部创建新的QProcess实例 + // 构建新命令（包含包名参数） QString command = QString("/usr/bin/apt download %1 --print-uris -c /opt/durapps/spark-store/bin/apt-fast-conf/aptss-apt.conf " - "-o Dir::Etc::sourcelist=\"/opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list\" " + "-o Dir::Etc::sourcelist=\"/opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/aptss.list\" " "-o Dir::Etc::sourceparts=\"/dev/null\"").arg(packageName); process.start("bash", QStringList() << "-c" << command); - if (!process.waitForFinished()) { - qWarning() << "获取包信息失败：" << packageName; + if (!process.waitForFinished(30000)) { // 30秒超时 + qWarning() << "获取包信息失败：" << packageName << "（超时）"; + process.kill(); continue; } @@ -116,7 +119,6 @@ QStringList aptssUpdater::getPackageSizes() QStringList aptssUpdater::getDesktopAppNames() { QStringList appNames; - QProcess dpkgProcess; // 获取当前系统语言环境 QString lang = QLocale().name().replace("_", "-"); @@ -125,13 +127,19 @@ QStringList aptssUpdater::getDesktopAppNames() QStringList packages = packageName; foreach (const QString &package, packages) { + QProcess dpkgProcess; // 在循环内部创建新的QProcess实例 + QString packageName = package.split(":")[0]; QString finalName = packageName; // 默认使用包名 // 获取包文件列表 dpkgProcess.start("dpkg", QStringList() << "-L" << packageName); - dpkgProcess.waitForFinished(); - QStringList files = QString(dpkgProcess.readAllStandardOutput()).split('\n', QString::SkipEmptyParts); + if (!dpkgProcess.waitForFinished(30000)) { // 30秒超时 + qWarning() << "获取包文件列表失败：" << packageName << "（超时）"; + dpkgProcess.kill(); + continue; + } + QStringList files = QString(dpkgProcess.readAllStandardOutput()).split('\n', Qt::SkipEmptyParts); // 先检查常规应用目录 QStringList regularDesktopFiles = files.filter("/usr/share/applications/"); @@ -225,19 +233,25 @@ bool aptssUpdater::checkDesktopFiles(const QStringList &desktopFiles, QString &a QStringList aptssUpdater::getPackageIcons() { QStringList packageIcons; - QProcess dpkgProcess; // 遍历所有可更新包 QStringList packages = packageName; foreach (const QString &package, packages) { + QProcess dpkgProcess; // 在循环内部创建新的QProcess实例 + QString packageName = package.split(":")[0]; - QString iconPath = ":/resources/default_icon.svg"; // 默认图标 + QString iconPath = ":/resources/default_icon.png"; // 默认图标 // 获取包文件列表 dpkgProcess.start("dpkg", QStringList() << "-L" << packageName); - dpkgProcess.waitForFinished(); - QStringList files = QString(dpkgProcess.readAllStandardOutput()).split('\n', QString::SkipEmptyParts); + if (!dpkgProcess.waitForFinished(30000)) { // 30秒超时 + qWarning() << "获取包文件列表失败：" << packageName << "（超时）"; + dpkgProcess.kill(); + packageIcons << QString("%1: %2").arg(packageName, iconPath); + continue; + } + QStringList files = QString(dpkgProcess.readAllStandardOutput()).split('\n', Qt::SkipEmptyParts); // 查找.desktop文件 QStringList desktopFiles = files.filter(QRegularExpression("/(usr/share|opt/apps)/.*\\.desktop$")); @@ -265,6 +279,7 @@ QStringList aptssUpdater::getPackageIcons() foreach (const QString &path, iconPaths) { if (QFile::exists(path)) { iconPath = path; + qDebug() << "找到图标文件:" << path; break; } } @@ -272,6 +287,7 @@ QStringList aptssUpdater::getPackageIcons() // 已经是绝对路径 if (QFile::exists(iconName)) { iconPath = iconName; + qDebug() << "使用绝对路径图标文件:" << iconName; } } break; @@ -282,10 +298,14 @@ QStringList aptssUpdater::getPackageIcons() } // 如果.desktop中没有找到图标，尝试直接查找包中的图标文件 - if (iconPath == ":/resources/default_icon.svg") { + if (iconPath == ":/resources/default_icon.png") { + qDebug() << "未在.desktop文件中找到图标，尝试直接查找包中的图标文件"; QStringList iconFiles = files.filter(QRegularExpression("/(usr/share/pixmaps|usr/share/icons|opt/apps/.*/entries/icons)/.*\\.(png|svg)$")); if (!iconFiles.isEmpty()) { iconPath = iconFiles.first(); + qDebug() << "从包中找到图标文件:" << iconPath; + } else { + qDebug() << "未在包中找到图标文件，使用默认图标"; } } @@ -394,5 +414,3 @@ QJsonArray aptssUpdater::getUpdateInfoAsJson() qDebug()<../resources/default_icon.svg ../resources/spark-update-tool.svg ../resources/128*128/spark-update-tool.png + ../resources/default_icon.png diff --git a/spark-update-tool/src/ignoreconfig.cpp b/spark-update-tool/src/ignoreconfig.cpp new file mode 100644 index 0000000..32089cd --- /dev/null +++ b/spark-update-tool/src/ignoreconfig.cpp @@ -0,0 +1,148 @@ +#include "ignoreconfig.h" +#include +#include +#include +#include +#include +#include // for geteuid + +IgnoreConfig::IgnoreConfig(QObject *parent) + : QObject(parent) +{ + // 设置配置文件路径 + QString configDir; + + // 检查是否以 root 权限运行 + if (geteuid() == 0) { + // 首先检查是否有 SUDO_USER_HOME 环境变量（表示是通过 pkexec 提权的普通用户） + QByteArray sudoUserHomeEnv = qgetenv("SUDO_USER_HOME"); + if (!sudoUserHomeEnv.isEmpty()) { + // 通过 pkexec 提权的普通用户，使用原用户的配置目录 + QString sudoUserHomePath = QString::fromLocal8Bit(sudoUserHomeEnv); + configDir = sudoUserHomePath + "/.config"; + } else { + // 获取实际的 HOME 目录来判断是真正的 root 用户还是其他方式提权的用户 + QByteArray homeEnv = qgetenv("HOME"); + QString homePath = QString::fromLocal8Bit(homeEnv); + + if (homePath == "/root") { + // 真正的 root 用户，使用 /root/.config + configDir = "/root/.config"; + } else { + // 其他方式提权的用户，使用 HOME 目录下的配置 + configDir = homePath + "/.config"; + } + } + } else { + // 普通用户，使用标准配置目录 + configDir = QStandardPaths::writableLocation(QStandardPaths::ConfigLocation); + } + + QDir dir(configDir); + if (!dir.exists()) { + dir.mkpath("."); + } + m_configFilePath = dir.filePath("spark-update-tool/ignored_apps.conf"); + + // 确保目录存在 + QFileInfo fileInfo(m_configFilePath); + QDir configDirPath = fileInfo.dir(); + if (!configDirPath.exists()) { + configDirPath.mkpath("."); + } + + // 加载现有配置 + loadConfig(); + + // 输出忽略列表到 qDebug + printIgnoredApps(); +} + +void IgnoreConfig::addIgnoredApp(const QString &packageName, const QString &version) +{ + m_ignoredApps.insert(qMakePair(packageName, version)); + saveConfig(); +} + +void IgnoreConfig::removeIgnoredApp(const QString &packageName) +{ + // 移除所有该包名的版本 + auto it = m_ignoredApps.begin(); + while (it != m_ignoredApps.end()) { + if (it->first == packageName) { + it = m_ignoredApps.erase(it); + } else { + ++it; + } + } + saveConfig(); +} + +bool IgnoreConfig::isAppIgnored(const QString &packageName, const QString &version) const +{ + return m_ignoredApps.contains(qMakePair(packageName, version)); +} + +QSet> IgnoreConfig::getIgnoredApps() const +{ + return m_ignoredApps; +} + +void IgnoreConfig::printIgnoredApps() const +{ + qDebug() << "=== 忽略的应用列表 ==="; + qDebug() << "配置文件路径:" << m_configFilePath; + + if (m_ignoredApps.isEmpty()) { + qDebug() << "没有忽略的应用"; + } else { + for (const auto &app : m_ignoredApps) { + qDebug() << "忽略的应用:" << app.first << "版本:" << app.second; + } + } + qDebug() << "===================="; +} + +bool IgnoreConfig::saveConfig() +{ + QFile file(m_configFilePath); + if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) { + qDebug() << "无法打开配置文件进行写入:" << m_configFilePath; + return false; + } + + QTextStream out(&file); + for (const auto &app : m_ignoredApps) { + out << app.first << "|" << app.second << "\n"; + } + file.close(); + return true; +} + +bool IgnoreConfig::loadConfig() +{ + QFile file(m_configFilePath); + if (!file.exists()) { + // 配置文件不存在，这是正常的，返回true表示没有错误 + return true; + } + + if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) { + qDebug() << "无法打开配置文件进行读取:" << m_configFilePath; + return false; + } + + m_ignoredApps.clear(); + QTextStream in(&file); + while (!in.atEnd()) { + QString line = in.readLine().trimmed(); + if (!line.isEmpty()) { + QStringList parts = line.split('|'); + if (parts.size() == 2) { + m_ignoredApps.insert(qMakePair(parts[0], parts[1])); + } + } + } + file.close(); + return true; +} \ No newline at end of file diff --git a/spark-update-tool/src/ignoreconfig.h b/spark-update-tool/src/ignoreconfig.h new file mode 100644 index 0000000..2952eca --- /dev/null +++ b/spark-update-tool/src/ignoreconfig.h @@ -0,0 +1,42 @@ +#ifndef IGNORECONFIG_H +#define IGNORECONFIG_H + +#include +#include +#include +#include + +class IgnoreConfig : public QObject +{ + Q_OBJECT + +public: + explicit IgnoreConfig(QObject *parent = nullptr); + + // 添加忽略的应用（包名和版本号） + void addIgnoredApp(const QString &packageName, const QString &version); + + // 移除忽略的应用 + void removeIgnoredApp(const QString &packageName); + + // 检查应用是否被忽略 + bool isAppIgnored(const QString &packageName, const QString &version) const; + + // 获取所有被忽略的应用 + QSet> getIgnoredApps() const; + + // 输出所有被忽略的应用到 qDebug + void printIgnoredApps() const; + + // 保存配置到文件 + bool saveConfig(); + + // 从文件加载配置 + bool loadConfig(); + +private: + QSet> m_ignoredApps; + QString m_configFilePath; +}; + +#endif // IGNORECONFIG_H \ No newline at end of file diff --git a/src/spark-update-tool/src/main.cpp b/spark-update-tool/src/main.cpp similarity index 95% rename from src/spark-update-tool/src/main.cpp rename to spark-update-tool/src/main.cpp index a3df5a4..f70a913 100644 --- a/src/spark-update-tool/src/main.cpp +++ b/spark-update-tool/src/main.cpp @@ -16,11 +16,13 @@ bool elevateToRoot() { QByteArray display = qgetenv("DISPLAY"); QByteArray xauthority = qgetenv("XAUTHORITY"); + QByteArray home = qgetenv("HOME"); // 获取原始用户的 HOME 目境变量 QStringList args; args << "env" << "DISPLAY=" + display << "XAUTHORITY=" + xauthority + << "SUDO_USER_HOME=" + home // 传递原始用户的 HOME 路径 << program; QProcess process; diff --git a/src/spark-update-tool/src/mainwindow.cpp b/spark-update-tool/src/mainwindow.cpp similarity index 53% rename from src/spark-update-tool/src/mainwindow.cpp rename to spark-update-tool/src/mainwindow.cpp index 54f064c..c93f09a 100644 --- a/src/spark-update-tool/src/mainwindow.cpp +++ b/spark-update-tool/src/mainwindow.cpp @@ -7,11 +7,13 @@ #include // 新增 #include #include +#include // for geteuid MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent) , ui(new Ui::MainWindow) , m_model(new AppListModel(this)) , m_delegate(new AppDelegate(this)) + , m_ignoreConfig(new IgnoreConfig(this)) { QIcon icon(":/resources/128*128/spark-update-tool.png"); setWindowIcon(icon); @@ -53,11 +55,26 @@ MainWindow::MainWindow(QWidget *parent) } }); + // 连接应用委托的信号 + connect(m_delegate, &AppDelegate::ignoreApp, this, &MainWindow::onIgnoreApp); + connect(m_delegate, &AppDelegate::unignoreApp, this, &MainWindow::onUnignoreApp); + // 新增：点击“更新全部”按钮批量下载 connect(ui->updatePushButton, &QPushButton::clicked, this, [=](){ - qDebug()<<"更新全部按钮被点击"; - m_delegate->startDownloadForAll(); + qDebug()<<"更新按钮被点击"; + if (m_delegate->getSelectedPackages().isEmpty()) { + // 没有选中任何应用，更新全部 + m_delegate->startDownloadForAll(); + } else { + // 有选中应用，更新选中 + m_delegate->startDownloadForSelected(); + m_delegate->clearSelection(); + updateButtonText(); + } }); + + // 新增：监听选择变化 + connect(m_delegate, &AppDelegate::updateDisplay, this, &MainWindow::handleSelectionChanged); checkUpdates(); // 新增：监听搜索框文本变化 @@ -75,6 +92,12 @@ MainWindow::MainWindow(QWidget *parent) watcher->setFuture(QtConcurrent::run([this](){ runAptssUpgrade(); })); + QScreen *screen = QGuiApplication::screenAt(QCursor::pos()); + if (!screen) screen = QGuiApplication::primaryScreen(); + QRect screenGeometry = screen->geometry(); + int x = screenGeometry.x() + (screenGeometry.width() - this->width()) / 2; + int y = screenGeometry.y() + (screenGeometry.height() - this->height()) / 2; + this->move(x, y); } //初始化控件样式 void MainWindow::initStyle() @@ -207,12 +230,42 @@ void MainWindow::checkUpdates() { aptssUpdater updater; QJsonArray updateInfo = updater.getUpdateInfoAsJson(); - m_allApps = updateInfo; // 保存所有应用数据 - m_model->setUpdateData(updateInfo); - + + // 分离正常应用和忽略应用 + QJsonArray normalApps; + QJsonArray ignoredApps; + for (const auto &item : updateInfo) { QJsonObject obj = item.toObject(); - qDebug() << "模型设置的包名:" << obj["package"].toString(); + QString packageName = obj["package"].toString(); + QString currentVersion = obj["current_version"].toString(); + + // 检查应用是否被忽略 + if (m_ignoreConfig->isAppIgnored(packageName, currentVersion)) { + // 标记为忽略状态 + obj["ignored"] = true; + ignoredApps.append(obj); + } else { + obj["ignored"] = false; + normalApps.append(obj); + } + } + + // 合并数组：正常应用在前，忽略应用在后 + QJsonArray finalApps; + for (const auto &item : normalApps) { + finalApps.append(item); + } + for (const auto &item : ignoredApps) { + finalApps.append(item); + } + + m_allApps = finalApps; // 保存所有应用数据 + m_model->setUpdateData(finalApps); + + for (const auto &item : finalApps) { + QJsonObject obj = item.toObject(); + qDebug() << "模型设置的包名:" << obj["package"].toString() << "忽略状态:" << obj["ignored"].toBool(); qDebug() << "模型设置的下载 URL:" << obj["download_url"].toString(); // 检查模型数据 } } @@ -224,7 +277,11 @@ void MainWindow::filterAppsByKeyword(const QString &keyword) m_model->setUpdateData(m_allApps); return; } - QJsonArray filtered; + + // 分离正常应用和忽略应用 + QJsonArray normalApps; + QJsonArray ignoredApps; + for (const auto &item : m_allApps) { QJsonObject obj = item.toObject(); // 可根据需要匹配更多字段 @@ -232,31 +289,157 @@ void MainWindow::filterAppsByKeyword(const QString &keyword) QString package = obj.value("package").toString(); if (name.contains(keyword, Qt::CaseInsensitive) || package.contains(keyword, Qt::CaseInsensitive)) { - filtered.append(item); + + // 检查是否为忽略状态 + if (obj.value("ignored").toBool()) { + ignoredApps.append(item); + } else { + normalApps.append(item); + } } } + + // 合并数组：正常应用在前，忽略应用在后 + QJsonArray filtered; + for (const auto &item : normalApps) { + filtered.append(item); + } + for (const auto &item : ignoredApps) { + filtered.append(item); + } + m_model->setUpdateData(filtered); } void MainWindow::runAptssUpgrade() { QProcess process; - QStringList args; - args << "sudo" <<"aptss" << "ssupdate"; - process.start("sudo", args); + + // 检查是否已经是root用户，如果是则直接执行命令，否则使用sudo + if (geteuid() == 0) { + // root用户直接执行 + process.start("aptss", QStringList() << "ssupdate"); + } else { + // 非root用户使用sudo + process.start("sudo", QStringList() << "aptss" << "ssupdate"); + } + if (!process.waitForStarted(5000)) { - QMessageBox::warning(this, "升级失败", "无法启动 sudo aptss ssupdate"); + QMessageBox::warning(this, "升级失败", "无法启动 aptss ssupdate"); return; } process.write("n\n"); process.closeWriteChannel(); - process.waitForFinished(-1); - if (process.exitCode() != 0) { - QMessageBox::warning(this, "升级失败", "执行 sudo aptss ssupdate 失败，请检查系统环境。"); + + // 设置超时时间，避免无限等待 + if (!process.waitForFinished(30000)) { // 30秒超时 + qDebug() << "aptss ssupdate 执行超时"; + process.kill(); // 强制终止进程 + return; } + + if (process.exitCode() != 0) { + QMessageBox::warning(this, "升级失败", "执行 aptss ssupdate 失败，请检查系统环境或稍后再试。"); + } +} +void MainWindow::closeEvent(QCloseEvent *event) +{ + // 检查是否正在进行更新 + bool isUpdating = false; + + // 通过AppDelegate检查是否有正在下载或安装的应用 + const QHash& downloads = m_delegate->getDownloads(); + for (auto it = downloads.constBegin(); it != downloads.constEnd(); ++it) { + if (it.value().isDownloading || it.value().isInstalling) { + isUpdating = true; + break; + } + } + + // 如果正在更新，才显示确认对话框 + if (isUpdating) { + QMessageBox::StandardButton reply = QMessageBox::question(this, "确认关闭", "正在更新，是否确认关闭窗口？", QMessageBox::Yes | QMessageBox::No); + + if (reply == QMessageBox::Yes) { + event->accept(); + } else { + event->ignore(); + } + } else { + // 如果没有更新，直接关闭窗口 + event->accept(); + } +} +void MainWindow::handleUpdateFinished(bool success) +{ + if (success) { + // 更新成功时的处理逻辑 + QMessageBox::information(this, "更新完成", "软件更新已成功完成！"); + } else { + // 更新失败时的处理逻辑 + QMessageBox::warning(this, "更新失败", "软件更新过程中出现错误，请稍后再试。"); + } + + // 刷新应用列表 + checkUpdates(); } MainWindow::~MainWindow() { delete ui; } + +// 新增：更新按钮文本 +void MainWindow::updateButtonText() { + int selectedCount = m_delegate->getSelectedPackages().size(); + if (selectedCount > 0) { + ui->updatePushButton->setText(QString("更新选中(%1)").arg(selectedCount)); + } else { + ui->updatePushButton->setText("更新全部"); + } +} + +// 新增：处理选择变化 +void MainWindow::handleSelectionChanged() { + updateButtonText(); +} + +// 新增：处理忽略应用的槽函数 +void MainWindow::onIgnoreApp(const QString &packageName, const QString &version) { + // 将应用添加到忽略配置中 + m_ignoreConfig->addIgnoredApp(packageName, version); + + // 更新模型中应用的状态，而不是移除 + QJsonArray updatedApps; + for (const auto &item : m_allApps) { + QJsonObject obj = item.toObject(); + if (obj["package"].toString() == packageName) { + obj["ignored"] = true; // 标记为忽略状态 + } + updatedApps.append(obj); + } + m_allApps = updatedApps; + + // 重新排序：正常应用在前，忽略应用在后 + checkUpdates(); +} + +// 新增：处理取消忽略应用的槽函数 +void MainWindow::onUnignoreApp(const QString &packageName) { + // 从忽略配置中移除应用 + m_ignoreConfig->removeIgnoredApp(packageName); + + // 更新模型中应用的状态 + QJsonArray updatedApps; + for (const auto &item : m_allApps) { + QJsonObject obj = item.toObject(); + if (obj["package"].toString() == packageName) { + obj["ignored"] = false; // 标记为非忽略状态 + } + updatedApps.append(obj); + } + m_allApps = updatedApps; + + // 重新排序：正常应用在前，忽略应用在后 + checkUpdates(); +} \ No newline at end of file diff --git a/src/spark-update-tool/src/mainwindow.h b/spark-update-tool/src/mainwindow.h similarity index 54% rename from src/spark-update-tool/src/mainwindow.h rename to spark-update-tool/src/mainwindow.h index bc7f9d7..5bf2f0a 100644 --- a/src/spark-update-tool/src/mainwindow.h +++ b/spark-update-tool/src/mainwindow.h @@ -5,9 +5,10 @@ #include "aptssupdater.h" #include "applistmodel.h" #include "appdelegate.h" +#include "ignoreconfig.h" #include #include // 添加头文件 - +#include QT_BEGIN_NAMESPACE namespace Ui { class MainWindow; @@ -22,6 +23,9 @@ public: MainWindow(QWidget *parent = nullptr); ~MainWindow(); +protected: + void closeEvent(QCloseEvent *event) override; + private: Ui::MainWindow *ui; void checkUpdates(); @@ -29,8 +33,16 @@ private: void runAptssUpgrade(); AppListModel *m_model; AppDelegate *m_delegate; + IgnoreConfig *m_ignoreConfig; // 新增：忽略配置管理 QListView *listView; // 声明 QListView 指针 QJsonArray m_allApps; // 新增：保存所有应用数据 void filterAppsByKeyword(const QString &keyword); // 新增：搜索过滤函数声明 + void updateButtonText(); // 新增：更新按钮文本 + +private slots: + void handleUpdateFinished(bool success); // 新增：处理更新完成的槽函数 + void handleSelectionChanged(); // 新增：处理选择变化的槽函数 + void onIgnoreApp(const QString &packageName, const QString &version); // 新增：处理忽略应用的槽函数 + void onUnignoreApp(const QString &packageName); // 新增：处理取消忽略应用 }; -#endif // MAINWINDOW_H +#endif // MAINWINDOW_H \ No newline at end of file diff --git a/src/spark-update-tool/src/mainwindow.ui b/spark-update-tool/src/mainwindow.ui similarity index 99% rename from src/spark-update-tool/src/mainwindow.ui rename to spark-update-tool/src/mainwindow.ui index a53a4b8..8c2b025 100644 --- a/src/spark-update-tool/src/mainwindow.ui +++ b/spark-update-tool/src/mainwindow.ui @@ -6,8 +6,8 @@ 0 0 - 1440 - 858 + 800 + 600 @@ -253,4 +253,4 @@ - + \ No newline at end of file diff --git a/src/application.cpp b/src/application.cpp index 4a919f2..89a6821 100644 --- a/src/application.cpp +++ b/src/application.cpp @@ -25,7 +25,6 @@ Application::Application(int &argc, char **argv) if (!DPlatformWindowHandle::pluginVersion().isEmpty()) { setAttribute(Qt::AA_DontCreateNativeWidgetSiblings, true); } - setAttribute(Qt::AA_UseHighDpiPixmaps); setQuitOnLastWindowClosed(false); // 启用托盘图标时，关闭窗口程序仍然运行 @@ -177,7 +176,10 @@ void Application::loadTranslator() if (QLocale::system().language() == QLocale::Chinese) { QTranslator *webengineTranslator = new QTranslator(this); - webengineTranslator->load(QLocale(QLocale::Chinese), "qtwebengine", "_", ":/translations"); + bool loaded = webengineTranslator->load(QLocale(QLocale::Chinese), "qtwebengine", "_", ":/translations"); + if (!loaded) { + qWarning() << "Failed to load webengine translator"; + } installTranslator(webengineTranslator); } } diff --git a/src/backend/downloadworker.cpp b/src/backend/downloadworker.cpp index d7e5f5a..720f35b 100644 --- a/src/backend/downloadworker.cpp +++ b/src/backend/downloadworker.cpp @@ -41,7 +41,7 @@ bool checkMeatlink(QString metaUrl) metaStatus.remove(); } QString cmd = QString("curl -I -s --connect-timeout 5 %1 -w %{http_code} |tail -n1 > /tmp/spark-store/metaStatus.txt").arg(metaUrl); - system(cmd.toUtf8().data()); + [[maybe_unused]] int ret = system(cmd.toUtf8().data());//不这样写就会-Wunused-variable 警告导致无法打包 if (metaStatus.open(QFile::ReadOnly) && QString(metaStatus.readAll()).toUtf8() == "200") { metaStatus.remove(); @@ -94,7 +94,7 @@ void DownloadController::startDownload(const QString &url) return; } - QtConcurrent::run([=]() + auto future = QtConcurrent::run([=]() { QString metaUrl = url + ".metalink"; qDebug() << "metalink" << metaUrl; @@ -272,7 +272,7 @@ void DownloadController::stopDownload() // 实现下载进程退出 QString killCmd = QString("kill -9 %1").arg(pidNumber); - system(killCmd.toUtf8()); + [[maybe_unused]] int ret = system(killCmd.toUtf8()); qDebug() << "kill aria2!"; pidNumber = -1; } diff --git a/src/backend/sparkapi.cpp b/src/backend/sparkapi.cpp index 2947108..8c64d1c 100644 --- a/src/backend/sparkapi.cpp +++ b/src/backend/sparkapi.cpp @@ -28,7 +28,6 @@ void SparkAPI::get(QUrl url) QNetworkRequest request; HttpRequest *httprequest = new HttpRequest; request.setUrl(QUrl(url.toString().replace("+", "%2B"))); - request.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true); connect(httprequest, &HttpRequest::finished, [=](QString data) { QByteArray arr = data.toUtf8(); @@ -54,7 +53,6 @@ void SparkAPI::getRAW(QUrl url) QNetworkRequest request; HttpRequest *httprequest = new HttpRequest; request.setUrl(QUrl(url.toString().replace("+", "%2B"))); - request.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true); connect(httprequest, &HttpRequest::finished, [=](QString data) { emit finishedRAW(data); diff --git a/src/main.cpp b/src/main.cpp index 9573282..2da9621 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -12,7 +12,6 @@ #include #include -#include #include #include @@ -109,17 +108,18 @@ int main(int argc, char *argv[]) { // 崩溃处理 signal(SIGSEGV, crashHandler); // 注册SIGSEGV处理函数 + + // 初始化日志系统 + Utils::initLogger(); + Utils::writeLog("INFO", "Application starting..."); - - // Get build time - static const QDate buildDate = QLocale(QLocale::English).toDate(QString(__DATE__).replace(" ", " 0"), "MMM dd yyyy"); - static const QTime buildTime = QTime::fromString(__TIME__, "hh:mm:ss"); - buildDateTime = buildDate.toString("yyyy.MM.dd") + "-" + buildTime.toString("hh:mm:ss"); - - - // NOTE: 提前设置组织名称和应用名称，避免配置文件位置错误 - DApplication::setOrganizationName("spark-union"); - DApplication::setApplicationName("spark-store"); + // Get build time + static const QDate buildDate = QLocale(QLocale::English).toDate(QString(__DATE__).replace(" ", " 0"), "MMM dd yyyy"); + static const QTime buildTime = QTime::fromString(__TIME__, "hh:mm:ss"); + buildDateTime = buildDate.toString("yyyy.MM.dd") + "-" + buildTime.toString("hh:mm:ss"); + + //在cmakelist.txt中设置 buildDateTime +// QString buildDateTime = QString("%1-%2").arg(QString(BUILD_DATE)).arg(QString(BUILD_TIME)); Application::checkAppConfigLocation(); // 检查 ~/.config/spark-union/spark-store 文件夹是否存在 // 初始化 config.ini 配置文件 @@ -129,9 +129,11 @@ int main(int argc, char *argv[]) DataCollectorAndUploader uploader; QObject::connect(&uploader, &DataCollectorAndUploader::uploadSuccessful, [](){ qDebug() << "Data uploaded successfully"; + Utils::writeLog("INFO", "Data uploaded successfully"); }); QObject::connect(&uploader, &DataCollectorAndUploader::uploadFailed, [](QString error){ qDebug() << "Upload failed with error: " << error; + Utils::writeLog("ERROR", QString("Upload failed with error: %1").arg(error)); }); uploader.collectAndUploadData(); @@ -152,6 +154,10 @@ int main(int argc, char *argv[]) #if defined __sw_64__ || __loongarch__ chromium_flags.append("--no-sandbox"); #endif + // 如果配置文件中设置了关闭沙箱，则添加no-sandbox标志 + if (Utils::shouldDisableWebEngineSandbox()) { + chromium_flags.append("--no-sandbox"); + } qputenv("QTWEBENGINE_CHROMIUM_FLAGS", chromium_flags.join(" ").toUtf8()); /** @@ -163,13 +169,6 @@ int main(int argc, char *argv[]) DApplication::setAttribute(Qt::AA_UseSoftwareOpenGL); } -#if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)) - // 开启 Hidpi 支持 - qDebug() << "Enable HiDPI Support."; - DApplication::setAttribute(Qt::AA_EnableHighDpiScaling); - DApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); -#endif - // 强制使用 DTK 平台插件 QVector fakeArgs(argc + 2); fakeArgs[0] = argv[0]; @@ -191,8 +190,6 @@ int main(int argc, char *argv[]) return -1; } - DApplicationSettings settings; // 定义 DApplicationSettings，自动保存主题设置 - MainWindow w; a.setMainWindow(&w); // 设置应用程序主窗口，用于初始化关于对话框 @@ -206,5 +203,10 @@ int main(int argc, char *argv[]) } w.show(); + // 在程序结束前关闭日志文件 - 修复变量名并移到return前 + QObject::connect(&a, &QApplication::aboutToQuit, []() { + Utils::writeLog("INFO", "Application shutting down"); + }); + return a.exec(); } diff --git a/src/mainwindow-dtk.cpp b/src/mainwindow-dtk.cpp index 5baca0e..2a4c037 100755 --- a/src/mainwindow-dtk.cpp +++ b/src/mainwindow-dtk.cpp @@ -14,6 +14,9 @@ #include #include #include +#include +#include +#include #include #include @@ -345,7 +348,7 @@ void MainWindow::refreshTheme(bool isDarkMode) ui->applistpage->setTheme(isDarkMode); ui->applistpage_1->setTheme(isDarkMode); ui->appintopage->setTheme(isDarkMode); - ui->settingspage->setTheme(isDarkMode); + ui->settingspage->setTheme(isDarkMode); } void MainWindow::initConnections() @@ -434,7 +437,7 @@ void MainWindow::initTmpDir() if (info.isWritable() == false) { - QtConcurrent::run([=] + auto future = QtConcurrent::run([=] { sleep(3); auto upgradeP = new QProcess(); @@ -522,72 +525,36 @@ void MainWindow::notify(QObject *receiver, QEvent *event) void MainWindow::on_pushButton_14_clicked() { - /** - * NOTE: No need to judget developmode status - */ - // Check UOS - // QSettings config(QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) + "/config.ini", QSettings::IniFormat); - // if (config.contains("UOS/EnableDeveloperMode") && !config.value("UOS/EnableDeveloperMode").toBool()) - if (false) - { - qDebug() << "UOS Developer Mode has not been enabled!"; - QtConcurrent::run([=] - { - auto upgradeP = new QProcess(); - upgradeP->startDetached("zenity", QStringList() << "--info" - << "--text" - << "UOS开发者模式未开启，相关功能被禁用" - << "--title" - << "功能禁用提示" - << "--width" - << "360" - ); - upgradeP->waitForStarted(); - upgradeP->waitForFinished(30); - upgradeP->deleteLater(); }); - } - else - { - QFile upgradeStatus("/tmp/spark-store/upgradeStatus.txt"); - if (!upgradeStatus.exists()) - { - QString appPath; + QString appPath; + // #ifdef QT_DEBUG + // appPath = QCoreApplication::applicationDirPath() ; + // QDir dir(appPath); + // dir.cdUp(); + // appPath = dir.absolutePath()+"/spark-update-tool/spark-update-tool"; + // qDebug() << "Spark Update Tool Path: " << appPath; + // if(appPath.isEmpty()) + // { + // qWarning() << "Spark Update Tool not found!"; + // return; + // } + // QProcess *process = new QProcess(this); + // QStringList arguments; + // arguments << appPath <<"--silent"; + // process->start(appPath, {"--silent"}); + // #else + // appPath = QStandardPaths::findExecutable("spark-update-tool"); + // QString program = "pkexec"; + // QStringList arguments; + // arguments << appPath; + // QProcess *process = new QProcess(this); + // process->start(program, arguments); + // #endif + appPath = QStandardPaths::findExecutable("spark-update-tool"); + qDebug() << "Spark Update Tool Path: " << appPath; + QString program = "pkexec"; + QStringList arguments; + arguments << appPath; + QProcess *process = new QProcess(this); + process->start(program, arguments); - // 判断路径：开发环境 vs 安装后 - #ifdef QT_DEBUG - appPath = QCoreApplication::applicationDirPath() + - "/spark-update-tool/spark-update-tool"; - #else - appPath = QStandardPaths::findExecutable("spark-update-tool"); - #endif - - if (appPath.isEmpty()) { - qWarning() << "spark-update-tool not found!"; - return; - } - - QProcess *process = new QProcess(this); - - #ifdef QT_DEBUG - // 开发模式：直接运行本地构建的更新器 - process->start(appPath, {"--silent"}); - #else - // 安装模式：使用 pkexec 提权运行系统路径下的 spark-update-tool - QString program = "pkexec"; - QStringList arguments; - arguments << appPath << "--silent"; - process->start(program, arguments); - #endif - - QObject::connect(process, QOverload::of(&QProcess::finished), - [process](int exitCode) { - if (exitCode == 0) { - qDebug() << "Update check successful"; - } else { - qWarning() << "Update check failed with exit code:" << exitCode; - } - process->deleteLater(); - }); - } - } -} +} \ No newline at end of file diff --git a/src/pages/appintopage.cpp b/src/pages/appintopage.cpp index c67b0d1..8bf8e5c 100644 --- a/src/pages/appintopage.cpp +++ b/src/pages/appintopage.cpp @@ -75,6 +75,7 @@ void AppIntoPage::openUrl(const QUrl &url) iconRequest.setHeader(QNetworkRequest::ContentTypeHeader, "charset='utf-8'"); iconRequest.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true); + iconManager->get(iconRequest); QObject::connect(iconManager, &QNetworkAccessManager::finished, [=](QNetworkReply *reply) { @@ -96,8 +97,8 @@ void AppIntoPage::openUrl(const QUrl &url) QNetworkAccessManager *manager = new QNetworkAccessManager(this); request.setUrl(QUrl(imgUrl)); request.setHeader(QNetworkRequest::UserAgentHeader, m_userAgent); - request.setHeader(QNetworkRequest::ContentTypeHeader, "charset='utf-8'"); request.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true); + request.setHeader(QNetworkRequest::ContentTypeHeader, "charset='utf-8'"); manager->get(request); QObject::connect(manager, &QNetworkAccessManager::finished, [=](QNetworkReply *reply) { @@ -617,7 +618,7 @@ void AppIntoPage::on_downloadButton_clicked() void AppIntoPage::on_pushButton_3_clicked() { - QtConcurrent::run([=]() + auto future = QtConcurrent::run([=]() { ui->downloadButton->setEnabled(false); ui->pushButton_3->setEnabled(false); @@ -659,3 +660,4 @@ void AppIntoPage::on_updateButton_clicked() QString feedbackURL = "https://bbs.spark-app.store/"; QProcess::startDetached("xdg-open", QStringList{feedbackURL}); } + diff --git a/src/pages/settingspage.cpp b/src/pages/settingspage.cpp index fad913a..c40607c 100644 --- a/src/pages/settingspage.cpp +++ b/src/pages/settingspage.cpp @@ -6,6 +6,7 @@ #include #include #include +#include #define TMP_PATH "/tmp/spark-store" #define DEFAULT_SERVER_URL "https://cdn-d.spark-app.store/" @@ -22,6 +23,9 @@ SettingsPage::SettingsPage(QWidget *parent) configCanSave = false; initConfig(); + + // 移除了手动连接导出日志按钮的点击信号 + // connect(ui->pushButton_exportLog, &QPushButton::clicked, this, &SettingsPage::on_pushButton_exportLog_clicked); } void SettingsPage::setTheme(bool dark) @@ -32,7 +36,7 @@ void SettingsPage::setTheme(bool dark) } else { - // 亮色模式 + // ���色模式 this->setStyleSheet("#frame{background-color: #ffffff;border-radius:14px;border:1px solid rgb(229,229,229);}"); } } @@ -98,8 +102,14 @@ void SettingsPage::initConfig() } configCanSave = true; // 　防止触发保存配置信号 + // 在现有代码后添加初始化checkBox_disableSandbox的状态 needUncompatibleNotification = config.value("other/uncompatibleNotification", needUncompatibleNotification).toBool(); ui->checkBox->setChecked(needUncompatibleNotification); + + // 新增：从config.ini读取webengine/noSandbox配置并设置复选框状态 + bool disableSandbox = config.value("webengine/noSandbox", false).toBool(); + ui->checkBox_disableSandbox->setChecked(disableSandbox); + } SettingsPage::~SettingsPage() @@ -109,7 +119,7 @@ SettingsPage::~SettingsPage() void SettingsPage::on_pushButton_updateServer_clicked() { - QtConcurrent::run([=]() + auto future = QtConcurrent::run([=]() { ui->pushButton_updateServer->setEnabled(false); @@ -134,7 +144,7 @@ void SettingsPage::on_pushButton_updateServer_clicked() ui->comboBox_server->setCurrentIndex(0); }); } -void SettingsPage::on_comboBox_server_currentIndexChanged(const QString &arg1) +void SettingsPage::on_comboBox_server_currentTextChanged(const QString &arg1) { SparkAPI::setServerUrl(arg1); // 服务器信息更新 qDebug() << arg1; @@ -208,7 +218,7 @@ quint64 SettingsPage::dirFileSize(const QString &path) void SettingsPage::on_pushButton_updateApt_clicked() { - QtConcurrent::run([=]() + auto future = QtConcurrent::run([=]() { ui->pushButton_updateApt->setEnabled(false); ui->label_aptserver->setText(tr("Updating, please wait...")); @@ -222,7 +232,7 @@ void SettingsPage::on_pushButton_updateApt_clicked() void SettingsPage::on_pushButton_clear_clicked() { - QtConcurrent::run([=]() + auto future = QtConcurrent::run([=]() { ui->pushButton_clear->setEnabled(false); @@ -240,7 +250,7 @@ void SettingsPage::on_pushButton_clear_clicked() void SettingsPage::on_pushButton_clearWebCache_clicked() { - QtConcurrent::run([=]() + auto future = QtConcurrent::run([=]() { QString localDataLocation = QStandardPaths::writableLocation(QStandardPaths::AppLocalDataLocation) + "/QtWebEngine"; qDebug() << localDataLocation; @@ -261,3 +271,37 @@ void SettingsPage::on_checkBox_clicked(bool checked) config.setValue("other/uncompatibleNotification", needUncompatibleNotification); config.sync(); } + +// 添加checkBox_disableSandbox的点击事件处理函数 +void SettingsPage::on_checkBox_disableSandbox_clicked(bool checked) +{ + QSettings config(QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) + "/config.ini", QSettings::IniFormat); + config.setValue("webengine/noSandbox", checked); + config.sync(); +} + +// 修改导出日志按钮的点击事件处理函数 +void SettingsPage::on_pushButton_exportLog_clicked() +{ + // 禁用按钮防止重复点击 + ui->pushButton_exportLog->setEnabled(false); + + QString targetPath = QString::fromUtf8(TMP_PATH); + bool success = Utils::exportLogs(targetPath); + + // 显示导出结果通知 + QString message; + if (success) { + message = tr("Logs exported successfully to: %1").arg(targetPath); + Utils::writeLog("INFO", "User exported logs via settings page"); + } else { + message = tr("Failed to export logs"); + Utils::writeLog("ERROR", "User failed to export logs via settings page"); + } + + // 只发送一次系统通知 + Utils::sendNotification("spark-store", tr("Export Logs"), message); + + // 重新启用按钮 + ui->pushButton_exportLog->setEnabled(true); +} \ No newline at end of file diff --git a/src/pages/settingspage.h b/src/pages/settingspage.h index d1e9267..c2b14fe 100644 --- a/src/pages/settingspage.h +++ b/src/pages/settingspage.h @@ -22,7 +22,7 @@ public: private slots: void on_pushButton_updateServer_clicked(); - void on_comboBox_server_currentIndexChanged(const QString &arg1); + void on_comboBox_server_currentTextChanged(const QString &arg1); void on_pushButton_updateApt_clicked(); @@ -32,6 +32,11 @@ private slots: void on_checkBox_clicked(bool checked); + void on_checkBox_disableSandbox_clicked(bool checked); + + // 添加导出日志按钮的槽函数声明 + void on_pushButton_exportLog_clicked(); + public: static bool needUncompatibleNotification; @@ -47,4 +52,4 @@ signals: void openUrl(QUrl spk); }; -#endif // SETTINGSPAGE_H +#endif // SETTINGSPAGE_H \ No newline at end of file diff --git a/src/pages/settingspage.ui b/src/pages/settingspage.ui index 28609ae..af0c20f 100644 --- a/src/pages/settingspage.ui +++ b/src/pages/settingspage.ui @@ -32,10 +32,10 @@ - QFrame::StyledPanel + QFrame::Shape::StyledPanel - QFrame::Raised + QFrame::Shadow::Raised @@ -59,7 +59,7 @@ - QFrame::NoFrame + QFrame::Shape::NoFrame 0 @@ -71,9 +71,9 @@ 0 - 0 - 688 - 940 + -434 + 666 + 1270 @@ -147,7 +147,7 @@ - Qt::Horizontal + Qt::Orientation::Horizontal @@ -166,7 +166,7 @@ - Qt::Horizontal + Qt::Orientation::Horizontal @@ -295,7 +295,7 @@ - Qt::Horizontal + Qt::Orientation::Horizontal @@ -338,6 +338,109 @@ + + + + + + + + 18 + false + + + + Log + + + + + + + + + + Export Logs:/tmp/spark-store + + + + + + + Export + + + + + + + Qt::Orientation::Horizontal + + + + 351 + 20 + + + + + + + + + + + + + + + + + + 18 + + + + Disable Safe Mode + + + + + + + + + + Disable the webEngine sandbox feature. + + + + + + + Disable + + + + + + + Qt::Orientation::Horizontal + + + + 424 + 20 + + + + + + + + + + @@ -372,7 +475,7 @@ - Qt::Vertical + Qt::Orientation::Vertical diff --git a/src/spark-store.pro b/src/spark-store.pro index db84c7c..eb4b852 100644 --- a/src/spark-store.pro +++ b/src/spark-store.pro @@ -27,8 +27,8 @@ VERSION = $$BUILD_VERSION isEmpty(VERSION): VERSION = 4.0.0 DEFINES += APP_VERSION=\\\"'$${VERSION}'\\\" DEFINES += APP_BRANCH=\\\"'$$system(git symbolic-ref --short -q HEAD)'\\\" -# Disable qWarning / qDebug output in Release -#CONFIG(release, debug | release): DEFINES += QT_NO_WARNING_OUTPUT QT_NO_DEBUG_OUTPUT +# Enable all log outputs in both Debug and Release modes +# We want to capture all logs (INFO, DEBUG, WARNING, ERROR) for export to /tmp/spark-store CONFIG += c++11 link_pkgconfig PKGCONFIG += dtkcore dtkgui dtkwidget @@ -47,13 +47,13 @@ SOURCES += \ utils/utils.cpp \ utils/widgetanimation.cpp \ widgets/base/basewidgetopacity.cpp \ - widgets/common/customlabel.cpp \ widgets/common/downloaditem.cpp \ widgets/common/progressbutton.cpp \ widgets/common/smoothlistwidget.cpp \ widgets/common/smoothscrollbar.cpp \ widgets/common/webenginepage.cpp \ widgets/common/webengineview.cpp \ + widgets/common/customlabel.cpp \ widgets/big_image.cpp \ widgets/downloadlistwidget.cpp \ application.cpp \ @@ -74,13 +74,13 @@ HEADERS += \ utils/utils.h \ utils/widgetanimation.h \ widgets/base/basewidgetopacity.h \ - widgets/common/customlabel.h \ widgets/common/downloaditem.h \ widgets/common/progressbutton.h \ widgets/common/smoothlistwidget.h \ widgets/common/smoothscrollbar.h \ widgets/common/webenginepage.h \ widgets/common/webengineview.h \ + widgets/common/customlabel.h \ widgets/big_image.h \ widgets/downloadlistwidget.h \ application.h \ @@ -109,4 +109,4 @@ qnx: target.path = /tmp/$${TARGET}/bin else: unix:!android: target.path = /opt/durapps/$${TARGET}/bin !isEmpty(target.path): INSTALLS += target -DISTFILES += +DISTFILES += \ No newline at end of file diff --git a/src/spark-update-tool/CMakeLists.txt b/src/spark-update-tool/CMakeLists.txt deleted file mode 100644 index 49a4d5e..0000000 --- a/src/spark-update-tool/CMakeLists.txt +++ /dev/null @@ -1,58 +0,0 @@ -cmake_minimum_required(VERSION 3.16) - -project(spark-update-tool VERSION 0.1 LANGUAGES CXX) - -set(CMAKE_AUTOUIC ON) -set(CMAKE_AUTOMOC ON) -set(CMAKE_AUTORCC ON) - -set(CMAKE_CXX_STANDARD 17) -set(CMAKE_CXX_STANDARD_REQUIRED ON) - - -find_package(Qt5 REQUIRED COMPONENTS Widgets Network Concurrent) - - -find_package(Qt5 REQUIRED COMPONENTS Widgets Network Concurrent Core Gui) - -# 定义所有项目源文件，现在无需条件判断 -set(PROJECT_SOURCES - src/main.cpp - src/mainwindow.cpp - src/mainwindow.h - src/mainwindow.ui - src/aptssupdater.h src/aptssupdater.cpp - src/icons.qrc - src/appdelegate.h src/appdelegate.cpp - src/applistmodel.h src/applistmodel.cpp - src/downloadmanager.h src/downloadmanager.cpp -) - - -add_executable(spark-update-tool - ${PROJECT_SOURCES} -) - -target_link_libraries(spark-update-tool PRIVATE - Qt5::Widgets - Qt5::Network - Qt5::Concurrent - Qt5::Core - Qt5::Gui -) - - -set_target_properties(spark-update-tool PROPERTIES - # ${BUNDLE_ID_OPTION} # 如果上面取消注释，这里也取消注释 - MACOSX_BUNDLE_BUNDLE_VERSION ${PROJECT_VERSION} - MACOSX_BUNDLE_SHORT_VERSION_STRING ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR} - -) - -include(GNUInstallDirs) -install(TARGETS spark-update-tool - BUNDLE DESTINATION . - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} -) - diff --git a/src/spark-update-tool/README.md b/src/spark-update-tool/README.md deleted file mode 100644 index e572880..0000000 --- a/src/spark-update-tool/README.md +++ /dev/null @@ -1,21 +0,0 @@ -### Spark Software Updater - -#### Introduction - -Welcome to Spark Software Updater! This tool helps you conveniently update various applications on your Linux system. - -This version is specifically designed for Linux distributions with Qt5 support. -**Please run with root privileges (recommended to use `sudo`).** - -#### Currently Supported Linux Distributions - -- [x] GXDE OS -- [x] Ubuntu -- [x] deepin -- [ ] Kylin - -// ... existing Chinese feature table ... - -#### Contact & Feedback - -For any issues or suggestions, please contact: momen@momen.world diff --git a/src/spark-update-tool/debian/changelog b/src/spark-update-tool/debian/changelog deleted file mode 100644 index b414fea..0000000 --- a/src/spark-update-tool/debian/changelog +++ /dev/null @@ -1,5 +0,0 @@ -spark-update-tool (1.0.0) unstable; urgency=low - - * Initial release. - - -- momen Wed, 18 Jun 2025 00:00:00 +0000 \ No newline at end of file diff --git a/src/spark-update-tool/debian/compat b/src/spark-update-tool/debian/compat deleted file mode 100644 index f11c82a..0000000 --- a/src/spark-update-tool/debian/compat +++ /dev/null @@ -1 +0,0 @@ -9 \ No newline at end of file diff --git a/src/spark-update-tool/debian/rules b/src/spark-update-tool/debian/rules deleted file mode 100755 index 1159ac4..0000000 --- a/src/spark-update-tool/debian/rules +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/make -f - -%: - dh $@ - -override_dh_auto_configure: - dh_auto_configure -- -DCMAKE_INSTALL_PREFIX=/usr diff --git a/src/spark-update-tool/src/appdelegate.cpp b/src/spark-update-tool/src/appdelegate.cpp deleted file mode 100644 index 7db37ff..0000000 --- a/src/spark-update-tool/src/appdelegate.cpp +++ /dev/null @@ -1,322 +0,0 @@ -#include "appdelegate.h" -#include -#include -#include -#include -#include -#include -#include -#include - -AppDelegate::AppDelegate(QObject *parent) - : QStyledItemDelegate(parent), m_downloadManager(new DownloadManager(this)), m_installProcess(nullptr) { - connect(m_downloadManager, &DownloadManager::downloadFinished, this, - [this](const QString &packageName, bool success) { - if (m_downloads.contains(packageName)) { - m_downloads[packageName].isDownloading = false; - emit updateDisplay(packageName); - qDebug() << (success ? "下载完成:" : "下载失败:") << packageName; - if (success) { - enqueueInstall(packageName); - } - } - }); - - connect(m_downloadManager, &DownloadManager::downloadProgress, this, - [this](const QString &packageName, int progress) { - if (m_downloads.contains(packageName)) { - m_downloads[packageName].progress = progress; - qDebug()<save(); - - if (option.state & QStyle::State_Selected) - painter->fillRect(option.rect, option.palette.highlight()); - else - painter->fillRect(option.rect, QColor("#F3F4F6")); - - QFont boldFont = option.font; - boldFont.setBold(true); - QFont normalFont = option.font; - - QString name = index.data(Qt::DisplayRole).toString(); - QString currentVersion = index.data(Qt::UserRole + 2).toString(); - QString newVersion = index.data(Qt::UserRole + 3).toString(); - QString iconPath = index.data(Qt::UserRole + 4).toString(); - QString size = index.data(Qt::UserRole + 5).toString(); - QString description = index.data(Qt::UserRole + 6).toString(); - - QRect rect = option.rect; - int margin = 10, spacing = 6, iconSize = 40; - - QRect iconRect(rect.left() + margin, rect.top() + (rect.height() - iconSize) / 2, iconSize, iconSize); - QIcon(iconPath).paint(painter, iconRect); - - int textX = iconRect.right() + margin; - int textWidth = rect.width() - textX - 100; - - QRect nameRect(textX, rect.top() + margin, textWidth, 20); - painter->setFont(boldFont); - painter->setPen(QColor("#333333")); - painter->drawText(nameRect, Qt::AlignLeft | Qt::AlignVCenter, name); - - QRect versionRect(textX, nameRect.bottom() + spacing, textWidth, 20); - painter->setFont(normalFont); - painter->setPen(QColor("#888888")); - painter->drawText(versionRect, Qt::AlignLeft | Qt::AlignVCenter, - QString("当前版本: %1 → 新版本: %2").arg(currentVersion, newVersion)); - - QRect descRect(textX, versionRect.bottom() + spacing, textWidth, 40); - painter->setFont(normalFont); - painter->setPen(QColor("#AAAAAA")); - painter->drawText(descRect, Qt::TextWordWrap, - QString("包大小：%1 MB").arg(QString::number(size.toDouble() / (1024 * 1024), 'f', 2))); - - QString packageName = index.data(Qt::UserRole + 1).toString(); - bool isDownloading = m_downloads.contains(packageName) && m_downloads[packageName].isDownloading; - int progress = m_downloads.value(packageName, DownloadInfo{0, false}).progress; - bool isInstalled = m_downloads.value(packageName).isInstalled; - bool isInstalling = m_downloads.value(packageName).isInstalling; - - if (isDownloading) { - QRect progressRect(rect.right() - 270, rect.top() + (rect.height() - 20) / 2, 150, 20); - QStyleOptionProgressBar progressBarOption; - progressBarOption.rect = progressRect; - progressBarOption.minimum = 0; - progressBarOption.maximum = 100; - progressBarOption.progress = progress; - progressBarOption.text = QString("%1%").arg(progress); - progressBarOption.textVisible = true; - QApplication::style()->drawControl(QStyle::CE_ProgressBar, &progressBarOption, painter); - - // 修改后的取消按钮绘制代码 - QRect buttonRect(rect.right() - 80, rect.top() + (rect.height() - 30) / 2, 70, 30); - painter->setPen(Qt::NoPen); - painter->setBrush(QColor("#ff4444")); // 红色背景 - painter->drawRoundedRect(buttonRect, 4, 4); // 圆角矩形 - - painter->setPen(Qt::white); // 白色文字 - painter->setFont(option.font); - painter->drawText(buttonRect, Qt::AlignCenter, "取消"); - } else if (isInstalling) { - // 安装中：显示转圈和文字 - QRect spinnerRect(option.rect.right() - 80, option.rect.top() + (option.rect.height() - 30) / 2, 30, 30); - int angle = (m_spinnerTimer.elapsed() / 10) % 360; - QPen pen(QColor("#2563EB"), 3); - painter->setPen(pen); - painter->setRenderHint(QPainter::Antialiasing, true); - QRectF arcRect = spinnerRect.adjusted(3, 3, -3, -3); - painter->drawArc(arcRect, angle * 16, 120 * 16); // 120度弧 - - QRect textRect(option.rect.right() - 120, option.rect.top() + (option.rect.height() - 30) / 2, 110, 30); - painter->setPen(QColor("#2563EB")); - painter->setFont(option.font); - painter->drawText(textRect, Qt::AlignLeft | Qt::AlignVCenter, "正在安装中"); - } else { - QRect buttonRect(option.rect.right() - 80, option.rect.top() + (option.rect.height() - 30) / 2, 70, 30); - painter->setPen(Qt::NoPen); - if (isInstalled) { - painter->setBrush(QColor("#10B981")); - painter->drawRoundedRect(buttonRect, 4, 4); - painter->setPen(Qt::white); - painter->drawText(buttonRect, Qt::AlignCenter, "已安装"); - } else if (m_downloads.contains(packageName) && !m_downloads[packageName].isDownloading) { - // 下载完成，按钮绿色，样式不变 - painter->setBrush(QColor("#10B981")); - painter->drawRoundedRect(buttonRect, 4, 4); - painter->setPen(Qt::white); - painter->drawText(buttonRect, Qt::AlignCenter, "下载完成"); - // 不需要特殊处理样式，交互在 editorEvent 控制 - } else { - painter->setBrush(QColor("#e9effd")); - painter->drawRoundedRect(buttonRect, 4, 4); - painter->setPen(QColor("#2563EB")); - painter->drawText(buttonRect, Qt::AlignCenter, "更新"); - } - } - - painter->restore(); -} - -QSize AppDelegate::sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const { - return QSize(option.rect.width(), 110); -} - -bool AppDelegate::editorEvent(QEvent *event, QAbstractItemModel *model, - const QStyleOptionViewItem &option, const QModelIndex &index) { - if (event->type() == QEvent::MouseButtonRelease) { - QMouseEvent *mouseEvent = static_cast(event); - QRect rect = option.rect; - QString packageName = index.data(Qt::UserRole + 1).toString(); - - if (m_downloads.contains(packageName) && m_downloads[packageName].isDownloading) { - QRect cancelButtonRect(rect.right() - 70, rect.top() + (rect.height() - 20) / 2, 60, 20); - if (cancelButtonRect.contains(mouseEvent->pos())) { - m_downloadManager->cancelDownload(packageName); - m_downloads.remove(packageName); - emit updateDisplay(packageName); - return true; - } - } else { - QRect buttonRect(rect.right() - 80, rect.top() + (rect.height() - 30) / 2, 70, 30); - if (buttonRect.contains(mouseEvent->pos())) { - // 判断是否为“下载完成”状态，如果是则不响应点击 - if (m_downloads.contains(packageName) && !m_downloads[packageName].isDownloading) { - // “下载完成”状态，按钮失效，点击无效 - return false; - } - QString downloadUrl = index.data(Qt::UserRole + 7).toString(); - QString outputPath = QString("%1/%2.metalink").arg(QDir::tempPath(), packageName); - - m_downloads[packageName] = {0, true}; - m_downloadManager->startDownload(packageName, downloadUrl, outputPath); - emit updateDisplay(packageName); - return true; - } - } - } - - return QStyledItemDelegate::editorEvent(event, model, option, index); -} - -void AppDelegate::startDownloadForAll() { - if (!m_model) return; - for (int row = 0; row < m_model->rowCount(); ++row) { - QModelIndex index = m_model->index(row, 0); - QString packageName = index.data(Qt::UserRole + 1).toString(); - if (m_downloads.contains(packageName) && (m_downloads[packageName].isDownloading || m_downloads[packageName].isInstalled)) - continue; // 跳过正在下载或已安装的 - QString downloadUrl = index.data(Qt::UserRole + 7).toString(); - QString outputPath = QString("%1/%2.metalink").arg(QDir::tempPath(), packageName); - m_downloads[packageName] = {0, true, false}; - m_downloadManager->startDownload(packageName, downloadUrl, outputPath); - emit updateDisplay(packageName); - } -} - -// 新增：安装队列相关实现 -void AppDelegate::enqueueInstall(const QString &packageName) { - m_installQueue.enqueue(packageName); - if (!m_isInstalling) { - startNextInstall(); - } -} - -void AppDelegate::startNextInstall() { - if (m_installQueue.isEmpty()) { - m_isInstalling = false; - m_installingPackage.clear(); - return; - } - m_isInstalling = true; - QString packageName = m_installQueue.dequeue(); - m_installingPackage = packageName; - m_downloads[packageName].isInstalling = true; - emit updateDisplay(packageName); - - // 查找 /tmp 下以包名开头的 .deb 文件 - QDir tempDir(QDir::tempPath()); - QStringList debs = tempDir.entryList(QStringList() << QString("%1_*.deb").arg(packageName), QDir::Files); - QString debPath; - if (!debs.isEmpty()) { - debPath = tempDir.absoluteFilePath(debs.first()); - } else { - debs = tempDir.entryList(QStringList() << QString("%1*.deb").arg(packageName), QDir::Files); - if (!debs.isEmpty()) { - debPath = tempDir.absoluteFilePath(debs.first()); - } - } - - if (debPath.isEmpty()) { - qWarning() << "未找到deb文件，包名:" << packageName; - m_downloads[packageName].isInstalling = false; - emit updateDisplay(packageName); - m_installingPackage.clear(); - startNextInstall(); - return; - } - - m_installProcess = new QProcess(this); - - // 新增：准备安装日志文件 - QString logPath = QString("/tmp/%1_install.log").arg(packageName); - QFile *logFile = new QFile(logPath, m_installProcess); - if (logFile->open(QIODevice::Append | QIODevice::Text)) { - // 设置权限为777 - QFile::setPermissions(logPath, QFile::ReadOwner | QFile::WriteOwner | QFile::ExeOwner | - QFile::ReadGroup | QFile::WriteGroup | QFile::ExeGroup | - QFile::ReadOther | QFile::WriteOther | QFile::ExeOther); - connect(m_installProcess, &QProcess::readyReadStandardOutput, this, [this, packageName, logFile]() { - QByteArray out = m_installProcess->readAllStandardOutput(); - logFile->write(out); - logFile->flush(); - QString text = QString::fromLocal8Bit(out); - qDebug().noquote() << text; - // 检查“软件包已安装”关键字 - if (text.contains(QStringLiteral("软件包已安装"))) { - m_downloads[packageName].isInstalling = false; - m_downloads[packageName].isInstalled = true; - emit updateDisplay(packageName); - } - }); - connect(m_installProcess, &QProcess::readyReadStandardError, this, [this, logFile]() { - QByteArray err = m_installProcess->readAllStandardError(); - logFile->write(err); - logFile->flush(); - qDebug().noquote() << QString::fromLocal8Bit(err); - }); - connect(m_installProcess, QOverload::of(&QProcess::finished), - this, [this, packageName, logFile](int exitCode, QProcess::ExitStatus status) { - if (logFile) logFile->close(); - m_downloads[packageName].isInstalling = false; - if (exitCode == 0) { - m_downloads[packageName].isInstalled = true; // 安装成功 - } - emit updateDisplay(packageName); - m_installProcess->deleteLater(); - m_installProcess = nullptr; - m_installingPackage.clear(); - startNextInstall(); - }); - - } else { - // 日志文件无法打开时，仍然要连接原有信号 - connect(m_installProcess, &QProcess::readyReadStandardOutput, this, [this, packageName]() { - QByteArray out = m_installProcess->readAllStandardOutput(); - QString text = QString::fromLocal8Bit(out); - qDebug().noquote() << text; - if (text.contains(QStringLiteral("软件包已安装"))) { - m_downloads[packageName].isInstalling = false; - m_downloads[packageName].isInstalled = true; - emit updateDisplay(packageName); - } - }); - connect(m_installProcess, &QProcess::readyReadStandardError, this, [this]() { - QByteArray err = m_installProcess->readAllStandardError(); - qDebug().noquote() << QString::fromLocal8Bit(err); - }); - connect(m_installProcess, QOverload::of(&QProcess::finished), - this, [this, packageName](int /*exitCode*/, QProcess::ExitStatus /*status*/) { - emit updateDisplay(packageName); - m_installProcess->deleteLater(); - m_installProcess = nullptr; - m_installingPackage.clear(); - startNextInstall(); - }); - } - - // 注意参数顺序：deb路径在前，--no-create-desktop-entry在后 - QStringList args; - args << debPath << "--no-create-desktop-entry" << "--delete-after-install"; - m_installProcess->start("ssinstall", args); -} diff --git a/src/utils/httprequest.cpp b/src/utils/httprequest.cpp index b64e095..8baf92a 100644 --- a/src/utils/httprequest.cpp +++ b/src/utils/httprequest.cpp @@ -41,8 +41,7 @@ QString HttpRequest::postRequest(QString url, QString jsondata) QEventLoop eventLoop; connect(naManager, SIGNAL(finished(QNetworkReply *)), &eventLoop, SLOT(quit())); eventLoop.exec(); - QTextCodec *codec = QTextCodec::codecForName("utf8"); - QString strReply = codec->toUnicode(reply->readAll()); + QString strReply(reply->readAll()); reply->deleteLater(); return strReply; } diff --git a/src/utils/httprequest.h b/src/utils/httprequest.h index e6ad7f1..c55bc52 100644 --- a/src/utils/httprequest.h +++ b/src/utils/httprequest.h @@ -6,7 +6,6 @@ #include #include #include -#include class HttpRequest : public QObject { Q_OBJECT diff --git a/src/utils/utils.cpp b/src/utils/utils.cpp index 7d27054..e034a14 100644 --- a/src/utils/utils.cpp +++ b/src/utils/utils.cpp @@ -10,6 +10,10 @@ #include #include #include +#include +#include +#include +#include #define UOSDeveloperModeFile "/var/lib/deepin/developer-mode/enabled" @@ -261,3 +265,183 @@ QJsonObject Utils::parseFeatureJsonFile() return jsonDoc.object(); } + +/** + * @brief Utils::shouldDisableWebEngineSandbox 检查是否应关闭webengine沙箱 + * @return bool true: 配置文件中设置了关闭沙箱 false: 未设置或设置为false + */ +bool Utils::shouldDisableWebEngineSandbox() +{ + // WARNING: 请在 组织名称 和 应用程序名称 初始化完成后调用 + QSettings config(QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) + "/config.ini", QSettings::IniFormat); + + // 检查配置文件中[webengine]部分的noSandbox配置项 + // 如果配置存在且值为true，则返回true；否则返回false + qDebug()<<"shaxiang"<open(QIODevice::WriteOnly | QIODevice::Append | QIODevice::Text)) { + qWarning() << "Failed to open log file:" << logFilePath; + delete logFile; + logFile = nullptr; + return; + } + + // 安装自定义消息处理器，捕获所有Qt日志输出 + qInstallMessageHandler(customMessageHandler); + + // 写入日志头信息 + writeLog("INFO", "Logger initialized"); + writeLog("INFO", QString("Application started at %1").arg( + QDateTime::currentDateTime().toString("yyyy-MM-dd hh:mm:ss"))); +} + +// 写入日志 +void Utils::writeLog(const QString &level, const QString &message) +{ + if (!logFile || !logFile->isOpen()) { + return; + } + + QString timestamp = QDateTime::currentDateTime().toString("yyyy-MM-dd hh:mm:ss.zzz"); + QString logEntry = QString("[%1] [%2] %3\n").arg(timestamp).arg(level).arg(message); + + QTextStream out(logFile); + out << logEntry; + logFile->flush(); + + // 同时输出到控制台，便于调试 + if (level == "ERROR") { + qCritical() << logEntry.trimmed(); + } else if (level == "WARNING") { + qWarning() << logEntry.trimmed(); + } else { + qDebug() << logEntry.trimmed(); + } +} + +// 导出日志 +bool Utils::exportLogs(const QString &targetPath) +{ + QString exportPath = targetPath; + if (exportPath.isEmpty()) { + exportPath = "/tmp/spark-store"; + } + + // 确保目标目录存在 + QDir dir; + if (!dir.exists(exportPath)) { + if (!dir.mkpath(exportPath)) { + writeLog("ERROR", QString("Failed to create target directory: %1").arg(exportPath)); + return false; + } + } + + // 关闭当前日志文件，便于复制 + if (logFile && logFile->isOpen()) { + logFile->close(); + } + + // 复制日志文件到目标位置 + QString timestamp = QDateTime::currentDateTime().toString("yyyyMMdd_HHmmss"); + QString targetLogPath = exportPath + QString("/spark-store_full_log_%1.log").arg(timestamp); + + bool success = QFile::copy(logFilePath, targetLogPath); + + // 额外检查：即使QFile::copy返回false，也要检查目标文件是否实际存在且大小合理 + if (!success) { + QFileInfo targetFileInfo(targetLogPath); + if (targetFileInfo.exists() && targetFileInfo.size() > 0) { + success = true; + } + } + + if (success) { + writeLog("INFO", QString("All logs (INFO, DEBUG, WARNING, ERROR) exported to: %1").arg(targetLogPath)); + + // 同时创建一个简单的导出报告 + QString reportPath = exportPath + QString("/export_report_%1.txt").arg(timestamp); + QFile reportFile(reportPath); + if (reportFile.open(QIODevice::WriteOnly | QIODevice::Text)) { + QTextStream out(&reportFile); + out << "Spark Store Log Export Report\n"; + out << "================================\n"; + out << "Export Time: " << QDateTime::currentDateTime().toString("yyyy-MM-dd hh:mm:ss") << "\n"; + out << "Target Directory: " << exportPath << "\n"; + out << "Log File: " << targetLogPath << "\n"; + out << "Original Log: " << logFilePath << "\n"; + out << "Log Levels: INFO, DEBUG, WARNING, ERROR, FATAL\n"; + out << "Status: SUCCESS\n"; + reportFile.close(); + } + } else { + writeLog("ERROR", QString("Failed to export logs to: %1").arg(targetLogPath)); + } + + // 重新打开日志文件继续记录 + if (logFile && !logFile->isOpen()) { + logFile->open(QIODevice::WriteOnly | QIODevice::Append | QIODevice::Text); + } + + return success; +} + +// 获取日志文件路径 +QString Utils::getLogFilePath() +{ + return logFilePath; +} \ No newline at end of file diff --git a/src/utils/utils.h b/src/utils/utils.h index a85d64a..9d780b9 100644 --- a/src/utils/utils.h +++ b/src/utils/utils.h @@ -3,6 +3,9 @@ #include #include +#include +#include +#include class Utils { @@ -18,6 +21,13 @@ public: static void setQPAPlatform(); static void checkUOSDeveloperMode(); static QJsonObject parseFeatureJsonFile(); + static bool shouldDisableWebEngineSandbox(); // 新增函数声明 + + // 日志相关函数 + static void initLogger(); // 初始化日志系统 + static void writeLog(const QString &level, const QString &message); // 写入日志 + static bool exportLogs(const QString &targetPath = "/tmp/spark-store"); // 导出日志 + static QString getLogFilePath(); // 获取日志文件路径 }; -#endif // UTILS_H +#endif // UTILS_H \ No newline at end of file diff --git a/src/widgets/big_image.cpp b/src/widgets/big_image.cpp index 5620518..e3bcf98 100644 --- a/src/widgets/big_image.cpp +++ b/src/widgets/big_image.cpp @@ -17,7 +17,7 @@ big_image::big_image(DBlurEffectWidget *parent) : DBlurEffectWidget(parent), QHBoxLayout *layout = new QHBoxLayout; setLayout(layout); layout->addWidget(m_image); - layout->setMargin(0); + layout->setContentsMargins(0, 0, 0, 0); // Make sure the image has a parent so that it will be freed. m_image->setParent(this); diff --git a/src/widgets/common/customlabel.cpp b/src/widgets/common/customlabel.cpp index 26f9123..f70f954 100644 --- a/src/widgets/common/customlabel.cpp +++ b/src/widgets/common/customlabel.cpp @@ -1,14 +1,16 @@ #include "customlabel.h" + #include -CustomLabel::CustomLabel(QWidget *parent, Qt::WindowFlags f) +CustomLabel::CustomLabel(QWidget *parent, + Qt::WindowFlags f) : QLabel(parent, f) { } QPixmap CustomLabel::pixmap() const { - const QPixmap *p = QLabel::pixmap(); + const QPixmap* p = QLabel::pixmap(); return p ? *p : QPixmap(); } @@ -21,4 +23,4 @@ void CustomLabel::setPixmap(const QPixmap &pixmap) Qt::SmoothTransformation); QLabel::setPixmap(_pixmap); -} +} \ No newline at end of file diff --git a/src/widgets/common/downloaditem.cpp b/src/widgets/common/downloaditem.cpp index 45cdc54..3a25ab8 100644 --- a/src/widgets/common/downloaditem.cpp +++ b/src/widgets/common/downloaditem.cpp @@ -125,7 +125,7 @@ void DownloadItem::install(int t) ui->label_2->setText(tr("Installing")); ui->label_2->setToolTip(tr("Installing")); - QtConcurrent::run([=]() + auto future = QtConcurrent::run([=]() { slotAsyncInstall(t); }); @@ -158,7 +158,7 @@ void DownloadItem::on_pushButton_3_clicked() output_w->setMinimumHeight(600); output_w->setAttribute(Qt::WA_TranslucentBackground); output_w->setTitle(ui->label->text()); - output_w->layout()->setMargin(20); + output_w->layout()->setContentsMargins(20, 20, 20, 20); output_w->layout()->addWidget(textbrowser); output_w->show(); } @@ -216,7 +216,7 @@ void DownloadItem::slotAsyncInstall(int t) } } - // QProcess isInstall; + QProcess isInstall; // isInstall.start("dpkg", QStringList() << "-s" << pkgName); // isInstall.waitForFinished(180 * 1000); // 默认超时 3 分钟 // int error = QString::fromStdString(isInstall.readAllStandardError().toStdString()).length(); diff --git a/src/widgets/downloadlistwidget.cpp b/src/widgets/downloadlistwidget.cpp index 413477a..b4b19fc 100644 --- a/src/widgets/downloadlistwidget.cpp +++ b/src/widgets/downloadlistwidget.cpp @@ -168,7 +168,7 @@ void DownloadListWidget::httpFinished() // 完成下载 isdownload = false; isBusy = false; - QtConcurrent::run([=]() + auto future = QtConcurrent::run([=]() { while (downloaditemlist[nowDownload - 1]->readyInstall() == -1) // 安装当前应用，堵塞安装，后面的下载suspend { diff --git a/translations/spark-store_en.ts b/translations/spark-store_en.ts index e14fb49..7fe778c 100644 --- a/translations/spark-store_en.ts +++ b/translations/spark-store_en.ts @@ -24,120 +24,150 @@ - - + + <html><head/><body><p>Capable to deepin 23</p></body></html> - - + + <html><head/><body><p>This app is developed by community user,we give this tag to honor those who contribute to the Linux Ecology</p></body></html> - - + + <html><head/><body><p>Capable to UOS home 20</p></body></html> - - + + <html><head/><body><p>A deepin-wine2 app. Spark Store will automatically configure the wine kit for you.</p></body></html> - - + + <html><head/><body><p>This is a DTK5 app,which means it would have better effect on Deepin Desktop Environment</p></body></html> - - + + <html><head/><body><p>An Appimage to deb app.</p></body></html> - + Share Spk share link - + APP Feedback - + Introduction - + Description - + Screen capture - - - - + + + + Download and Install - - + + <html><head/><body><p>Capable to Ubuntu 22.04</p></body></html> - - + + <html><head/><body><p>A Wine app.Spark Store will automatically configure the wine kit for you</p></body></html> - - + + <html><head/><body><p>Capable to Debian Stable</p></body></html> - + + + <html><head/><body><p>This app can only be installed natively</p></body></html> + + + + + + <html><head/><body><p>This app will be installed to debian12 ACE</p></body></html> + + + + + + <html><head/><body><p>This app will be installed to debian13 ACE</p></body></html> + + + + + + <html><head/><body><p>This app will be installed to debian SID ACE</p></body></html> + + + + + + <html><head/><body><p>This app will be installed to deepin23 ACE</p></body></html> + + + + Update - + Contributor - + Pkgname - + Author - + Size - + Website @@ -147,87 +177,87 @@ - + Developer Mode Disabled - - - + + + Reinstall - - - + + + Launch - + Upgrade - - + + Install - + Installing - - - - - + + + + + Warning - + The current application does not support or tested on deepin, there may be problems - + The current application does not support or tested on UOS, there may be problems - + The current application does not support or tested on Ubuntu, there may be problems - + The current application does not support or tested on Debian, there may be problems - + The current application does not support or tested on current platform, there may be problems - - + + Spark Store - + Uninstall succeeded - + The URL has been copied to the clipboard @@ -248,12 +278,12 @@ DAboutDialog - + Version: %1 - + %1 is released under %2 @@ -460,33 +490,33 @@ - + Submit App - + Submit App with client(Recommanded) - + Settings - + APP Upgrade and Install Settings - - + + Spark Store - + Search or enter spk:// @@ -494,19 +524,19 @@ QObject + - - + Spark Store - - <span style=' font-size:10pt;font-weight:60;'>An appstore powered by community</span><br/><a href='https://www.spark-app.store/'>https://www.spark-app.store</a><br/><span style=' font-size:12pt;'>Spark developers</span> + + <span style=' font-size:10pt;font-weight:60;'>An appstore powered by community</span><br/><span style=' font-size:10pt;font-weight:60;'>Sparky is our mascot, designed by <a href='https://tai3.cn/'>Tyson Tan</a></span><br/> - + Spark Project @@ -516,7 +546,7 @@ - + Show MainWindow @@ -609,40 +639,85 @@ - + + Log + + + + + Export Logs:/tmp/spark-store + + + + + Export + + + + + Disable Safe Mode + + + + + Disable the webEngine sandbox feature. + + + + + Disable + + + + About us - + <html><head/><body><p>Our services and software are free for individuals and non-profit organizations to use, communicate and learn, but you must comply with local laws and regulations in the process of use, otherwise any problems have nothing to do with us. </p><p>We don't make a profit from the Community version store, we rely on donations from the community for most of our operating expenses, and we appreciate that this allows us to spend less energy worrying about money. However, in order to better provide continuous service, Spark is only free for individual users to open the service warehouse, if you or your organization needs to provide commercial services or your organization is a for-profit organization, please contact us to obtain commercial authorization. </p><p>When using the Software, users or organizations are strictly forbidden to engage in any form of malicious behavior, including but not limited to malicious attacks, abuse, destruction, bulk crawling of the software warehouse, etc. The definition of malicious behavior is judged by the Spark community, and violators will be held legally responsible. Spark Community reserves the right to distribute the software packages it produces. </p><p>Any person or organization is prohibited from using the Spark Community software package for commercial purposes or redistributing it without the express authorization of the Spark Community. This clause is intended to ensure the spirit of open source while safeguarding the intellectual property rights of the Spark community. In addition to the above, if you use the Spark Store main program or part of its code, you are subject to all other terms and requirements of the GPL v3.</p><p>If any part of the store infringes your rights, please tell us <a href="mailto:jifengshenmo@outlook.com"><span style=" text-decoration: underline; color:#0082fa;">jifengshenmo@outlook.com</span></a> we will remove the infringing content as soon as possible. </p><p>If you'd like to get involved with us too, whether you're involved in development, design, pitching or submitting work, we welcome you to join us. </p><p><span style=" text-decoration: underline; color:#0000ff;"><br/></span>Our contact method can be found at <a href="https://blog.shenmo.tech/post/%E6%95%85%E9%9A%9C%E5%85%AC%E5%91%8A/"><span style=" text-decoration: underline; color:#0082fa;">Here</span></a></p></body></html> - + Updating, please wait... - + Spark Store - + Temporary cache was cleaned + + + Logs exported successfully to: %1 + + + + + Failed to export logs + + + + + Export Logs + + TitleBarMenu - + About - + Exit diff --git a/translations/spark-store_es.ts b/translations/spark-store_es.ts index d41cefe..a37cb3e 100644 --- a/translations/spark-store_es.ts +++ b/translations/spark-store_es.ts @@ -24,120 +24,150 @@ Número de descargas - - + + <html><head/><body><p>Capable to deepin 23</p></body></html> <html><head/><body><p>Capaz de deepin 20</p></body></html> {23<?} - - + + <html><head/><body><p>This app is developed by community user,we give this tag to honor those who contribute to the Linux Ecology</p></body></html> <html><head/><body><p>Esta aplicación fue desarrollada por usuarios de la comunidad y la Etiquetamos en honor a aquellos que contribuyeron a la ecología de linux.</p></body></html> - - + + <html><head/><body><p>Capable to UOS home 20</p></body></html> <html><head/><body><p>Capaz de UOS home 20</p></body></html> - - + + <html><head/><body><p>A deepin-wine2 app. Spark Store will automatically configure the wine kit for you.</p></body></html> <html><head/><body><p>A deepin-wine2 app. La tienda Spark le configurará automáticamente un traje de vino.</p></body></html> - - + + <html><head/><body><p>This is a DTK5 app,which means it would have better effect on Deepin Desktop Environment</p></body></html> <html><head/><body><p>Esta es una aplicación dtk5, lo que significa que funcionará mejor en un entorno de escritorio profundo.</p></body></html> - - + + <html><head/><body><p>An Appimage to deb app.</p></body></html> <html><head/><body><p>Appimage de la aplicación deb.</p></body></html> - + Share Comunión - + APP Feedback Comentarios de la app - + Introduction Introducción - + Description Descripción - + Screen capture Captura de pantalla - - - - + + + + Download and Install Descargar e instalar - - + + <html><head/><body><p>Capable to Ubuntu 22.04</p></body></html> <html><head/><body><p>Capaz de Ubuntu 22.04</p></body></html> - - + + <html><head/><body><p>A Wine app.Spark Store will automatically configure the wine kit for you</p></body></html> <html><head/><body><p>La aplicación wine. Spark Store configurará automáticamente el kit Wine para usted</p></body></html> - - + + <html><head/><body><p>Capable to Debian Stable</p></body></html> - + + + <html><head/><body><p>This app can only be installed natively</p></body></html> + + + + + + <html><head/><body><p>This app will be installed to debian12 ACE</p></body></html> + + + + + + <html><head/><body><p>This app will be installed to debian13 ACE</p></body></html> + + + + + + <html><head/><body><p>This app will be installed to debian SID ACE</p></body></html> + + + + + + <html><head/><body><p>This app will be installed to deepin23 ACE</p></body></html> + + + + Update Modernizar - + Contributor Contribuyentes - + Pkgname Nombre del embalaje - + Author Autor - + Size Tamaño - + Website Sitio web @@ -147,87 +177,87 @@ Haga clic en "abrir" - + Developer Mode Disabled Se ha desactivado el modo desarrollador - - - + + + Reinstall Reinstalación - - - + + + Launch - + Upgrade Actualización - - + + Install Instalación - + Installing Se está instalando - - - - - + + + + + Warning Aviso - + The current application does not support or tested on deepin, there may be problems - + The current application does not support or tested on UOS, there may be problems - + The current application does not support or tested on Ubuntu, there may be problems - + The current application does not support or tested on Debian, there may be problems - + The current application does not support or tested on current platform, there may be problems - - + + Spark Store SPARK Store - + Uninstall succeeded Desinstalación exitosa - + The URL has been copied to the clipboard La URL ha sido copiada al portapapeles @@ -248,12 +278,12 @@ DAboutDialog - + Version: %1 Versión %1 - + %1 is released under %2 %1 publicado bajo %2 @@ -460,33 +490,33 @@ Actualización de app - + Submit App Presentación de la aplicación - + Submit App with client(Recommanded) Enviar la aplicación al cliente (recomendación) - + Settings Configuración - + APP Upgrade and Install Settings Actualización e instalación de app - - + + Spark Store SPARK Store - + Search or enter spk:// Buscar o introducir spk: /% @@ -494,19 +524,19 @@ QObject + - - + Spark Store SPARK Store - - <span style=' font-size:10pt;font-weight:60;'>An appstore powered by community</span><br/><a href='https://www.spark-app.store/'>https://www.spark-app.store</a><br/><span style=' font-size:12pt;'>Spark developers</span> - <span style=' font-size:10pt;font-weight:60;'>An appstore powered by community</span><br/><a href='https://www.spark-app.store/'>https://www.spark-app.store</a><br/><span style=' font-size:12pt;'>Spark developers</span> + + <span style=' font-size:10pt;font-weight:60;'>An appstore powered by community</span><br/><span style=' font-size:10pt;font-weight:60;'>Sparky is our mascot, designed by <a href='https://tai3.cn/'>Tyson Tan</a></span><br/> + - + Spark Project Proyecto spark @@ -516,7 +546,7 @@ Descargar lista - + Show MainWindow Mostrar la ventana principal @@ -609,40 +639,85 @@ Borrar la caché web - + + Log + + + + + Export Logs:/tmp/spark-store + + + + + Export + + + + + Disable Safe Mode + + + + + Disable the webEngine sandbox feature. + + + + + Disable + + + + About us Sobre nosotros - + <html><head/><body><p>Our services and software are free for individuals and non-profit organizations to use, communicate and learn, but you must comply with local laws and regulations in the process of use, otherwise any problems have nothing to do with us. </p><p>We don't make a profit from the Community version store, we rely on donations from the community for most of our operating expenses, and we appreciate that this allows us to spend less energy worrying about money. However, in order to better provide continuous service, Spark is only free for individual users to open the service warehouse, if you or your organization needs to provide commercial services or your organization is a for-profit organization, please contact us to obtain commercial authorization. </p><p>When using the Software, users or organizations are strictly forbidden to engage in any form of malicious behavior, including but not limited to malicious attacks, abuse, destruction, bulk crawling of the software warehouse, etc. The definition of malicious behavior is judged by the Spark community, and violators will be held legally responsible. Spark Community reserves the right to distribute the software packages it produces. </p><p>Any person or organization is prohibited from using the Spark Community software package for commercial purposes or redistributing it without the express authorization of the Spark Community. This clause is intended to ensure the spirit of open source while safeguarding the intellectual property rights of the Spark community. In addition to the above, if you use the Spark Store main program or part of its code, you are subject to all other terms and requirements of the GPL v3.</p><p>If any part of the store infringes your rights, please tell us <a href="mailto:jifengshenmo@outlook.com"><span style=" text-decoration: underline; color:#0082fa;">jifengshenmo@outlook.com</span></a> we will remove the infringing content as soon as possible. </p><p>If you'd like to get involved with us too, whether you're involved in development, design, pitching or submitting work, we welcome you to join us. </p><p><span style=" text-decoration: underline; color:#0000ff;"><br/></span>Our contact method can be found at <a href="https://blog.shenmo.tech/post/%E6%95%85%E9%9A%9C%E5%85%AC%E5%91%8A/"><span style=" text-decoration: underline; color:#0082fa;">Here</span></a></p></body></html> - + Updating, please wait... Se está actualizando, por favor Espere... - + Spark Store SPARK Store - + Temporary cache was cleaned Se ha limpiado la caché temporal + + + Logs exported successfully to: %1 + + + + + Failed to export logs + + + + + Export Logs + + TitleBarMenu - + About Sobre - + Exit Exportaciones diff --git a/translations/spark-store_fr.ts b/translations/spark-store_fr.ts index 5c08721..0f1d0c1 100644 --- a/translations/spark-store_fr.ts +++ b/translations/spark-store_fr.ts @@ -24,120 +24,150 @@ Nombre de téléchargements - - + + <html><head/><body><p>Capable to deepin 23</p></body></html> <html><head/><body><p>Capable de la deepin 20</p></body></html> {23<?} - - + + <html><head/><body><p>This app is developed by community user,we give this tag to honor those who contribute to the Linux Ecology</p></body></html> <html><head/><body><p>Cette application a été développée par des utilisateurs de la communauté et nous avons donné ce label à ceux qui ont contribué à l'écologie de Linux</p></body></html> - - + + <html><head/><body><p>Capable to UOS home 20</p></body></html> <html><head/><body><p>Capable de la home UOS 20</p></body></html> - - + + <html><head/><body><p>A deepin-wine2 app. Spark Store will automatically configure the wine kit for you.</p></body></html> <html><head/><body><p>Une application deepin-wine2. Le Spark Store configure automatiquement votre pack de vins.</p></body></html> - - + + <html><head/><body><p>This is a DTK5 app,which means it would have better effect on Deepin Desktop Environment</p></body></html> <html><head/><body><p>C'est une application dtk5, ce qui signifie qu'elle fonctionnera mieux dans un environnement de bureau profond.</p></body></html> - - + + <html><head/><body><p>An Appimage to deb app.</p></body></html> <html><head/><body><p>Appimage pour l'application DEB</p></body></html> - + Share Au total - + APP Feedback App feedback - + Introduction Présentation - + Description Description - + Screen capture Captures d'écran - - - - + + + + Download and Install Télécharger et installer - - + + <html><head/><body><p>Capable to Ubuntu 22.04</p></body></html> <html><head/><body><p>Capable de la Ubuntu 22.04</p></body></html> - - + + <html><head/><body><p>A Wine app.Spark Store will automatically configure the wine kit for you</p></body></html> <html><head/><body><p>L'application wine. Spark Store configure automatiquement le kit Wine pour vous</p></body></html> - - + + <html><head/><body><p>Capable to Debian Stable</p></body></html> - + + + <html><head/><body><p>This app can only be installed natively</p></body></html> + + + + + + <html><head/><body><p>This app will be installed to debian12 ACE</p></body></html> + + + + + + <html><head/><body><p>This app will be installed to debian13 ACE</p></body></html> + + + + + + <html><head/><body><p>This app will be installed to debian SID ACE</p></body></html> + + + + + + <html><head/><body><p>This app will be installed to deepin23 ACE</p></body></html> + + + + Update Moderniser - + Contributor Contributeurs - + Pkgname Nom de l'emballage - + Author Auteur - + Size Taille - + Website Site Web @@ -147,87 +177,87 @@ Cliquez sur Ouvrir - + Developer Mode Disabled Mode développeur désactivé - - - + + + Reinstall Réinstaller - - - + + + Launch - + Upgrade Mise à niveau - - + + Install Installation - + Installing Installation en cours - - - - - + + + + + Warning Avertissement - + The current application does not support or tested on deepin, there may be problems - + The current application does not support or tested on UOS, there may be problems - + The current application does not support or tested on Ubuntu, there may be problems - + The current application does not support or tested on Debian, there may be problems - + The current application does not support or tested on current platform, there may be problems - - + + Spark Store Le Spark store - + Uninstall succeeded Désinstallation réussie - + The URL has been copied to the clipboard L'URL a été copiée dans le presse - papiers @@ -248,12 +278,12 @@ DAboutDialog - + Version: %1 Version: %1 - + %1 is released under %2 %1 publié sous %2 @@ -460,33 +490,33 @@ Mise à niveau app - + Submit App Soumettre une application - + Submit App with client(Recommanded) Soumettre une demande au client (recommandé) - + Settings Paramètres - + APP Upgrade and Install Settings Paramètres de mise à niveau et d'installation de l'app - - + + Spark Store Le Spark store - + Search or enter spk:// Rechercher ou entrer SPK / @@ -494,19 +524,19 @@ QObject + - - + Spark Store Le Spark store - - <span style=' font-size:10pt;font-weight:60;'>An appstore powered by community</span><br/><a href='https://www.spark-app.store/'>https://www.spark-app.store</a><br/><span style=' font-size:12pt;'>Spark developers</span> - <span style=' font-size:10pt;font-weight:60;'>An appstore powered by community</span><br/><a href='https://www.spark-app.store/'>https://www.spark-app.store</a><br/><span style=' font-size:12pt;'>Spark developers</span> + + <span style=' font-size:10pt;font-weight:60;'>An appstore powered by community</span><br/><span style=' font-size:10pt;font-weight:60;'>Sparky is our mascot, designed by <a href='https://tai3.cn/'>Tyson Tan</a></span><br/> + - + Spark Project Le projet Spark @@ -516,7 +546,7 @@ Télécharger la Liste - + Show MainWindow Afficher la fenêtre principale @@ -609,40 +639,85 @@ Effacer le cache Web - + + Log + + + + + Export Logs:/tmp/spark-store + + + + + Export + + + + + Disable Safe Mode + + + + + Disable the webEngine sandbox feature. + + + + + Disable + + + + About us À propos de nous - + <html><head/><body><p>Our services and software are free for individuals and non-profit organizations to use, communicate and learn, but you must comply with local laws and regulations in the process of use, otherwise any problems have nothing to do with us. </p><p>We don't make a profit from the Community version store, we rely on donations from the community for most of our operating expenses, and we appreciate that this allows us to spend less energy worrying about money. However, in order to better provide continuous service, Spark is only free for individual users to open the service warehouse, if you or your organization needs to provide commercial services or your organization is a for-profit organization, please contact us to obtain commercial authorization. </p><p>When using the Software, users or organizations are strictly forbidden to engage in any form of malicious behavior, including but not limited to malicious attacks, abuse, destruction, bulk crawling of the software warehouse, etc. The definition of malicious behavior is judged by the Spark community, and violators will be held legally responsible. Spark Community reserves the right to distribute the software packages it produces. </p><p>Any person or organization is prohibited from using the Spark Community software package for commercial purposes or redistributing it without the express authorization of the Spark Community. This clause is intended to ensure the spirit of open source while safeguarding the intellectual property rights of the Spark community. In addition to the above, if you use the Spark Store main program or part of its code, you are subject to all other terms and requirements of the GPL v3.</p><p>If any part of the store infringes your rights, please tell us <a href="mailto:jifengshenmo@outlook.com"><span style=" text-decoration: underline; color:#0082fa;">jifengshenmo@outlook.com</span></a> we will remove the infringing content as soon as possible. </p><p>If you'd like to get involved with us too, whether you're involved in development, design, pitching or submitting work, we welcome you to join us. </p><p><span style=" text-decoration: underline; color:#0000ff;"><br/></span>Our contact method can be found at <a href="https://blog.shenmo.tech/post/%E6%95%85%E9%9A%9C%E5%85%AC%E5%91%8A/"><span style=" text-decoration: underline; color:#0082fa;">Here</span></a></p></body></html> - + Updating, please wait... Mise à jour en cours, veuillez patienter... - + Spark Store Le Spark store - + Temporary cache was cleaned Cache temporaire nettoyé + + + Logs exported successfully to: %1 + + + + + Failed to export logs + + + + + Export Logs + + TitleBarMenu - + About À propos - + Exit Exportations diff --git a/translations/spark-store_zh_CN.ts b/translations/spark-store_zh_CN.ts index fae7ea2..e1f59f6 100644 --- a/translations/spark-store_zh_CN.ts +++ b/translations/spark-store_zh_CN.ts @@ -24,120 +24,150 @@ 下载量 - - + + <html><head/><body><p>Capable to deepin 23</p></body></html> <html><head/><body><p>支持deepin 20</p></body></html> {23<?} - - + + <html><head/><body><p>This app is developed by community user,we give this tag to honor those who contribute to the Linux Ecology</p></body></html> <html><head/><body><p>这款应用是社区开发者开发的，我们为社区开发者颁发这款勋章以表彰他们对Linux生态的贡献</p></body></html> - - + + <html><head/><body><p>Capable to UOS home 20</p></body></html> <html><head/><body><p>支持UOS家庭版 20</p></body></html> - - + + <html><head/><body><p>A deepin-wine2 app. Spark Store will automatically configure the wine kit for you.</p></body></html> 这是一款 deepin-wine2 应用。星火商店会为你自动配置wine环境 - - + + <html><head/><body><p>This is a DTK5 app,which means it would have better effect on Deepin Desktop Environment</p></body></html> <html><head/><body><p>这是一款DTK5应用，请使用深度桌面环境来获得最完美的体验</p></body></html> - - + + <html><head/><body><p>An Appimage to deb app.</p></body></html> <html><head/><body><p>这是一款Appimage转制应用.</p></body></html> - + Share Spk分享链接 - + APP Feedback 应用反馈 - + Description 描述 - + Screen capture 屏幕截图 - - - - + + + + Download and Install 下载并安装 - - + + <html><head/><body><p>Capable to Ubuntu 22.04</p></body></html> <html><head/><body><p>支持Ubuntu 22.04</p></body></html> - - + + <html><head/><body><p>A Wine app.Spark Store will automatically configure the wine kit for you</p></body></html> 这是一款 Wine 应用。星火商店会为你自动配置wine环境 - - + + <html><head/><body><p>Capable to Debian Stable</p></body></html> <html><head/><body><p>支持Debian Stable</p></body></html> - + + + <html><head/><body><p>This app can only be installed natively</p></body></html> + + + + + + <html><head/><body><p>This app will be installed to debian12 ACE</p></body></html> + + + + + + <html><head/><body><p>This app will be installed to debian13 ACE</p></body></html> + + + + + + <html><head/><body><p>This app will be installed to debian SID ACE</p></body></html> + + + + + + <html><head/><body><p>This app will be installed to deepin23 ACE</p></body></html> + + + + Introduction 介绍 - + Update 更新时间 - + Contributor 投稿用户 - + Pkgname 软件包名 - + Author 软件作者 - + Size 软件大小 - + Website 软件官网 @@ -147,87 +177,87 @@ 点击跳转 - + Developer Mode Disabled 开发者模式未开启 - - - + + + Reinstall 重新安装 - - - + + + Launch 启动应用 - + Upgrade 升级 - - + + Install 安装 - + Installing 正在安装 - - - - - + + + + + Warning 警告 - + The current application does not support or tested on deepin, there may be problems 当前应用不支持或未在deepin上测试过，安装后可能会出现问题 - + The current application does not support or tested on UOS, there may be problems 当前应用不支持或未在UOS上测试过，安装后可能会出现问题 - + The current application does not support or tested on Ubuntu, there may be problems 当前应用不支持或未在Ubuntu上测试过，安装后可能会出现问题 - + The current application does not support or tested on Debian, there may be problems 当前应用不支持或未在Debian上测试过，安装后可能会出现问题 - + The current application does not support or tested on current platform, there may be problems 当前应用不支持或未在您的平台上测试过，安装后可能会出现问题 - - + + Spark Store 星火应用商店 - + Uninstall succeeded 卸载成功 - + The URL has been copied to the clipboard 链接已复制到剪贴板 @@ -248,12 +278,12 @@ DAboutDialog - + Version: %1 版本：%1 - + %1 is released under %2 %1遵循%2协议发布 @@ -460,33 +490,33 @@ 更新 - + Submit App 投递应用 - + Submit App with client(Recommanded) 使用本地投稿器投递应用（推荐） - + Settings 设置 - + APP Upgrade and Install Settings 应用更新和安装设置 - - + + Spark Store 星火应用商店 - + Search or enter spk:// 搜索或打开链接 @@ -494,19 +524,19 @@ QObject + - - + Spark Store 星火应用商店 - - <span style=' font-size:10pt;font-weight:60;'>An appstore powered by community</span><br/><a href='https://www.spark-app.store/'>https://www.spark-app.store</a><br/><span style=' font-size:12pt;'>Spark developers</span> - <span style=' font-size:10pt;font-weight:60;'>一款由社区提供的应用商店</span><br/><a href='https://www.spark-app.store/'>https://www.spark-app.store</a><br/><span style=' font-size:12pt;'>星火计划开发者</span> + + <span style=' font-size:10pt;font-weight:60;'>An appstore powered by community</span><br/><span style=' font-size:10pt;font-weight:60;'>Sparky is our mascot, designed by <a href='https://tai3.cn/'>Tyson Tan</a></span><br/> + - + Spark Project 星火计划 @@ -516,7 +546,7 @@ 下载列表 - + Show MainWindow 显示主窗口 @@ -609,40 +639,85 @@ 清理网页缓存 - + + Log + + + + + Export Logs:/tmp/spark-store + + + + + Export + + + + + Disable Safe Mode + + + + + Disable the webEngine sandbox feature. + + + + + Disable + + + + About us 关于我们 - + <html><head/><body><p>Our services and software are free for individuals and non-profit organizations to use, communicate and learn, but you must comply with local laws and regulations in the process of use, otherwise any problems have nothing to do with us. </p><p>We don't make a profit from the Community version store, we rely on donations from the community for most of our operating expenses, and we appreciate that this allows us to spend less energy worrying about money. However, in order to better provide continuous service, Spark is only free for individual users to open the service warehouse, if you or your organization needs to provide commercial services or your organization is a for-profit organization, please contact us to obtain commercial authorization. </p><p>When using the Software, users or organizations are strictly forbidden to engage in any form of malicious behavior, including but not limited to malicious attacks, abuse, destruction, bulk crawling of the software warehouse, etc. The definition of malicious behavior is judged by the Spark community, and violators will be held legally responsible. Spark Community reserves the right to distribute the software packages it produces. </p><p>Any person or organization is prohibited from using the Spark Community software package for commercial purposes or redistributing it without the express authorization of the Spark Community. This clause is intended to ensure the spirit of open source while safeguarding the intellectual property rights of the Spark community. In addition to the above, if you use the Spark Store main program or part of its code, you are subject to all other terms and requirements of the GPL v3.</p><p>If any part of the store infringes your rights, please tell us <a href="mailto:jifengshenmo@outlook.com"><span style=" text-decoration: underline; color:#0082fa;">jifengshenmo@outlook.com</span></a> we will remove the infringing content as soon as possible. </p><p>If you'd like to get involved with us too, whether you're involved in development, design, pitching or submitting work, we welcome you to join us. </p><p><span style=" text-decoration: underline; color:#0000ff;"><br/></span>Our contact method can be found at <a href="https://blog.shenmo.tech/post/%E6%95%85%E9%9A%9C%E5%85%AC%E5%91%8A/"><span style=" text-decoration: underline; color:#0082fa;">Here</span></a></p></body></html> <html><head/><body><p>我们的服务和软件免费供个人和非营利组织使用、交流和学习，但您在使用过程中必须遵守当地的法律法规，否则出现的任何问题与我们无关。</p><p>我们不从社区版本商店中获利，我们的大部分运营费用依靠社区的捐赠，我们很感激这让我们可以花更少的精力担心钱。但是，为了更好地提供持续的服务，Spark只对个人用户免费开放服务仓库，如果您或您的组织需要提供商业服务或者您的组织是营利性组织，请联系我们获取商业授权。</p><p>严禁用户或组织在使用本软件时从事任何形式的恶意行为，包括但不限于恶意攻击、滥用、破坏、批量抓取软件仓库等。恶意行为的定义由Spark社区判断，违规者将承担法律责任。Spark Community保留发布其生成的软件包的权利。</p><p>未经Spark Community明确授权，禁止任何个人或组织将Spark Community软件包用于商业目的或重新分发。该条款旨在确保开源精神，同时保护Spark社区的知识产权。除此之外，如果您使用Spark Store主程序或其部分代码，则必须遵守GPL v3的所有其他条款和要求。<span style=" font - family:宋体;" <span style=" font - family:宋体;color:#0082fa;">jifengshenmo@outlook.com</span></a>我们会尽快删除侵权内容。</p><p>如果你也想加入我们，无论你是参与开发、设计、推销还是提交作品，我们都欢迎你加入我们。<br/></span>我们的联系方法可以在<a href="https://blog.shenmo.tech/post/%E6%95%85%E9%9A%9C%E5%85%AC%E5%91%8A/"><span style=" text-decoration: underline; color:#0082fa;">找到</span></a></p></body></html> - + Updating, please wait... 正在更新，请稍候…… - + Spark Store 星火应用商店 - + Temporary cache was cleaned 缓存目录已清空 + + + Logs exported successfully to: %1 + + + + + Failed to export logs + + + + + Export Logs + + TitleBarMenu - + About 关于 - + Exit 退出 diff --git a/translations/spark-store_zh_TW.ts b/translations/spark-store_zh_TW.ts index 6d84644..9bf2712 100644 --- a/translations/spark-store_zh_TW.ts +++ b/translations/spark-store_zh_TW.ts @@ -24,120 +24,150 @@ 下載次數 - - + + <html><head/><body><p>Capable to deepin 23</p></body></html> <html><head/><body><p>支持deepin 20</p></body></html> {23<?} - - + + <html><head/><body><p>This app is developed by community user,we give this tag to honor those who contribute to the Linux Ecology</p></body></html> <html><head/><body><p>这款应用是社区开发者开发的，我们为社区开发者颁发这款勋章以表彰他们对Linux生态的贡献</p></body></html> - - + + <html><head/><body><p>Capable to UOS home 20</p></body></html> <html><head/><body><p>支持UOS家庭版 20</p></body></html> - - + + <html><head/><body><p>A deepin-wine2 app. Spark Store will automatically configure the wine kit for you.</p></body></html> 这是一款 deepin-wine2 应用。星火商店会为你自动配置wine环境 - - + + <html><head/><body><p>This is a DTK5 app,which means it would have better effect on Deepin Desktop Environment</p></body></html> <html><head/><body><p>这是一款DTK5应用，请使用深度桌面环境来获得最完美的体验</p></body></html> - - + + <html><head/><body><p>An Appimage to deb app.</p></body></html> <html><head/><body><p>这是一款Appimage转制应用.</p></body></html> - + Share Spk共享链接 - + APP Feedback 軟件錯誤回報 - + Description 軟體詳細資料 - + Screen capture 軟體演示 - - - - + + + + Download and Install 下載並安裝 - - + + <html><head/><body><p>Capable to Ubuntu 22.04</p></body></html> <html><head/><body><p>支持Ubuntu 22.04</p></body></html> - - + + <html><head/><body><p>A Wine app.Spark Store will automatically configure the wine kit for you</p></body></html> 这是一款 Wine 应用。星火商店会为你自动配置wine环境 - - + + <html><head/><body><p>Capable to Debian Stable</p></body></html> - + + + <html><head/><body><p>This app can only be installed natively</p></body></html> + + + + + + <html><head/><body><p>This app will be installed to debian12 ACE</p></body></html> + + + + + + <html><head/><body><p>This app will be installed to debian13 ACE</p></body></html> + + + + + + <html><head/><body><p>This app will be installed to debian SID ACE</p></body></html> + + + + + + <html><head/><body><p>This app will be installed to deepin23 ACE</p></body></html> + + + + Introduction 軟體介紹 - + Update 更新时间 - + Contributor 投稿用户 - + Pkgname 软件包名 - + Author 软件作者 - + Size 软件大小 - + Website 软件官网 @@ -147,87 +177,87 @@ 点击跳转 - + Developer Mode Disabled 开发者模式未开启 - - - + + + Reinstall 重新安裝 - - - + + + Launch - + Upgrade 升级 - - + + Install 安装 - + Installing 正在安装 - - - - - + + + + + Warning - + The current application does not support or tested on deepin, there may be problems - + The current application does not support or tested on UOS, there may be problems - + The current application does not support or tested on Ubuntu, there may be problems - + The current application does not support or tested on Debian, there may be problems - + The current application does not support or tested on current platform, there may be problems - - + + Spark Store 星火应用商店 - + Uninstall succeeded 卸载成功 - + The URL has been copied to the clipboard 链接已复制到剪贴板 @@ -248,12 +278,12 @@ DAboutDialog - + Version: %1 版本：%1 - + %1 is released under %2 %1遵循%2协议发布 @@ -460,33 +490,33 @@ 軟體更新 - + Submit App 上傳軟體 - + Submit App with client(Recommanded) 從客戶端上傳軟體(推薦的) - + Settings 設定 - + APP Upgrade and Install Settings 軟體升級 和 安裝設定 - - + + Spark Store 星火应用商店 - + Search or enter spk:// 搜索或打开链接 @@ -494,19 +524,19 @@ QObject + - - + Spark Store 星火应用商店 - - <span style=' font-size:10pt;font-weight:60;'>An appstore powered by community</span><br/><a href='https://www.spark-app.store/'>https://www.spark-app.store</a><br/><span style=' font-size:12pt;'>Spark developers</span> - <span style=' font-size:10pt;font-weight:60;'>一款由社区提供的应用商店</span><br/><a href='https://www.spark-app.store/'>https://www.spark-app.store</a><br/><span style=' font-size:12pt;'>星火计划开发者</span> + + <span style=' font-size:10pt;font-weight:60;'>An appstore powered by community</span><br/><span style=' font-size:10pt;font-weight:60;'>Sparky is our mascot, designed by <a href='https://tai3.cn/'>Tyson Tan</a></span><br/> + - + Spark Project 星火计划 @@ -516,7 +546,7 @@ 下载列表 - + Show MainWindow 显示主窗口 @@ -609,40 +639,85 @@ 清理网页缓存 - + + Log + + + + + Export Logs:/tmp/spark-store + + + + + Export + + + + + Disable Safe Mode + + + + + Disable the webEngine sandbox feature. + + + + + Disable + + + + About us 关于我们 - + <html><head/><body><p>Our services and software are free for individuals and non-profit organizations to use, communicate and learn, but you must comply with local laws and regulations in the process of use, otherwise any problems have nothing to do with us. </p><p>We don't make a profit from the Community version store, we rely on donations from the community for most of our operating expenses, and we appreciate that this allows us to spend less energy worrying about money. However, in order to better provide continuous service, Spark is only free for individual users to open the service warehouse, if you or your organization needs to provide commercial services or your organization is a for-profit organization, please contact us to obtain commercial authorization. </p><p>When using the Software, users or organizations are strictly forbidden to engage in any form of malicious behavior, including but not limited to malicious attacks, abuse, destruction, bulk crawling of the software warehouse, etc. The definition of malicious behavior is judged by the Spark community, and violators will be held legally responsible. Spark Community reserves the right to distribute the software packages it produces. </p><p>Any person or organization is prohibited from using the Spark Community software package for commercial purposes or redistributing it without the express authorization of the Spark Community. This clause is intended to ensure the spirit of open source while safeguarding the intellectual property rights of the Spark community. In addition to the above, if you use the Spark Store main program or part of its code, you are subject to all other terms and requirements of the GPL v3.</p><p>If any part of the store infringes your rights, please tell us <a href="mailto:jifengshenmo@outlook.com"><span style=" text-decoration: underline; color:#0082fa;">jifengshenmo@outlook.com</span></a> we will remove the infringing content as soon as possible. </p><p>If you'd like to get involved with us too, whether you're involved in development, design, pitching or submitting work, we welcome you to join us. </p><p><span style=" text-decoration: underline; color:#0000ff;"><br/></span>Our contact method can be found at <a href="https://blog.shenmo.tech/post/%E6%95%85%E9%9A%9C%E5%85%AC%E5%91%8A/"><span style=" text-decoration: underline; color:#0082fa;">Here</span></a></p></body></html> <html><head/><body><p>我们的服务和软件免费供个人和非营利组织使用、交流和学习，但您在使用过程中必须遵守当地的法律法规，否则出现的任何问题与我们无关。</p><p>我们不从社区版本商店中获利，我们的大部分运营费用依靠社区的捐赠，我们很感激这让我们可以花更少的精力担心钱。但是，为了更好地提供持续的服务，Spark只对个人用户免费开放服务仓库，如果您或您的组织需要提供商业服务或者您的组织是营利性组织，请联系我们获取商业授权。</p><p>严禁用户或组织在使用本软件时从事任何形式的恶意行为，包括但不限于恶意攻击、滥用、破坏、批量抓取软件仓库等。恶意行为的定义由Spark社区判断，违规者将承担法律责任。Spark Community保留发布其生成的软件包的权利。</p><p>未经Spark Community明确授权，禁止任何个人或组织将Spark Community软件包用于商业目的或重新分发。该条款旨在确保开源精神，同时保护Spark社区的知识产权。除此之外，如果您使用Spark Store主程序或其部分代码，则必须遵守GPL v3的所有其他条款和要求。<span style=" font - family:宋体;" <span style=" font - family:宋体;color:#0082fa;">jifengshenmo@outlook.com</span></a>我们会尽快删除侵权内容。</p><p>如果你也想加入我们，无论你是参与开发、设计、推销还是提交作品，我们都欢迎你加入我们。<br/></span>我们的联系方法可以在<a href="https://blog.shenmo.tech/post/%E6%95%85%E9%9A%9C%E5%85%AC%E5%91%8A/"><span style=" text-decoration: underline; color:#0082fa;">找到</span></a></p></body></html> - + Updating, please wait... 正在更新，请稍候…… - + Spark Store 星火应用商店 - + Temporary cache was cleaned 缓存目录已清空 + + + Logs exported successfully to: %1 + + + + + Failed to export logs + + + + + Export Logs + + TitleBarMenu - + About 关于 - + Exit 退出