4.7.0

Signed-off-by: shenmo <jifengshenmo@outlook.com>

.gitee/callback.py

@@ -7,7 +7,7 @@ import json
 sha = os.getenv("GIT_COMMIT")
 # sha = '48fed26c51a8c42554e45f72f43e49703e04c97f'
 #get sha from environment 
-url = "https://gitee.com/api/v5/repos/deepin-community-store/spark-store/commits/{}/comments".format(sha)
+url = "https://gitee.com/api/v5/repos/spark-store-project/spark-store/commits/{}/comments".format(sha)
 
 token = os.getenv("gitee_token")
 

.github/workflows/program-builder.yml

@@ -0,0 +1,13 @@
+name: Building Program
+run-name: Building ${{ GITHUB.REPOSITORY }}
+
+on:
+  workflow_dispatch:
+  push:
+    tags:
+      - "*"
+
+jobs:
+  call:
+    uses: GXDE-OS/GXDE/.github/workflows/building-deb.yml@master
+    secrets: inherit

.workflow/dtk-build-release-tag-20220425.yml

@@ -18,22 +18,28 @@ stages:
         name: execute_by_docker
         displayName: 基于镜像的DTK构建
         certificate: ''
-        image: docker.io/debian:buster
+        image: docker.jianmuhub.com/library/debian:buster
         command:
           - sed -i 's/deb.debian.org/mirrors.ustc.edu.cn/g' /etc/apt/sources.list
           - '# 换源'
           - apt update
           - export DEBIAN_FRONTEND=noninteractive
-          - echo "安装git devscripts equivs curl..."
-          - 'apt install git devscripts equivs curl -y '
+          - echo "安装依赖..."
+          - 'apt install libgsettings-qt-dev -y '
+          - 'apt install debhelper git curl fakeroot qtbase5-dev zlib1g-dev qt5-default  -y '
           - git clone https://gitlink.org.cn/shenmo7192/dtk-old-bundle.git
           - cd dtk-old-bundle
           - apt install ./*.deb -y
           - cd ..
           - rm -rf dtk-old-bundle
           - ''
-          - 'mk-build-deps --install --tool "apt-get -o Debug::pkgProblemResolver=yes  -y" '
-          - dpkg-buildpackage -j2 -b -us -uc
+          - '#mk-build-deps --install --tool "apt-get -o Debug::pkgProblemResolver=yes  -y" '
+          - apt build-dep . -y
+          - strip --remove-section=.note.ABI-tag /usr/lib/x86_64-linux-gnu/libQt5Core.so.5
+          - uname -a
+          - sed -i 's/dh \$@ --parallel/dh \$@/' debian/rules
+          - '# Gitee的配置太低了'
+          - dpkg-buildpackage  -b -us -uc
           - cd ..
           - ls -all
           - pwd

.workflow/pipeline-dtk-build-aarch64.yml

@@ -34,7 +34,7 @@ stages:
           - tar -xf DEBIANARM.tar.xz
           - mkdir -p DEBIAN/root/build-spark
           - mv ../spark-store-git DEBIAN/root/build-spark/spark-store
-          - wget https://gitee.com/deepin-community-store/repo_auto_update_script/raw/master/spark-build-aarch64.sh && mv spark-build-aarch64.sh DEBIAN/root
+          - wget https://gitee.com/spark-store-project/repo_auto_update_script/raw/master/spark-build-aarch64.sh && mv spark-build-aarch64.sh DEBIAN/root
           - mv /usr/bin/qemu-aarch64-static DEBIAN/
           - chroot DEBIAN /qemu-aarch64-static /bin/bash /root/spark-build-aarch64.sh
           - ''

DOCS/code-analyze.md

@@ -1,328 +0,0 @@
-
-#### 说明
-
-当前服务器线路列表（项目中包含）：
-
-```
-https://d.store.deepinos.org.cn/
-https://store.deepinos.org.cn/
-```
-
-
-
-
-
-
-# 星火应用商店文档
-
-# 目录结构
-几个目录结构
-```
-/
-/icons 图标文件夹       
-/tags 首页图标      
-/tras 多语言翻译        
-```
-
-主要的文件分析
-```js
-spark-store.pro Qt工程配置文件
-ssinstall 调用包安装器的脚本
-icons.qrc 图标资源文件  
-main.cpp 入口文件
-widget.h widget.cpp widget.ui 主要窗口控件
-downloadlist.h downloadlist.cpp downloadlist.ui 单个软件的下载安装展示控件      
-progressload.h progressload.cpp 网页加载显示？ 得在deepin上编译运行才能搞清楚   
-workerthreads.h workerthreads.cpp 应用信息加载线程      
-image_show.h image_show.cpp 应用页面截图预览控件    
-big_image.h big_image.cpp 大图查看控件      
-```
-
-# 使用的开源库及第三方工具
-* GDebi 一个 Ubuntu 软件中心的轻量级替代品 https://linux.cn/article-4982-1.html
-* libnotify 系统通知 https://developer.gnome.org/libnotify/unstable/
-
-
-# 源码分析
-## 应用的组成部分
-左侧应用分类菜单
-主窗口的下拉菜单
-应用列表页面
-应用详情页面
-应用首页，有几个链接跳转        
-商店设置页面
-下载列表页面    
-
-## 应用初始化，及主控件加载
-初始化 `DApplication` 进入事件循环。        
-设置关于我们弹窗 `DAboutDialog`。       
-主控件 Widget 根据不同屏幕大小自适应。  
-首页打开webview页面，如果传入了`spk://`参数，会打开应用详情页。 
-```cpp
-// main.cpp
-QString arg1=argv[1];
-if(arg1.left(6)=="spk://"){
-    w.openUrl(QUrl(argv[1]));
-}
-
-// widget.cpp
-void Widget::openUrl(QUrl u)
-{
-    QString app=serverUrl + "store"+u.path()+"/app.json";
-    ui->webEngineView->setUrl(app); // 会触发 webEngineView 的
-}
-
-```
-## Tags处理方式
-
-**Tags处理方式**
-```cpp
-// widget.cpp
-QString tags=json["Tags"].toString(); //Read the Tags
-        QStringList tagList=tags.split(";");
-        for (int i=0;i<tagList.size();i++) {
-            if(tagList[i]=="community")
-                ui->tag_community->show();//Tags icon shows like this
-            if(tagList[i]=="ubuntu")
-                ui->tag_ubuntu->show();
-            if(tagList[i]=="deepin")
-                ui->tag_deepin->show();
-            if(tagList[i]=="uos")
-                ui->tag_uos->show();
-            if(tagList[i]=="dtk5")
-                ui->tag_dtk5->show();
-            if(tagList[i]=="dwine2")
-                ui->tag_dwine2->show();
-            if(tagList[i]=="dwine5")
-                ui->tag_dwine5->show();
-            if(tagList[i]=="a2d")
-                ui->tag_a2d->show();
-        }
-```
-
-**Widget 初始化**
-```cpp
-void Widget::initConfig()
-{
-    ...
-    // 读取服务器URL并初始化菜单项的链接
-    QSettings readConfig(QDir::homePath()+"/.config/spark-store/config.ini",QSettings::IniFormat);
-    if(readConfig.value("server/choose").toString()!=""){
-        ui->comboBox_server->setCurrentText(readConfig.value("server/choose").toString());
-        appinfoLoadThread.setServer(serverUrl=readConfig.value("server/choose").toString());
-    }else {
-        appinfoLoadThread.setServer(serverUrl="http://sucdn.jerrywang.top/");  // 默认URL
-    }
-    configCanSave=true;   //　防止触发保存配置信号
-    menuUrl[0]=serverUrl + "store/#/"; // 首页
-    // 下面是各个应用分类页面，直接加载的webview的
-    // 每个连接对应一个左侧的菜单项，在构造函数用连接到 chooseLeftMenu 槽函数
-    menuUrl[1]=serverUrl + "store/#/network";
-    ...
-    menuUrl[12]=serverUrl + "store/#/others";
-    ...
-    ui->webfoot->hide();
-
-    //初始化首页
-    ui->webEngineView->setUrl(menuUrl[0]);
-}
-/**
- * 菜单切换逻辑
- * 
- */ 
-void Widget::chooseLeftMenu(int index)
-{
-    nowMenu=index;
-    updateUI();
-    left_list[index]->setStyleSheet("color:#FFFFFF;background-color:"+main_color.name()+";border-radius:8;border:0px");
-    // index <=12 加载某个分类的应用列表的webviejw
-    // index == 13 加载下载列表页面
-    if(index<=12){
-        if(themeIsDark){
-            darkurl = 夜间模式的URL
-            ui->webEngineView->setUrl(darkurl);
-        }else {
-            ui->webEngineView->setUrl(menuUrl[index]);
-        }
-        ui->stackedWidget->setCurrentIndex(0);
-    }else if (index==13) {
-        ui->stackedWidget->setCurrentIndex(1);
-    }
-}
-```
-
-## 应用下载安装卸载分析
-**应用详情页面加载**
-```cpp
-/**
- * 加载单个应用的信息
- */ 
-void Widget::on_webEngineView_urlChanged(const QUrl &arg1)
-{
-    //分析出服务器中的分类名称
-    ...
-    //如果是app.json就打开详情页
-    if(arg1.path().right(8)=="app.json"){
-        ...
-        // 读取相应的应用信息
-        appinfoLoadThread.requestInterruption();
-        appinfoLoadThread.wait(100);
-        appinfoLoadThread.setUrl(arg1);
-        appinfoLoadThread.start();
-    }
-}
-// 设置详情页的APP信息 
-SpkAppInfoLoaderThread::requestSetAppInformation() -> Widget::sltAppinfoDetails()
-// 设置详情页的APP图标
-SpkAppInfoLoaderThread::finishedIconLoad() -> Widget::sltAppinfoIcon()
-// 设置详情页的APP截图
-SpkAppInfoLoaderThread::finishedScreenshotLoad() -> Widget::sltAppinfoScreenshot()
-
-// 下载APP详情信息线程
-void SpkAppInfoLoaderThread::run()
-{
-    QProcess get_json;
-    get_json.start("curl -o app.json " + targetUrl.toString());
-    QFile app_json("app.json");
-    读取 app.json 里的信息，提取应用名、描述、图标、截图  
-    处理完毕后发射相应的信号    
-}
-```
-
-
-**应用下载**		
-Widget::on_pushButton_download_clicked() 是点击下载的安装方法。     
-最终使用的是 `QNetwrokAccessManager` 进行GET请求获取数据写入文件。             
-```cpp
-void Widget::on_pushButton_download_clicked()
-{
-    if(!isBusy){
-        file = new QFile(fileName);
-        ...
-        nowDownload+=1;
-        startRequest(urList.at(nowDownload-1)); // 进行链接请求
-    }
-}
-void Widget::startRequest(QUrl url)
-{
-    reply = manager->get(QNetworkRequest(url));
-    // 请求响应完成，关闭文件，清理下载队列
-    connect(reply,SIGNAL(finished()),this,SLOT(httpFinished())); 
-    // 接收应用下载数据
-    connect(reply,SIGNAL(readyRead()),this,SLOT(httpReadyRead())); 
-    // 更新应用下载进度
-    connect(reply,SIGNAL(downloadProgress(qint64,qint64)),this,SLOT(updateDataReadProgress(qint64,qint64)));
-}
-```
-
-使用 QSettings 来读取配置，更换服务源
-```cpp
-void Widget::on_comboBox_server_currentIndexChanged(const QString &arg1)
-{
-    appinfoLoadThread.setServer(arg1); // 服务器信息更新
-    if(configCanSave){
-        ui->label_setting1->show();
-        QSettings *setConfig=new QSettings(QDir::homePath()+"/.config/spark-store/config.ini",QSettings::IniFormat);
-        setConfig->setValue("server/choose",arg1);
-    }
-}
-```
-使用 `QProcess` 来调用各种小文件下载、包安装卸载的命令。    
-
-**应用安装**        
-```cpp
-void Widget::httpFinished() // 完成下载
-{
-    ...清理资源
-    download_list[nowDownload-1].readyInstall();
-    download_list[nowDownload-1].free=true;
-    if(nowDownload<allDownload){    // 如果有排队则下载下一个
-        ...队列的下一个下载请求
-    }
-}
-void downloadlist::readyInstall()
-{
-    ...将安装按钮设置为允许点击
-    ui->pushButton_install->setEnabled(true);
-    ui->pushButton_install->show();
-    ui->pushButton_2->hide();
-    Widget::sendNotification(tr("Finished downloading %1, awaiting to install").arg(ui->label->text()), 5000,
-                                    "/tmp/spark-store/icon_"+QString::number(num).toUtf8()+".png");
-}
-void downloadlist::on_pushButton_install_clicked()
-{
-    //弹出菜单
-    menu_install->exec(cursor().pos());
-}
-在 downloadlist 构造函数里将三种安装方式的按钮按条件放入了 menu_install 菜单里  
-用户点击时，downloadlist::install() 方法
-三种安装方式为： gdebi, dpkg, deepin-deb-installer  
-void downloadlist::install(int t)
-{
-    QtConcurrent::run([=](){
-        QProcess installer;
-        installer.start("pkexec gdebi -n /tmp/spark-store/"+ui->label_filename->text().toUtf8());
-        installer.start("pkexec ssinstall /tmp/spark-store/"+ui->label_filename->text().toUtf8());
-        installer.start("deepin-deb-installer /tmp/spark-store/"+ui->label_filename->text().toUtf8());
-    });
-}
-```
-
-**应用卸载**
-```cpp
-void Widget::on_pushButton_uninstall_clicked()
-{
-    QtConcurrent::run([=](){
-        uninstall.start("pkexec apt purge -y "+pkgName);
-    });
-}
-```
-
-**仓库源更新**      
-```cpp
-// 更新源列表
-void Widget::on_pushButton_updateServer_clicked()
-{
-    QtConcurrent::run([=](){
-        ...
-        QFile::remove(QDir::homePath().toUtf8()+"/.config/spark-store/server.list");
-        system("curl -o "+QDir::homePath().toUtf8()+"/.config/spark-store/server.list http://dcstore.shenmo.tech/store/server.list");
-        server.open(QDir::homePath().toUtf8()+"/.config/spark-store/server.list",std::ios::in);
-        ...
-        while (getline(server,lineTmp)) {
-            ui->comboBox_server->addItem(QString::fromStdString(lineTmp));
-        }
-    });
-}
-// 更新星火商店apt源    
-void Widget::on_pushButton_updateApt_clicked()
-{
-    QtConcurrent::run([=](){
-        读取 comboBox_server 的内容，写入 /tmp/spark-store/sparkstore.list 文件
-        创建bash脚本，内容为将 sparkstore.list 移动到  /etc/apt/sources.list.d/ 目录下
-        使用QProcess 执行命令 pkexec update.sh
-    }):
-}
-```
-
-## 发送系统通知     
-```cpp
-#include <libnotify/notify.h>
-
-static NotifyNotification *_notify = nullptr; // 初始化
-notify_init(tr("Spark\\ Store").toLocal8Bit()); // 构造函数初始化
-notify_uninit(); // 析构函数调用 
-
-void Widget::sendNotification(const QString &message, const int msTimeout, const QString &icon)
-{
-    if(_notify == nullptr)
-    {
-        _notify = notify_notification_new(tr("Spark\\ Store").toLocal8Bit(), message.toLocal8Bit(), icon.toLocal8Bit());
-        notify_notification_set_timeout(_notify, msTimeout);
-    }
-    else
-        notify_notification_update(_notify, tr("Spark\\ Store").toLocal8Bit(), message.toLocal8Bit(), icon.toLocal8Bit());
-
-    notify_notification_show(_notify, nullptr);
-}
-```

DOCS/json-api-doc.md

@@ -30,7 +30,7 @@
 `{SOURCE_URL}/{ARCH}/{CATOGARY}/applist.json`
 说明：SOURCE_URL：线路链接，目前推荐 https://cdn.d.store.deepinos.org.cn，你也可以使用其他的星火线路
 ARCH：架构文件夹 x86是store或amd64-store，arm是aarch64-store。特别的，如果你使用非https://cdn.d.store.deepinos.org.cn的线路，你可能会发现amd64-store会返回404，因为不是所有的服务器都支持软连接
-CATOGARY：分类目录。参考 https://gitee.com/deepin-community-store/spark-store/blob/dev/DOCS/spk-doc.md 中 store 直达的对应关系
+CATOGARY：分类目录。参考 https://gitee.com/spark-store-project/spark-store/blob/dev/DOCS/spk-doc.md 中 store 直达的对应关系
 
 例子：https://cdn.d.store.deepinos.org.cn/aarch64-store/tools/applist.json
 

DOCS/内网部署.md

@@ -4,4 +4,4 @@
 
 为方便使用（其实是早期屎山使然），请将仓库放置于 `/home/ftp/spark-store`
 
-仓库管理相关代码请移步 [这里](https://gitee.com/deepin-community-store/repo_auto_update_script)，update.sh请联系 @shenmo 获取
+仓库管理相关代码请移步 [这里](https://gitee.com/spark-store-project/repo_auto_update_script)，update.sh请联系 @shenmo 获取

EULA

@@ -0,0 +1,41 @@
+星火开源软件协议（Spark Opensource LICENSE）
+
+版权所有 (C) 2023 星火社区
+
+根据 GNU 通用公共许可证第三版（GPL v3），本软件是自由软件，您可以修改和再发布它。但是，为了维护原作者的权益并保护社区用户的权益，请遵守以下条款：
+
+1. 对本仓库下的所有文件生效：本许可证适用于本仓库（或项目）下的所有文件。任何使用、修改或再发布本软件的个人或组织都必须遵守本许可证。
+2. 版权声明和许可证文件：您不得移除、隐藏或更改本软件中包含的原作者的版权声明和许可证文件。保留原作者的权益信息对于维护开源软件生态系统至关重要。
+3. 版本标注： 如果您对本软件做出修改并再发布，您必须在醒目位置标注此版本并非星火社区官方提供。这样可以避免误导使用者认为该软件为星火社区官方提供的版本。此软件仅授权用于个人非盈利用途，任何将其用于商业目的或在盈利性组织中使用的行为均需事先获得星火社区的书面许可。
+4. 商标使用：您不得在再发布版本中使用“星火应用商店”、“Spark Store”或星火应用商店的Logo等可能误导使用者此软件由星火社区官方提供的信息。
+5. 服务条款：您使用星火商店软件的行为将被视为您同意星火在不侵犯您隐私的前提下搜集版本、日志等信息，以便于星火社区更好地为您提供服务。
+6. 仓库版权条款：为了更好的提供持续性服务，星火仅对个人用户免费开放服务仓库，如您或您的组织需要提供商业服务或者您的组织为盈利性组织，请联系星火社区获取商业授权。
+7. 禁止恶意行为和批量爬取： 用户或组织在使用本软件时，严禁进行任何形式的恶意行为，包括但不限于恶意攻击、滥用、破坏、批量爬取软件仓库等。恶意行为的定义由星火社区自行判断，违反者将被追究法律责任。
+8. 分发与再分发权利： 星火社区保留对其制作的软件包的分发权利。未经明确授权，禁止任何个人或组织将星火社区软件包用于商业目的或在未获得星火社区许可的情况下进行再分发。此条款旨在确保开源精神的同时，维护星火社区的知识产权。
+9. 商业应用限制：您不得使用本软件的代码开发商业应用，也不得在商业应用中使用本软件的代码，除非获得星火社区和火穗（沈阳）计算机软件开发有限公司的书面许可。
+10. 其他条款：除上述约定外，若您使用了星火商店的主程序或其部分代码，您应遵守 GPL v3 的所有其他条款和要求。若本协议条款的内容与GPL V3中的内容不同的，以本协议条款为准
+11. 其他约定：本许可以简体中文版本为最准确释义
+
+GPLV3许可证的完整文本可以在以下链接找到：https://www.gnu.org/licenses/gpl-3.0.html
+
+---------------------------------------------------------------------------------------------------------------------------------
+
+Spark Opensource LICENSE
+
+Copyright (C) 2023 The Spark Community
+
+This software is free software; you can modify and redistribute it under the terms of the GNU General Public License version 3 (GPL v3). However, to protect the rights of the original authors and the interests of the community users, please adhere to the following terms:
+
+1. Applicability to all files in this repository: This license applies to all files in this repository (or project). Any individuals or organizations that use, modify, or redistribute this software must comply with this license.
+2. Copyright notice and license files: You must not remove, hide, or modify the copyright notice and license files of the original authors included in this software. Preserving the rights information of the original authors is essential for maintaining the open-source software ecosystem.
+3. Version annotation: If you modify and redistribute this software, you must mark in a prominent position that this version is not officially provided by the Spark community. This avoids misleading users into thinking that the software is an official version provided by the Spark community. This software is licensed for personal, non-profit use only, and any use of it for commercial purposes or in for-profit organizations requires the prior written permission of the Spark Community.
+4. Trademark usage: You are not allowed to use terms such as "Spark App Store," "Spark Store," or the logo of Spark App Store in redistributed versions, as they may mislead users into believing that the software is provided by the official Spark community.
+5. Terms of Service: Your use of the software of Spark Store will be deemed as your consent to collect version, log and other information on the premise of not violating your privacy, so as to facilitate the Spark community to provide you with better services.
+6. Warehouse copyright terms: In order to better provide continuous services, 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 Spark community to obtain commercial authorization.
+7. Prohibited malicious behavior and mass crawling: Users or organizations are strictly prohibited to engage in any form of malicious behavior when using the software, including but not limited to malicious attacks, abuse, destruction, and mass crawling of software warehouses. The definition of malicious behavior is judged by the Spark community, and violators will be held legally responsible.
+8. Distribution and redistribution rights: Spark Community reserves the right to distribute the software packages it produces. 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.
+9. Business Application Restriction: You are not permitted to utilize the code of this software for developing commercial applications, nor are you allowed to integrate the code of this software into commercial applications without obtaining written consent from both the Spark Community and Flamescion (Shenyang) Computer Software Development Co., Ltd.
+10. Other Terms: In addition to the above provisions, if you use the main program or any part of the code of Spark Store, you must comply with all other terms and requirements of GPL v3. In case of any inconsistency between the terms of this agreement and those of GPL v3, the terms of this agreement shall prevail.
+11. Additional Agreements: This license shall be interpreted most accurately in its Simplified Chinese version.
+
+You can find the full text of GPLV3 license at: https://www.gnu.org/licenses/gpl-3.0.html

FAQ.md

@@ -8,7 +8,7 @@ The Spark App Store is an application store aimed at Linux users and supports mu
 
 ### Communication and Feedback
 **Q: Where can I join the community group?**  
-**A:** You can click [here](https://www.deepinos.org/) to enter the main communication platform of the Spark Store.  
+**A:** You can click [here](https://bbs.spark-app.store/) to enter the main communication platform of the Spark Store.  
 > ⚠️ If the above link doesn't work, you can also join our QQ groups as an alternative. The group numbers are 872690351 and 865927727. We also offer forums for communication.
 
 #### Differences Between arm64 and amd64
@@ -79,12 +79,12 @@ Linux:
 
 ### Reporting Issues and Removing Apps
 **Q: Some apps are outdated or inactive, and I want them removed**  
-**A:** You can report issues [here](https://gitee.com/deepin-community-store/software_-issue).
+**A:** You can report issues [here](https://gitee.com/spark-store-project/software_-issue).
 
 ---
 
 ### Installing Spark App Store
-If you wish to install the Spark App Store, please visit the [Release page](https://gitee.com/deepin-community-store/spark-store/releases), find the latest version, and choose the package suitable for your current system.
+If you wish to install the Spark App Store, please visit the [Release page](https://gitee.com/spark-store-project/spark-store/releases), find the latest version, and choose the package suitable for your current system.
 
 > ⚠️ Special Note: If you are using Debian10/Debian11 or Ubuntu 20.04, you may need to download additional dependency packages. After downloading, unzip multiple times until you see the software user guide. For operating systems later than Ubuntu 22.04, you do not need to install dependency packages. Just follow the steps above to install the main program directly.
 

FAQ.zh.md

@@ -8,7 +8,7 @@
 
 ### 交流与反馈
 **Q: 在哪进交流群？**  
-**A:** 你可以点击[这里](https://www.deepinos.org/)进入星火商店的主交流平台。  
+**A:** 你可以点击[这里](https://bbs.spark-app.store/)进入星火商店的主交流平台。  
 > ⚠️ 如果上面的链接无法使用，你还可以加入我们的 QQ 群作为备选方案，群号是 872690351 和 865927727。我们还提供论坛作为交流平台。
 
 arm64与amd64的区别
@@ -78,12 +78,12 @@ Linux：
 
 ### 报告问题和应用下架
 **Q: 有些应用已经过时或者失效了，我想让他下架**  
-**A:** 你可以前往 [这里](https://gitee.com/deepin-community-store/software_-issue) 报告问题。
+**A:** 你可以前往 [这里](https://gitee.com/spark-store-project/software_-issue) 报告问题。
 
 ---
 
 ### 安装星火应用商店
-如果你想安装星火应用商店，请打开[Release页面](https://gitee.com/deepin-community-store/spark-store/releases)，找到最新版本，并选择适用于当前系统的安装包下载。
+如果你想安装星火应用商店，请打开[Release页面](https://gitee.com/spark-store-project/spark-store/releases)，找到最新版本，并选择适用于当前系统的安装包下载。
 
 > ⚠️ 特别提示: 如果你在使用 Debian10/Debian11 或 Ubuntu 20.04，你可能额外下载依赖补充包。您需要在下载完依赖包后，解压多次一直到看到内部的软件使用说明，对于 Ubuntu22.04 以后的操作系统版本，您无需安装依赖包，您需要按照上面的操作直接安装本体程序。
 

LICENSE

@@ -1,29 +1,674 @@
-星火开源软件协议（Spark Opensource LICENSE）
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
 
-版权所有 (C) 2023 星火社区
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
 
-根据 GNU 通用公共许可证第三版（GPL v3），本软件是自由软件，您可以修改和再发布它。但是，为了维护原作者的权益并保护社区用户的权益，请遵守以下条款：
+                            Preamble
 
-1. 对本仓库下的所有文件生效：本许可证适用于本仓库（或项目）下的所有文件。任何使用、修改或再发布本软件的个人或组织都必须遵守本许可证。
-2. 版权声明和许可证文件：您不得移除、隐藏或更改本软件中包含的原作者的版权声明和许可证文件。保留原作者的权益信息对于维护开源软件生态系统至关重要。
-3. 版本标注：如果您对本软件做出修改并再发布，您必须在醒目位置标注此版本并非星火社区官方提供。这样可以避免误导使用者认为该软件为星火社区官方提供的版本。
-4. 商标使用：您不得在再发布版本中使用“星火应用商店”、“Spark Store”或星火应用商店的Logo等可能误导使用者此软件由星火社区官方提供的信息。
-5. 其他条款：除上述约定外，您应遵守 GPL v3 的所有其他条款和要求。
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
 
-GPLV3许可证的完整文本可以在以下链接找到：https://www.gnu.org/licenses/gpl-3.0.html
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
 
----------------------------------------------------------------------------------------------------------------------------------
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
 
-Spark Opensource LICENSE
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
 
-Copyright (C) 2023 The Spark Community
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
 
-This software is free software; you can modify and redistribute it under the terms of the GNU General Public License version 3 (GPL v3). However, to protect the rights of the original authors and the interests of the community users, please adhere to the following terms:
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
 
-1. Applicability to all files in this repository: This license applies to all files in this repository (or project). Any individuals or organizations that use, modify, or redistribute this software must comply with this license.
-2. Copyright notice and license files: You must not remove, hide, or modify the copyright notice and license files of the original authors included in this software. Preserving the rights information of the original authors is essential for maintaining the open-source software ecosystem.
-3. Version annotation: If you modify this software and redistribute it, you must prominently annotate that this version is not provided by the Spark community officially. This is to avoid misleading users into believing that the software is provided by the official Spark community.
-4. Trademark usage: You are not allowed to use terms such as "Spark App Store," "Spark Store," or the logo of Spark App Store in redistributed versions, as they may mislead users into believing that the software is provided by the official Spark community.
-5. Additional terms: Apart from the above provisions, you must comply with all other terms and requirements of GPL v3.
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
 
-You can find the full text of GPLV3 license at: https://www.gnu.org/licenses/gpl-3.0.html
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.

LICENSE-GPL3

@@ -1,674 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.

README.md

@@ -1,5 +1,5 @@
 # Spark App Store
-[![star](https://gitee.com/deepin-community-store/spark-store/badge/star.svg?theme=gvp)](https://gitee.com/deepin-community-store/spark-store/stargazers) [![fork](https://gitee.com/deepin-community-store/spark-store/badge/fork.svg?theme=gvp)](https://gitee.com/deepin-community-store/spark-store/members)
+[![star](https://gitee.com/spark-store-project/spark-store/badge/star.svg?theme=gvp)](https://gitee.com/spark-store-project/spark-store/stargazers) [![fork](https://gitee.com/spark-store-project/spark-store/badge/fork.svg?theme=gvp)](https://gitee.com/spark-store-project/spark-store/members)
 
 ## Introduction
 
@@ -15,21 +15,23 @@ To improve this situation, we have launched this app store. We have broadly incl
 
 - **amd64 architecture:** deepin 20 / deepin 23 / Ubuntu 20.04 / Ubuntu 22.04 / UOS Home Edition 20
 - **arm64 architecture:** UOS Professional Edition 1060 / Ubuntu 22.04 / deepin 23
+- **loong64 architecture:** deepin 23
 
 > Special Note: We also support all versions of Ubuntu operating systems higher than Ubuntu 22.04, such as Ubuntu 22.10, 23.04, 23.10, etc.
 
 **Important Notice:** This software does not provide any form of warranty. If you plan to use it on UOS Professional Edition, please make sure to understand and enable Developer Mode. Make sure you have basic troubleshooting capabilities. It should be clear that we have not conducted extensive testing on the UOS operating system. Therefore, using the Spark client may lead to a series of issues like failed system updates, data loss, etc., all risks to be borne by the user.
 
-## Team Collaboration: For detailed documentation related to branch management, please see [this link](https://deepin-community-store.gitee.io/spark-wiki/#/Dev/Spark-Store-Git-Repo).
+## Team Collaboration: For detailed documentation related to branch management, please see [this link](https://wiki.spark-app.store/#/Dev/Spark-Store-Git-Repo).
 
 We warmly welcome you to join our development team. Whether you want to participate in development or submit applications, you can find your place here to jointly promote the development of the Linux application ecosystem.
 
-You can track our Issue handling status in real-time through the following link: [Gitee Issue Board](https://gitee.com/deepin-community-store/spark-store/board).
+You can track our Issue handling status in real-time through the following link: [Issue Board](https://gitee.com/spark-store-project/spark-store/board).
 
-If you have a software package you'd like to submit, please [click here to submit](https://upload.deepinos.org/index).
+If you have a software package you'd like to submit, please [click here to submit](https://upload.deepinos.org.cn/index).
 
 ## Contents
 
+- [Read the copyright](#read-the-copyright)
 - [Determine your system architecture](#determine-your-system-architecture)
 - [System support and installation guide](#system-support-and-installation-guide)
   - [For Deepin / UOS Users](#for-deepin-users)
@@ -40,6 +42,10 @@ If you have a software package you'd like to submit, please [click here to submi
 
 ---
 
+## Read [the copyright](LICENSE)
+
+
+
 ## Determine your system architecture
 
 Before installing any software, you need to know what architecture your computer runs on (such as x86_64/amd64 or aarch64/arm64).
@@ -68,7 +74,7 @@ You will see an output, and that's your system architecture.
 
    > appstore://deepin-home-appstore-client?app_detail_info/spark-store
 
-   To use the latest version, please visit the [Spark App Store Release page](https://gitee.com/deepin-community-store/spark-store/releases) and download the latest version suitable for Deepin. Install to use.
+   To use the latest version, please visit the [Spark App Store Release page](https://gitee.com/spark-store-project/spark-store/releases) and download the latest version suitable for Deepin. Install to use.
 
    Assuming you've downloaded to the `Downloads` folder in your user directory, we recommend you use the APT tool to install:
 
@@ -82,13 +88,13 @@ You will see an output, and that's your system architecture.
 #### For Ubuntu 20.04 Users
 
 1. **Download Dependencies**
-* Please visit the [Spark App Store Dependency Download page](https://spark-app.store/download_dependencies_latest) and download the latest dependency package.
+* Please visit the [Spark App Store Dependency Download page](https://gitee.com/spark-store-project/spark-store-dependencies/releases) and download the latest dependency package.
 * Unzip the dependency package multiple times until you see multiple installation packages ending with `.deb`.
 * Follow the instructions in the dependency package to install all the dependencies at once.
 
 2. **Download and Install**
 
-   Visit the [Spark App Store Release page](https://gitee.com/deepin-community-store/spark-store/releases), download the installation package that matches your computer's architecture, and install it.
+   Visit the [Spark App Store Release page](https://gitee.com/spark-store-project/spark-store/releases), download the installation package that matches your computer's architecture, and install it.
 
    Assuming you've downloaded to the `Downloads` folder in your user directory, we recommend you use the APT tool to install:
 
@@ -103,7 +109,7 @@ You will see an output, and that's your system architecture.
 
 2. **Download and Install**
 
-   Visit the [Spark App Store Release page](https://gitee.com/deepin-community-store/spark-store/releases), download the installation package that matches your computer's architecture, and install it.
+   Visit the [Spark App Store Release page](https://gitee.com/spark-store-project/spark-store/releases), download the installation package that matches your computer's architecture, and install it.
 
    Assuming you've downloaded to the `Downloads` folder in your user directory, we recommend you use the APT tool to install:
 
@@ -117,13 +123,13 @@ You will see an output, and that's your system architecture.
 #### For Debian 11 Users
 
 1. **Download Dependencies**
-* Please visit the [Spark App Store Dependency Download page](https://spark-app.store/download_dependencies_latest) and download the latest dependency package.
+* Please visit the [Spark App Store Dependency Download page](https://gitee.com/spark-store-project/spark-store-dependencies/releases) and download the latest dependency package.
 * Unzip the dependency package multiple times until you see multiple installation packages ending with `.deb`.
 * Follow the instructions in the dependency package to install all the dependencies at once.
 
 2. **Download and Install**
 
-   Please visit the [Spark App Store Release page](https://gitee.com/deepin-community-store/spark-store/releases) and download. Install to use.
+   Please visit the [Spark App Store Release page](https://gitee.com/spark-store-project/spark-store/releases) and download. Install to use.
 
 #### For Debian 12+ Users
 
@@ -131,7 +137,7 @@ You will see an output, and that's your system architecture.
 
 2. **Download and Install**
 
-   Please visit the [Spark App Store Release page](https://gitee.com/deepin-community-store/spark-store/releases), download the installation package that matches your computer's architecture, and install it.
+   Please visit the [Spark App Store Release page](https://gitee.com/spark-store-project/spark-store/releases), download the installation package that matches your computer's architecture, and install it.
 
    Assuming you've downloaded to the `Downloads` folder in your user directory, we recommend you use the APT tool to install:
 
@@ -144,17 +150,18 @@ You will see an output, and that's your system architecture.
 
 ## Frequently Asked Questions (FAQ)
 
-Please refer to the [Spark App Store FAQ and Support Guide](https://gitee.com/deepin-community-store/spark-store/blob/dev/FAQ.md).
+Please refer to the [Spark App Store FAQ and Support Guide](https://gitee.com/spark-store-project/spark-store/blob/dev/FAQ.md).
 
-You can also check the [Chinese version](https://gitee.com/deepin-community-store/spark-store/blob/dev/FAQ.zh.md) here.
+To customly configure aptss, refer to [aptss](https://gitee.com/GXDE-OS/aptss)
 
 ---
 
 ## Contact and Feedback
 
-- If you have any questions or suggestions, please submit them via email or on our [Gitee page](https://gitee.com/deepin-community-store/spark-store/issues).
-- If you want to follow our development progress, you can go to the [Spark App Store Board](https://gitee.com/deepin-community-store/spark-store/board) for more information.
-- Our [Forum](https://www.deepinos.org/)
+- If you have any questions or suggestions, please submit them via email or on our [Issue Page](https://gitee.com/spark-store-project/spark-store/issues).
+- If you want to follow our development progress, you can go to the [Spark App Store Board](https://gitee.com/spark-store-project/spark-store/board) for more information.
+- Our [Forum](https://bbs.spark-app.store/)
 - Our [QQ Group](https://blog.shenmo.tech/post/%E6%95%85%E9%9A%9C%E5%85%AC%E5%91%8A/)
+- For commercial support, please leave your issue~
 
 ---

README.zh.md

@@ -1,5 +1,6 @@
 #  星火应用商店
-[![star](https://gitee.com/deepin-community-store/spark-store/badge/star.svg?theme=gvp)](https://gitee.com/deepin-community-store/spark-store/stargazers)  [![fork](https://gitee.com/deepin-community-store/spark-store/badge/fork.svg?theme=gvp)](https://gitee.com/deepin-community-store/spark-store/members)
+[![star](https://gitee.com/spark-store-project/spark-store/badge/star.svg?theme=gvp)](https://gitee.com/spark-store-project/spark-store/stargazers)  [![fork](https://gitee.com/spark-store-project/spark-store/badge/fork.svg?theme=gvp)](https://gitee.com/spark-store-project/spark-store/members)
+
 
 
 ## 简介
@@ -11,12 +12,13 @@ Linux 应用的数量相对有限，Wine 软件的可获得性也颇为困难。
 
 生态系统的构建并非依赖个体的孤立努力，而需要全社区共同参与。只有当大家的“星火”聚集一处，方可引发“燎原之势”。
 
-为了改善这一现状，我们推出了这个应用商店。我们广泛地收录了各种用户需求的软件包，汇集了高质量的小工具，并主动对 Wine 应用进行了适配，一切都储存在我们的软件库中，以便用户方便地获取。
+为了改善这一现状，我们推出了这个应用商店。我们广泛地收录了各种用户需求的软件包，汇集了高质量的小工具，并主动对 Wine 应用进行了适配，一切都储存在我们的软件库中，使得用户可以方便地获取这些应用。
 
 **当前支持的Linux发行版包括：**
 
 - **amd64架构：** deepin 20 / deepin 23 / Ubuntu 20.04 / Ubuntu 22.04 / UOS家庭版20
 - **arm64架构：** UOS专业版1060 / Ubuntu 22.04 / deepin 23
+- **loong64架构：** deepin 23
 
 > 特别说明：我们还支持所有版本高于Ubuntu 22.04的Ubuntu操作系统，例如Ubuntu 22.10、23.04、23.10等。
 
@@ -24,19 +26,29 @@ Linux 应用的数量相对有限，Wine 软件的可获得性也颇为困难。
 
 
 
-## 关于团队协作：分支管理相关的详细文档可参见 [此链接](https://deepin-community-store.gitee.io/spark-wiki/#/Dev/Spark-Store-Git-Repo)。
+## 关于团队协作
+
+组织仓库链接：
+https://gitee.com/spark-store-project/spark-store
+
+https://gitcode.com/spark-store-project/spark-store 
+
+https://github.com/spark-store-project/spark-store
+
+分支管理相关的详细文档可参见 [此链接](https://wiki.spark-app.store/#/Dev/Spark-Store-Git-Repo)。
 
 我们热忱欢迎您加入我们的开发团队。无论您是想参与开发，还是想提交应用，都能在这里找到属于您的一席之地，共同推动Linux应用生态的发展。
 
-您可以通过以下链接，实时跟踪我们的Issue处理状态：[Gitee Issue看板](https://gitee.com/deepin-community-store/spark-store/board)。
+您可以通过以下链接，实时跟踪我们的Issue处理状态：[Issue看板](https://gitee.com/spark-store-project/spark-store/board)。
 
-若您有软件包想要提交，敬请 [点击此处进行投稿](https://deepin-community-store.gitee.io/spark-wiki/#/Submit/Submit)。
+若您有软件包想要提交，敬请 [点击此处进行投稿](https://wiki.spark-app.store/#/Submit/Submit)。
 
 
 
 
 ## 目录
 
+- [阅读版权声明](#阅读版权声明)
 - [确定你的系统架构](#确定你的系统架构)
 - [系统支持与安装指引](#系统支持与安装指引)
   - [对于 Deepin / UOS 用户](#对于deepin用户)
@@ -47,6 +59,9 @@ Linux 应用的数量相对有限，Wine 软件的可获得性也颇为困难。
 
 ---
 
+## 阅读[版权声明](LICENSE)
+
+
 ## 确定你的系统架构
 
 在安装任何软件之前，你需要知道你的计算机运行的是哪种架构（如x86_64/amd64或aarch64/arm64）。
@@ -78,7 +93,7 @@ Linux 应用的数量相对有限，Wine 软件的可获得性也颇为困难。
     > appstore://deepin-home-appstore-client?app_detail_info/spark-store
 
 
-    若要使用最新版本，请访问[星火应用商店的Release页面](https://gitee.com/deepin-community-store/spark-store/releases)并下载适用于Deepin的最新版本。安装后即可使用。
+    若要使用最新版本，请访问[星火应用商店的Release页面](https://gitee.com/spark-store-project/spark-store/releases)或[Gitcode的Release页面](https://gitcode.com/spark-store-project/spark-store/releases)并下载适用于Deepin的最新版本。安装后即可使用。
 
     假设您下载到用户目录下的 Downloads 文件夹， 我们推荐您使用 APT 工具安装：
 
@@ -92,14 +107,14 @@ Linux 应用的数量相对有限，Wine 软件的可获得性也颇为困难。
 #### 对于 Ubuntu 20.04 用户
 
 1. **下载依赖包**
-* 请访问[星火应用商店依赖包下载页面](https://spark-app.store/download_dependencies_latest)， 下载最新的依赖包。
+* 请访问[星火应用商店依赖包下载页面](https://gitee.com/spark-store-project/spark-store-dependencies/releases)， 下载最新的依赖包。
 * 请多次解压依赖包，直到你可以看到诸多以 deb 结尾的安装包。
 * 依据依赖包内的说明，一次性安装所有的依赖包。
 
 
 2. **下载并安装**
 
-    请访问[星火应用商店的Release页面](https://gitee.com/deepin-community-store/spark-store/releases)，下载和您电脑相同架构的安装包并安装。
+    请访问[星火应用商店的Release页面](https://gitee.com/spark-store-project/spark-store/releases)或[Gitcode的Release页面](https://gitcode.com/spark-store-project/spark-store/releases)，下载和您电脑相同架构的安装包并安装。
 
     假设您下载到用户目录下的 Downloads 文件夹， 我们推荐您使用 APT 工具安装：
 
@@ -114,7 +129,7 @@ Linux 应用的数量相对有限，Wine 软件的可获得性也颇为困难。
 
 2. **下载并安装**
 
-    请访问[星火应用商店的Release页面](https://gitee.com/deepin-community-store/spark-store/releases)，下载和您电脑相同架构的安装包并安装。
+    请访问[星火应用商店的Release页面](https://gitee.com/spark-store-project/spark-store/releases)或[Gitcode的Release页面](https://gitcode.com/spark-store-project/spark-store/releases)，下载和您电脑相同架构的安装包并安装。
 
     假设您下载到用户目录下的 Downloads 文件夹， 我们推荐您使用 APT 工具安装：
 
@@ -128,13 +143,13 @@ Linux 应用的数量相对有限，Wine 软件的可获得性也颇为困难。
 #### 对于 Debian 11 用户
 
 1. **下载依赖包**
-* 请访问[星火应用商店依赖包下载页面](https://spark-app.store/download_dependencies_latest)， 下载最新的依赖包。
+* 请访问[星火应用商店依赖包下载页面](https://gitee.com/spark-store-project/spark-store-dependencies/releases)， 下载最新的依赖包。
 * 请多次解压依赖包，直到你可以看到诸多以 deb 结尾的安装包。
 * 依据依赖包内的说明，一次性安装所有的依赖包。
 
 2. **下载并安装**
 
-    请访问[星火应用商店的Release页面](https://gitee.com/deepin-community-store/spark-store/releases)并下载，安装后即可使用。
+    请访问[星火应用商店的Release页面](https://gitee.com/spark-store-project/spark-store/releases)或[Gitcode的Release页面](https://gitcode.com/spark-store-project/spark-store/releases)并下载，安装后即可使用。
 
 
 #### 对于 Debian 12+ 用户
@@ -144,7 +159,7 @@ Linux 应用的数量相对有限，Wine 软件的可获得性也颇为困难。
 
 2. **下载并安装**
 
-    请访问[星火应用商店的Release页面](https://gitee.com/deepin-community-store/spark-store/releases)，下载和您电脑相同架构的安装包并安装。
+    请访问[星火应用商店的Release页面](https://gitee.com/spark-store-project/spark-store/releases)或[Gitcode的Release页面](https://gitcode.com/spark-store-project/spark-store/releases)，下载和您电脑相同架构的安装包并安装。
 
     假设您下载到用户目录下的 Downloads 文件夹， 我们推荐您使用 APT 工具安装：
 
@@ -156,18 +171,20 @@ Linux 应用的数量相对有限，Wine 软件的可获得性也颇为困难。
 
 ## 常见问题（FAQ）
 
-请参见[星火应用商店FAQ与支持指南](https://gitee.com/deepin-community-store/spark-store/blob/dev/FAQ.md)。
+请参见[星火应用商店FAQ与支持指南](https://gitee.com/spark-store-project/spark-store/blob/dev/FAQ.zh.md)。
+
+自定义配置 aptss config 请参阅 [aptss](https://gitee.com/GXDE-OS/aptss)
+
 
-在这里可以查阅[中文版本](https://gitee.com/deepin-community-store/spark-store/blob/dev/FAQ.zh.md)。
 
 ---
 
 ## 联系与反馈
 
-- 如果您有任何问题或建议，请通过邮件或在[Gitee页面](https://gitee.com/deepin-community-store/spark-store/issues)上提交问题。
-- 如果你想关注我们的开发进度，可以跳转[星火应用商店Board](https://gitee.com/deepin-community-store/spark-store/board)获取更多信息。
-- 我们的[论坛](https://www.deepinos.org/)
-- 我们的[QQ群](https://blog.shenmo.tech/post/%E6%95%85%E9%9A%9C%E5%85%AC%E5%91%8A/)
-
+- 如果您有任何问题或建议，请通过邮件或在[Issue 页面](https://gitee.com/spark-store-project/spark-store/issues)上提交问题。
+- 如果你想关注我们的开发进度，可以跳转[星火应用商店Board](https://gitee.com/spark-store-project/spark-store/board)获取更多信息。
+- 我们的[论坛](https://bbs.spark-app.store/)
+- 我们的QQ群 872690351
+- 商业支持请留言咨询~
 
 ---

debian/changelog

@@ -1,3 +1,200 @@
+spark-store (4.7.0) UNRELEASED; urgency=medium
+
+  * aptss 第二、三阶段加速
+  * 修复部分应用无法启动的问题
+  * 支持使用 ACE deepin23 trixie
+  
+ -- shenmo <shenmo@spark-app.store>  Tue, 24 Sep 2024 11:27:08 +0800
+
+spark-store (4.5.2) UNRELEASED; urgency=medium
+
+  * 支持安装到 ACE Bookworm 
+  
+ -- shenmo <shenmo@spark-app.store>  Tue, 24 Sep 2024 11:27:08 +0800
+ 
+ spark-store (4.5.1) UNRELEASED; urgency=medium
+
+  * 修复 aptss 部分报错
+  * 重新设计了 Tag 区的展示方式
+  * 新增 Fish 补全
+  
+ -- shenmo <shenmo@spark-app.store>  Tue, 24 Sep 2024 11:27:08 +0800
+
+spark-store (4.5.0) UNRELEASED; urgency=medium
+
+  * 支持从商店中直接启动应用
+  * ssinstall 修复安装时不再指定版本号以避免出现问题
+  * aptss支持fish补全
+  * 修复: distrobox下无法正常校验应用hash
+  * aptss 4.5.0
+  * 应用更新新增进度条
+  * 支持识别Debian
+
+ -- shenmo <shenmo@spark-app.store>  Tue, 24 Sep 2024 11:27:08 +0800
+
+spark-store (4.3.3.2) UNRELEASED; urgency=medium
+
+  * 提升升级工具体验，不再反复弹窗
+  * 提升aptss使用体验，汇报目前所在阶段而不是卡住不动
+  * 修复debian sid 无法卸载
+
+ -- shenmo <shenmo@spark-app.store>  Tue, 24 Sep 2024 11:27:08 +0800
+
+spark-store (4.3.3.1) UNRELEASED; urgency=medium
+
+  * 修复点击更新需要输入密码的问题
+  * 修复安装速度下降的问题
+  * 修复闪退问题
+  * 修复错误地展示已安装
+
+ -- shenmo <shenmo@spark-app.store>  Tue, 24 Sep 2024 11:27:08 +0800
+
+spark-store (4.3.2.0) UNRELEASED; urgency=medium
+
+  * 后续更新请从4.3.2.0版本号开始，4.3.2版本仅用于GXDE测试
+  * 支持dummyapps 安装包安装
+  * 支持紧凑模式
+  * 修复部分情况下升级安装失败的问题
+
+ -- shenmo <shenmo@spark-app.store>  Tue, 24 Sep 2024 11:27:08 +0800
+
+spark-store (4.3.2) UNRELEASED; urgency=medium
+
+  * ssinstall支持安装conflict包
+  * 支持紧凑模式
+
+ -- shenmo <shenmo@spark-app.store>  Tue, 24 Sep 2024 11:27:08 +0800
+
+spark-store (4.3.1) UNRELEASED; urgency=medium
+
+  * 修复自提权更新问题
+  * 提升aptss稳定性
+
+ -- shenmo <shenmo@spark-app.store>  Tue, 24 Sep 2024 11:27:08 +0800
+
+spark-store (4.3.0-fix5) stable; urgency=medium
+
+* 支持GXDE,重启空链接清理
+
+ -- shenmo <shenmo@spark-app.store>  Sun, 5 Mar 2022 11:45:14 +0800
+
+
+
+
+spark-store (4.3.0-fix4) stable; urgency=medium
+
+* 修复：安装失败时仍然锁定
+
+ -- shenmo <shenmo@spark-app.store>  Sun, 5 Mar 2022 11:45:14 +0800
+
+
+spark-store (4.3.0-fix3) stable; urgency=medium
+
+* 修复：创建快捷方式失效
+
+ -- shenmo <shenmo@spark-app.store>  Sun, 5 Mar 2022 11:45:14 +0800
+
+
+
+spark-store (4.3.0-fix2) stable; urgency=medium
+
+* aptss配置调整
+
+ -- shenmo <shenmo@spark-app.store>  Sun, 5 Mar 2022 11:45:14 +0800
+
+
+
+spark-store (4.3.0-fix1) stable; urgency=medium
+
+* 上游改为d.spark-app.store
+
+  
+ -- shenmo <shenmo@spark-app.store>  Sun, 5 Mar 2022 11:45:14 +0800
+
+spark-store (4.3) stable; urgency=medium
+
+* 修复客户端不支持301跳转的问题
+* 修复UOS下错误地提示开发者模式未启动
+* 现在会记住上次的窗口大小
+* 删除无用依赖，修复Debian 13依赖问题
+
+  
+ -- shenmo <shenmo@spark-app.store>  Sun, 5 Mar 2022 11:45:14 +0800
+
+spark-store (4.2.14) stable; urgency=medium
+
+
+* 上游改为d.spark-app.store
+
+  
+ -- shenmo <shenmo@spark-app.store>  Sun, 5 Mar 2022 11:45:14 +0800
+spark-store (4.3.0) stable; urgency=medium
+
+* 修复部分客户端启动白屏
+
+  
+ -- shenmo <shenmo@spark-app.store>  Sun, 5 Mar 2022 11:45:14 +0800
+spark-store (4.3) stable; urgency=medium
+
+* 修复客户端不支持301跳转的问题
+* 修复UOS下错误地提示开发者模式未启动
+* 现在会记住上次的窗口大小
+* 删除无用依赖，修复Debian 13依赖问题
+
+  
+ -- shenmo <shenmo@spark-app.store>  Sun, 5 Mar 2022 11:45:14 +0800
+spark-store (4.2.13) stable; urgency=medium
+
+* 未经测试文案修改
+* 龙芯平台并入主线
+* 修复：更新过程中中断无法再次启动更新检查
+* 调整：提高超时时长，适应较差的网络环境
+
+  
+ -- shenmo <shenmo@spark-app.store>  Sun, 5 Mar 2022 11:45:14 +0800
+spark-store (4.2.12.1) stable; urgency=medium
+
+  * 修复：龙芯自动--no-sandbox
+  
+ -- shenmo <shenmo@spark-app.store>  Sun, 5 Mar 2022 11:45:14 +0800
+
+spark-store (4.2.12) stable; urgency=medium
+
+  * 修复：飞腾部分设备上白屏的问题
+  * 修复：下载开始时长时等待（降低链接超时时长）
+  
+ -- shenmo <shenmo@spark-app.store>  Sun, 5 Mar 2022 11:45:14 +0800
+
+spark-store (4.2.11) stable; urgency=medium
+
+  * 修复：判断是否安装状态错误
+  * 修改：部分组件重构提升清晰度
+  * 修复：v23下部分应用图标失效
+  
+  
+ -- shenmo <shenmo@spark-app.store>  Sun, 5 Mar 2022 11:45:14 +0800
+
+
+spark-store (4.2.10) stable; urgency=medium
+
+  * 修复：部分发行版上无法启动自动创建的桌面图标
+  * 修复：发行版统计信息
+  * 修复：Gitee反馈链接错误
+  * 修复：ACE下无法安装,支持ACE下软件更新
+  
+ -- shenmo <shenmo@spark-app.store>  Sun, 5 Mar 2022 11:45:14 +0800
+
+
+spark-store (4.2.9) stable; urgency=medium
+
+  * 修复：软件详情图片排序调整为服务器排序，而不是按加载顺序排序 
+  * 修复: build error on Deepin V23
+  * 修复：容器内无限等待
+  * 新增：高分屏截图支持
+  * 新增：更新界面支持显示软件名称
+  
+ -- shenmo <shenmo@spark-app.store>  Sun, 5 Mar 2022 11:45:14 +0800
+
 spark-store (4.2.8.1) stable; urgency=medium
 
   * 修复：A2D应用释放无效的Desktop到桌面上
@@ -17,7 +214,7 @@ spark-store (4.2.7.3) stable; urgency=medium
 
   * 修复：aptss现在会正确地透传错误码而不是exit 0
   * 修复：下载时如果卡0%(无法下载metalink)，会在超时后报错中断而不是一直傻等
-  * 修复：排队下载时CPU占满单核的bug https://gitee.com/deepin-community-store/spark-store/issues/I7B91V
+  * 修复：排队下载时CPU占满单核的bug https://gitee.com/spark-store-project/spark-store/issues/I7B91V
   * 修复：在终端中打开的icon过大导致无法投稿到UOS
   * 修复：v23下编译出错
   * 薪怎：支持崩溃日志收集系统
@@ -254,7 +451,7 @@ spark-store (4.2.3~test2) stable; urgency=medium
 spark-store (4.2.3~test1) stable; urgency=medium
 
   * 修复：因判断安装状态错误创建多个相同任务的bug
-  * 测试中：尝试修复安装结束的闪退问题 https://gitee.com/deepin-community-store/spark-store/commit/cb093dcc2bb0a193db89aa0ce5f20ea9cc5d56eb
+  * 测试中：尝试修复安装结束的闪退问题 https://gitee.com/spark-store-project/spark-store/commit/cb093dcc2bb0a193db89aa0ce5f20ea9cc5d56eb
   * 修复：Deepin 显示开发者模式未开启
   * 修复：从托盘打开主窗口时透明度动画不流畅
   * 修复：主窗口关闭后，从托盘打开关于窗口会被主窗口遮挡
@@ -336,8 +533,8 @@ spark-store (4.1.2) stable; urgency=medium
   * chore: 去除安装依赖:g++
   * fix: 修复下载列表中进度提示文字显示不完整的问题
   * feat: ssinstall支持从单独文件夹中校验软件包
-  * feat： 支持分单文件夹下载。具体内容参见：https://gitee.com/deepin-community-store/repo_auto_update_script/blob/master/mirror-list-for-apt-fast/sources.list.d/sparkstore.list
-  * info: 非常感谢 @jwyh 对星火商店代码仓库设计了很多标准，参见 https://deepin-community-store.gitee.io/spark-wiki/#/Dev/Spark-Store-Git-Repo?id=%e6%9b%b4%e6%96%b0%e6%97%a5%e5%bf%97%e8%a7%84%e5%88%99 ，不过shenmo是自由的
+  * feat： 支持分单文件夹下载。具体内容参见：https://gitee.com/spark-store-project/repo_auto_update_script/blob/master/mirror-list-for-apt-fast/sources.list.d/sparkstore.list
+  * info: 非常感谢 @jwyh 对星火商店代码仓库设计了很多标准，参见 https://wiki.spark-app.store/#/Dev/Spark-Store-Git-Repo?id=%e6%9b%b4%e6%96%b0%e6%97%a5%e5%bf%97%e8%a7%84%e5%88%99 ，不过shenmo是自由的
 
 
   * chore: 添加 Application 类，继承 DApplication，将 main 函数中设置属性、关于信息等操作移至 Application 构造函数中进行
@@ -356,8 +553,8 @@ spark-store (4.1.2) stable; urgency=medium
 spark-store (4.1.2~test2) stable; urgency=medium
 
   * feat: ssinstall支持从单独文件夹中校验软件包
-  * feat： 支持分单文件夹下载。具体内容参见：https://gitee.com/deepin-community-store/repo_auto_update_script/blob/master/mirror-list-for-apt-fast/sources.list.d/sparkstore.list
-  * info: 非常感谢 @jwyh 对星火商店代码仓库设计了很多标准，参见 https://deepin-community-store.gitee.io/spark-wiki/#/Dev/Spark-Store-Git-Repo ，不过shenmo是自由的
+  * feat： 支持分单文件夹下载。具体内容参见：https://gitee.com/spark-store-project/repo_auto_update_script/blob/master/mirror-list-for-apt-fast/sources.list.d/sparkstore.list
+  * info: 非常感谢 @jwyh 对星火商店代码仓库设计了很多标准，参见 https://wiki.spark-app.store/#/Dev/Spark-Store-Git-Repo ，不过shenmo是自由的
 
  -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
 
@@ -568,7 +765,7 @@ spark-store (3.2.4) stable; urgency=medium
 
 spark-store (3.2.4~test4) stable; urgency=medium
 
-  * 现在在商店启动后点击spk链接仍会正常启动 https://gitee.com/deepin-community-store/spark-store/commit/dd6780d636042bf12d77414e6f1552cc7d1ed24c
+  * 现在在商店启动后点击spk链接仍会正常启动 https://gitee.com/spark-store-project/spark-store/commit/dd6780d636042bf12d77414e6f1552cc7d1ed24c
 
  -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
 
@@ -593,221 +790,5 @@ spark-store (3.2.4~test2) stable; urgency=medium
 spark-store (3.2.4~test1) stable; urgency=medium
 
   * 客户端更新时不关闭免密码登录
-  * UOS合并正常aptss中
-
- -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
-
-
-spark-store (3.2.3) stable; urgency=medium
-
-  * 客户端异常退出时仍然占用资源问题修复
-  * 降低dtk依赖版本，Debian 11 stable可直接安装
-
- -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
-
-
-spark-store (3.2.2) stable; urgency=medium
-
-  * aptss will now refresh the system source before doing install,  policy....etc
-  * 启动客户端GPU加速支持
-
- -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
-
-
-spark-store (3.2.1) stable; urgency=medium
-
-  * 更改刷新系统源的功能
-
- -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
-
-
-spark-store (3.2) stable; urgency=medium
-
-  * 新增 下载量统计功能
-  * 新增 显示下载量
-  * 修复 spk链接生成错误
-  * 调整 启动时检测商店applist源
-  * 新增 applist cdn加速
-  * 调整 ssupdate不再更新/etc/aptss下的cache，如要如此，请使用aptss update
-  * 修复 在更新检测设置中的是否开启自动更新检测设置项的显示不随开启或关闭状态改变
-  * 修复 在检测更新时临时降低优先级到100，防止系统中有且版本一致的包被反复来回更新 
-
- -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
-
-
-spark-store (3.1.6) stable; urgency=medium
-
-  * 修复部分情况下无法选中正确的镜像源的问题
-  * 合入3.1.5以来的各项修改
-
- -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
-
-
-spark-store (3.1.5-5) stable; urgency=medium
-
-  * 从所有镜像源中选取最快镜像源高速下载
-
- -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
-
-
-spark-store (3.1.5-4) stable; urgency=medium
-
-  * 更改ss-apt-fast策略，现在只会在update，ssupdate和没有检测到配置文件的时候更新配置文件
-  * 新增ss-apt-fast别名：aptss 
-  * 更新检测服务优化：从分体改为一体
-  * aptss 支持自动补全
-
- -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
-
-
-spark-store (3.1.5-3) stable; urgency=medium
-
-  * 包内自带密钥
-
- -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
-
-
-spark-store (3.1.5-2) stable; urgency=medium
-
-  * 下载软件时跳过获取大小，修复部分软件无法下载的问题
-  * 修复 获取key时出错，指定使用http1.1
-
- -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
-
-
-spark-store (3.1.5-1) stable; urgency=medium
-
-  * 改变更新策略，UOS也下载加速，但是安装不加速
-
- -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
-
-
-spark-store (3.1.5) stable; urgency=medium
-
-  * 改变更新策略，现在支持应用在更新时引入新依赖
-  * ss-apt-fast现在默认允许降级，以与apt使用体验一致
-
- -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
-
-
-spark-store (3.1.4-2) stable; urgency=medium
-
-  * 客户端下载使用metalink来支持bt下载加速
-  * 修复使用更新和安装设置更新商店本体时出错
-
- -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
-
-
-spark-store (3.1.4-1) stable; urgency=medium
-
-  * 安装脚本和检测更新脚本检查网络时间超时时间延长至5s  
-  * 修复：ssinstall在没有安装apt-fast的情况下首次安装需要依赖的软件时安装失败 
-
- -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
-
-
-spark-store (3.1.4) stable; urgency=medium
-
-  * 发布正式版，同步到官网
-  * 修复安装时使用wget的问题
-  * 合并3.1.3-1和3.1.3-2的更改
-  * 屏蔽了ssinstall之外的安装方式
-  * 调整了报错框的形式
-  * 修复pkexec下ssinstall不处理依赖
-
- -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
-
-
-spark-store (3.1.3-2) stable; urgency=medium
-
-  * 调整 现在与系统更新分开，不再导致更新失败
-  * 支持直接更新软件源文件，不再让d.吃全部更新流量
-  * ss-apt-fast不再强制root权限
-  * 修改ss-apt-fast的策略，现在除了安装，下载和更新都改用apt
-  * ssinstall 现在也会在不适用ss-apt-fast的时候模拟源了（针对UOS）
-
- -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
-
-
-spark-store (3.1.3-1) stable; urgency=medium
-
-  * 修复 下载提前退出
-  * 移除 下载量显示
-
- -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
-
-
-spark-store (3.1.3) stable; urgency=medium
-
-  * Now uses aria2 to download softwares form all mirrors
-  * 新增：ssinstall现在会在没有apt-fast的时候自动安装
-  * 新增：ss-apt-fast现在会在没有apt-fast的时候自动安装
-  * 修改：删除ssinstall中无用的 || dpkg -P $1
-  * 新增：ss-apt-fast会先下载云上的conf以确保mirror是最新的
-  * 修复：去除wget指令
-
- -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
-
-
-spark-store (3.1.2) stable; urgency=medium
-
-  * Now let apt-fast method support all mirrors
-  * Now will download dependencies and upgrade with all mirrors
-
- -- shenmo <shenmo@spark-app.store>  Mon, 17 Jan 2022 00:00:00 +0800
-
-
-spark-store (3.1.1) stable; urgency=medium
-
-  * Now will delete the link of policy file after uninstall or upgrade
-  * Now ss-update-controler will create symbol link instead of hard link
-
- -- shenmo <shenmo@spark-app.store>  Mon, 17 Jan 2022 00:00:00 +0800
-
-
-spark-store (3.1.0) stable; urgency=medium
-
-  * Add pkexec policy: ssinstall. Only will be enabled after permitted.
-  * Modify ssinistall script: Now will ask for password when not run as root
-
- -- shenmo <shenmo@spark-app.store>  Mon, 17 Jan 2022 00:00:00 +0800
-
-
-spark-store (3.0.3-13) stable; urgency=medium
-
-  * Update the ssinstall script. Now support apt-fast and will temporarily increase the spark store source priority to 500 to make depends install correctly
-  * Change the style of About Dialog
-  * Modified depends to avoid Deb installers can not handle "Provides"
-
- -- shenmo <shenmo@spark-app.store>  Mon, 17 Jan 2022 00:00:00 +0800
-
-
-spark-store (3.0.3-12) stable; urgency=medium
-
-  * Rollback to use DApplication::loadDXcbPlugin() to make titlebar behave normally in ubuntu
-  * Now can run on Debian 11
-  * Now can run on Ubuntu 22.04
-
- -- shenmo <shenmo@spark-app.store>  Mon, 17 Jan 2022 00:00:00 +0800
-
-
-spark-store (3.0.3-11) stable; urgency=medium
-
-  * Now support autoupdate
-
- -- shenmo <shenmo@spark-app.store>  Mon, 17 Jan 2022 00:00:00 +0800
-
-
-spark-store (3.0.3-10) stable; urgency=medium
-
-  * Now also compile dstore patch
-
- -- shenmo <shenmo@spark-app.store>  Mon, 17 Jan 2022 00:00:00 +0800
-
-
-spark-store (3.0.3-9) stable; urgency=medium
-
-  * Support dpkg-buildpackage
-
- -- shenmo <shenmo@spark-app.store>  Mon, 17 Jan 2022 00:00:00 +0800
-
+  * U
+  

debian/control

@@ -7,44 +7,30 @@ Build-Depends:
  pkg-config,
  qtchooser (>= 55-gc9562a1-1~) | qt5-default,
  qtbase5-dev,
- libqt5core5a,
- libqt5gui5,
- libqt5widgets5,
- libqt5network5,
- libqt5concurrent5,
- libdtkcore-dev(>=5.0),
- libdtkgui-dev(>=5.0),
- libdtkwidget-dev(>=5.0),
  libqt5svg5-dev,
- qttools5-private-dev,
+ qttools5-dev-tools,
  qtwebengine5-dev,
- qtwayland5,
- qtwayland5-dev-tools,
- gcc,
- g++
-Standards-Version: 4.0.0
+ libdtkcore-dev (>= 5.0),
+ libdtkgui-dev (>= 5.0),
+ libdtkwidget-dev (>= 5.0)
+Standards-Version: 4.1.7
 Homepage: https://www.spark-app.store/
 
 Package: spark-store
 Architecture: any
-Depends:${shlibs:Depends}, ${misc:Depends},
- libqt5core5a,
- libqt5gui5,
- libqt5widgets5,
- libqt5network5,
- libqt5concurrent5,
- qtwayland5,
- libdtkcore5,
- libdtkgui5,
- libdtkwidget5,
+Provides: spark-store-console-in-container
+Depends: ${shlibs:Depends}, ${misc:Depends},
+ dde-qt5integration,
  curl,
  openssl,
- dde-qt5integration,
  aria2,
  gnupg,
  zenity,
- policykit-1,
+ policykit-1 | pkexec,
  libnotify-bin,
- desktop-file-utils
+ qtwayland5,
+ desktop-file-utils,
+ dpkg-dev,
+ lsb-release,
 Description: Spark Store
  A community powered app store, based on DTK.

debian/copyright

@@ -1,6 +1,6 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: spark-store
-Source: https://gitee.com/deepin-community-store/spark-store
+Source: https://gitee.com/spark-store-project/spark-store
 
 Files: *
 Copyright: The Spark Project Developers

debian/rules

@@ -7,6 +7,9 @@ include /usr/share/dpkg/default.mk
 DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
+# Use realtime timestamp instead of the latest entry in debian/changelog
+SOURCE_DATE_EPOCH := $(shell date +%s)
+
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE = 1
 
@@ -14,25 +17,25 @@ DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 	dh $@ --parallel
 
 override_dh_auto_clean:
-	rm -rf $(CURDIR)/build
+	rm -rf $(CURDIR)/build-$(DEB_HOST_MULTIARCH)
 
 override_dh_auto_configure:
-	mkdir -p $(CURDIR)/build
+	mkdir -p $(CURDIR)/build-$(DEB_HOST_MULTIARCH)
 
 	qmake BUILD_VERSION=$(DEB_VERSION_UPSTREAM) spark-store-project.pro \
-	-spec linux-g++ CONFIG+=qtquickcompiler \
-	-o $(CURDIR)/build/
+	-spec linux-g++ CONFIG+=force_debug_info \
+	-o $(CURDIR)/build-$(DEB_HOST_MULTIARCH)/
 
 override_dh_auto_build:
-	make MAKEFLAGS="$(MAKEFLAGS)" -C $(CURDIR)/build 
+	make -C $(CURDIR)/build-$(DEB_HOST_MULTIARCH) -j$(JOBS)
 
 override_dh_auto_install:
-	make -C $(CURDIR)/build install \
+	make -C $(CURDIR)/build-$(DEB_HOST_MULTIARCH) install \
 	INSTALL_ROOT=$(CURDIR)/debian/spark-store
 
-
 # Ignore the dpkg-shlibdeps: warning (it uses none of the library's symbols)
 # Qt Mutidedia lib will ref to network libraray.
 override_dh_shlibdeps:
-	dh_shlibdeps --dpkg-shlibdeps-params=--warnings=0
-
+	dh_shlibdeps --dpkg-shlibdeps-params=--warnings=0 --exclude=opt/durapps/spark-store/bin/ss-feedback/
+override_dh_strip:
+	dh_strip --exclude=opt/durapps/spark-store/bin/ss-feedback/

debian/source/format

@@ -1 +1 @@
-1.0
+3.0 (native)

debian/spark-store.postinst

@@ -12,6 +12,10 @@ case "$1" in
         		aarch64)
         			echo "Will not enable armhf since 4271"
 			;;
+            loongarch64)
+				echo "Nope we DO NOT WANT ABI1 now"
+				dpkg --remove-architecture loongarch64
+			;;
 
  			*)
 				echo "Unknown architecture, skip enable 32-bit arch"
@@ -25,18 +29,20 @@ case "$1" in
 
 		# Check if /usr/local/bin existed
 		mkdir -p /usr/local/bin
-
+		## I hate /usr/local/bin. We will abandon them later
 		# Create symbol links for binary files
 		ln -s -f /opt/durapps/spark-store/bin/spark-store /usr/local/bin/spark-store
 		ln -s -f /opt/durapps/spark-store/bin/ssinstall /usr/local/bin/ssinstall
 		ln -s -f /opt/durapps/spark-store/bin/ssaudit /usr/local/bin/ssaudit
+		ln -s -f /opt/durapps/spark-store/bin/ssinstall /usr/bin/ssinstall
+		ln -s -f /opt/durapps/spark-store/bin/ssaudit /usr/bin/ssaudit
 		ln -s -f /opt/durapps/spark-store/bin/spark-dstore-patch /usr/local/bin/spark-dstore-patch
+		ln -s -f /opt/durapps/spark-store/bin/spark-dstore-patch /usr/bin/spark-dstore-patch
 		ln -s -f /opt/durapps/spark-store/bin/aptss /usr/local/bin/ss-apt-fast
 
 		ln -s -f /opt/durapps/spark-store/bin/aptss /usr/bin/aptss
 
-		# Create symbol links for SSINSTALL 
-		ln -s -f  /opt/durapps/spark-store/bin/auto-install-policy/store.spark-app.ssinstall.policy /usr/share/polkit-1/actions/store.spark-app.ssinstall.policy
+
 
 		# Install key
 		mkdir -p /tmp/spark-store-install/
@@ -66,18 +72,7 @@ case "$1" in
 	;;
 
 	triggered)
-		# Quit if deepin-app-store-tool existed
-		if [ -x "/usr/bin/deepin-app-store-tool" ] ; then 
-			exit 0
-		fi
+			spark-dstore-patch
 
-		# Trigger for UOS debs installation
-		echo '--------检测到Uniontech标准软件包，运行补丁以修正安装--------'
-		if [ -x "/usr/local/bin/spark-dstore-patch" ] ; then
-			/usr/local/bin/spark-dstore-patch
-			echo '-----------spark-dstore-patch补丁工具已运行完毕-----------'
-		else
-			echo '------------spark-dstore-patch补丁工具运行失败------------'
-		fi
 	;;
 esac

debian/spark-store.prerm

@@ -16,12 +16,15 @@ if [ "$1" = "remove" -o "$1" = "purge" ] ; then
 	echo "卸载操作，进行配置清理"
 
 	# Remove residual symbol links
-	rm -f /usr/local/bin/spark-store
-	rm -f /usr/local/bin/ssinstall
-	rm -f /usr/local/bin/ssaudit
-	rm -f /usr/local/bin/spark-dstore-patch
-	rm -f /usr/local/bin/ss-apt-fast
-	rm -f /usr/bin/aptss
+	unlink /usr/local/bin/spark-store
+	unlink /usr/local/bin/ssinstall
+	unlink /usr/local/bin/ssaudit
+	unlink /usr/bin/ssinstall
+	unlink /usr/bin/ssaudit
+	unlink /usr/local/bin/spark-dstore-patch
+	unlink /usr/bin/spark-dstore-patch
+	unlink /usr/local/bin/ss-apt-fast
+	unlink /usr/bin/aptss
 
 	rm -rf /etc/aptss/
 	rm -rf /var/lib/aptss/
@@ -44,12 +47,11 @@ for username in `ls /home`
 	# Stop update detect service
 	systemctl disable spark-update-notifier
 
-	# Clean the auto install polkit file if exist
-	rm -f /usr/share/polkit-1/actions/store.spark-app.ssinstall.policy
+
 
 	# Remove gpg key file
 	rm -f /etc/apt/trusted.gpg.d/spark-store.gpg
-	apt-key del '9D9A A859 F750 24B1 A1EC  E16E 0E41 D354 A29A 440C'
+	apt-key del '9D9A A859 F750 24B1 A1EC  E16E 0E41 D354 A29A 440C' || true
 else
 	
 	if [ ! -z "`pidof spark-store`" ] ; then

debian/spark-store.triggers

@@ -1 +1,2 @@
 interest-noawait /opt/apps
+

patchs/README.md

@@ -5,7 +5,7 @@
     > 用于 zinface-community-cmake-build-system.patch 补丁化构建方式
 
     ```shell
-    git clone https://gitee.com/deepin-community-store/spark-store
+    git clone https://gitee.com/spark-store-project/spark-store
     cd spark-store
     git am < patchs/zinface-community-cmake-build-system.patch
     make package

pkg/etc/aptss/sources.list.d/sparkstore.list

@@ -1 +0,0 @@
-deb [by-hash=force] https://d.store.deepinos.org.cn / 

pkg/lib/systemd/system/spark-update-notifier.timer

@@ -0,0 +1,11 @@
+[Unit]  
+Description=Timer for Spark Update Notifier  
+
+[Timer]  
+# 开机后第一次执行  
+OnBootSec=1min  
+# 每天执行一次  
+OnUnitActiveSec=1d  
+
+[Install]  
+WantedBy=timers.target

pkg/usr/lib/systemd/system/spark-update-notifier.service

@@ -2,13 +2,14 @@
 Description=Spark Store update notifier
 After=apt-daily.service network.target network-online.target systemd-networkd.service NetworkManager.service connman.service
 
-
 [Service]
 Type=simple
-RemainAfterExit=yes 
+RemainAfterExit=yes
 ExecStart=/opt/durapps/spark-store/bin/update-upgrade/ss-update-notifier.sh
 Restart=on-failure
-RestartSec=10
+RestartSec=15  # 可以设置为更长的重试间隔，比如 15 秒或 30 秒
+StartLimitIntervalSec=1h  # 设置为 1 小时的时间窗口
+StartLimitBurst=3  # 最大允许失败次数为 3 次
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=multi-user.target

pkg/usr/share/bash-completion/completions/aptss

@@ -40,7 +40,7 @@ _aptss()
         "list"
         "search"
         "show" "showsrc"
-        "install" "remove" "purge" "autoremove"
+        "install" "remove" "purge" "autoremove" "autopurge"
         "update"
         "upgrade" "full-upgrade" "dist-upgrade"
         "edit-sources"

pkg/usr/share/fish/completions/aptss.fish

@@ -0,0 +1,242 @@
+# 清除已有的 aptss 补全（如果有的话）
+complete -c aptss -e
+
+# 禁用默认的文件补全（避免显示当前目录文件）
+complete -c aptss -f
+
+########################################################################
+# aptss Fish 补全脚本（中文说明版，软件包补全显示简介）
+#
+# 说明：
+# 1. 子命令和选项的说明采用中文显示。
+# 2. 软件包补全部分不再调用 apt-cache，而是解析 aptss 自有的软件源索引文件，
+#    从 /var/lib/aptss/lists/*Packages（或 *Sources）中提取软件包名称及简介信息。
+#
+# 注意：如果你的 aptss 软件源索引文件位置或格式有变化，请相应修改下面的 awk 命令。
+########################################################################
+
+### 辅助函数
+
+# 解析 /var/lib/aptss/lists/*Packages 文件，输出符合当前输入前缀的“软件包<TAB>简介”
+function __fish_aptss_print_packages
+    set cur (commandline -ct)
+    # 将所有匹配的 Packages 文件拼接后，用 awk 分段解析（RS="" 表示以空行为分段）
+    awk -v cur="$cur" '
+      BEGIN { RS=""; FS="\n" }
+      {
+         pkg = ""; desc = "";
+         for(i=1; i<=NF; i++){
+            if($i ~ /^Package: /) { pkg = substr($i, 10) }  # “Package: ”共9个字符
+            else if($i ~ /^Description: /) { desc = substr($i, 14) }  # “Description: ”共13个字符
+         }
+         if(pkg != "" && (cur == "" || pkg ~ ("^" cur))) {
+             print pkg "\t" desc
+         }
+      }
+    ' /var/lib/aptss/lists/*Packages 2>/dev/null
+end
+
+# 解析已安装软件包（这里仍使用 dpkg-query，如果需要使用 aptss 数据，可另外构造）
+function __fish_aptss_print_installed_packages
+    set cur (commandline -ct)
+    dpkg-query -W -f='${Package}\t${Description}\n' 2>/dev/null | grep -i "^$cur"
+end
+
+# 解析 /var/lib/aptss/lists/*Sources 文件，输出源代码包信息（如果存在）
+function __fish_aptss_print_source_packages
+    set cur (commandline -ct)
+    awk -v cur="$cur" '
+      BEGIN { RS=""; FS="\n" }
+      {
+         pkg = ""; desc = "";
+         for(i=1; i<=NF; i++){
+            if($i ~ /^Package: /) { pkg = substr($i, 10) }
+            else if($i ~ /^Description: /) { desc = substr($i, 14) }
+         }
+         if(pkg != "" && (cur == "" || pkg ~ ("^" cur))) {
+             print pkg "\t" desc
+         }
+      }
+    ' /var/lib/aptss/lists/*Sources 2>/dev/null
+end
+
+# 翻译子命令为中文说明（用于补全时显示在括号内）
+function __fish_translate_aptss_cmd
+    switch $argv[1]
+        case ssupdate
+            echo "更新软件源"
+        case list
+            echo "列出软件包"
+        case search
+            echo "搜索软件包"
+        case show
+            echo "显示软件包信息"
+        case showsrc
+            echo "显示源包信息"
+        case install
+            echo "安装软件包"
+        case remove
+            echo "移除软件包"
+        case purge
+            echo "彻底移除软件包"
+        case autoremove
+            echo "自动移除不必要的软件包"
+        case update
+            echo "更新软件包列表"
+        case upgrade
+            echo "升级软件包"
+        case full-upgrade
+            echo "完全升级（可能移除其他软件包）"
+        case dist-upgrade
+            echo "发行版升级"
+        case edit-sources
+            echo "编辑软件源列表"
+        case help
+            echo "显示帮助信息"
+        case source
+            echo "下载源代码包"
+        case build-dep
+            echo "安装构建依赖"
+        case clean
+            echo "清除软件包缓存"
+        case autoclean
+            echo "自动清理旧缓存"
+        case download
+            echo "下载软件包"
+        case changelog
+            echo "显示更新日志"
+        case moo
+            echo "彩蛋"
+        case depends
+            echo "显示软件包依赖"
+        case rdepends
+            echo "显示软件包逆向依赖"
+        case policy
+            echo "显示软件包策略"
+        case '*'
+            echo $argv[1]
+    end
+end
+
+### 定义各类子命令组
+
+# 所有子命令列表
+set -g __aptss_commands ssupdate list search show showsrc install remove purge autoremove update upgrade full-upgrade dist-upgrade edit-sources help source build-dep clean autoclean download changelog moo depends rdepends policy
+
+# 需要补全二进制软件包名称的子命令（例如 install、show、search、download、changelog、depends、rdepends）
+set -l __aptss_pkg_subcmds install show search download changelog depends rdepends
+
+# 需要补全已安装软件包的子命令（例如 remove、purge、autoremove）
+set -l __aptss_installed_pkg_subcmds remove purge autoremove
+
+# 需要补全源代码包的子命令（例如 source、build-dep、showsrc、policy）
+set -l __aptss_src_pkg_subcmds source build-dep showsrc policy
+
+### 子命令补全
+# 未输入子命令时，显示所有候选子命令，并在括号中显示中文说明
+for cmd in $__aptss_commands
+    set desc (__fish_translate_aptss_cmd $cmd)
+    complete -c aptss -a $cmd -d "$desc" -n "not __fish_seen_subcommand_from $__aptss_commands"
+end
+
+### 公共选项（适用于一组子命令）
+set -l group1 "install remove purge upgrade dist-upgrade full-upgrade autoremove"
+
+complete -c aptss -n "__fish_seen_subcommand_from $group1" -l show-progress -d '显示进度'
+complete -c aptss -n "__fish_seen_subcommand_from $group1" -l fix-broken -d '修复损坏的依赖'
+complete -c aptss -n "__fish_seen_subcommand_from $group1" -l purge -d '清除配置文件'
+complete -c aptss -n "__fish_seen_subcommand_from $group1" -l verbose-versions -d '显示详细版本'
+complete -c aptss -n "__fish_seen_subcommand_from $group1" -l auto-remove -d '自动移除依赖'
+complete -c aptss -n "__fish_seen_subcommand_from $group1" -s s -l simulate -d '模拟/试运行'
+complete -c aptss -n "__fish_seen_subcommand_from $group1" -l download -d '下载软件包'
+complete -c aptss -n "__fish_seen_subcommand_from $group1" -l fix-missing -d '修复丢失文件'
+complete -c aptss -n "__fish_seen_subcommand_from $group1" -l fix-policy -d '修复策略'
+complete -c aptss -n "__fish_seen_subcommand_from $group1" -l ignore-hold -d '忽略锁定'
+complete -c aptss -n "__fish_seen_subcommand_from $group1" -l force-yes -d '强制确认'
+complete -c aptss -n "__fish_seen_subcommand_from $group1" -l trivial-only -d '仅处理简单情况'
+complete -c aptss -n "__fish_seen_subcommand_from $group1" -l reinstall -d '重新安装'
+complete -c aptss -n "__fish_seen_subcommand_from $group1" -l solver -d '使用求解器'
+complete -c aptss -n "__fish_seen_subcommand_from $group1" -s t -l target-release -d '目标版本'
+
+# 附加的 GENERIC 选项
+complete -c aptss -n "__fish_seen_subcommand_from $group1" -s d -l download-only -d '仅下载'
+complete -c aptss -n "__fish_seen_subcommand_from $group1" -s y -l assume-yes -d '默认确认'
+complete -c aptss -n "__fish_seen_subcommand_from $group1" -l assume-no -d '默认否定'
+complete -c aptss -n "__fish_seen_subcommand_from $group1" -s u -l show-upgraded -d '显示升级情况'
+complete -c aptss -n "__fish_seen_subcommand_from $group1" -s m -l ignore-missing -d '忽略缺失'
+
+### 针对各个子命令的专用选项
+
+# update 命令
+complete -c aptss -n "__fish_seen_subcommand_from update" -l list-cleanup -d '清理列表'
+complete -c aptss -n "__fish_seen_subcommand_from update" -l print-uris -d '显示 URI'
+complete -c aptss -n "__fish_seen_subcommand_from update" -l allow-insecure-repositories -d '允许不安全的仓库'
+
+# list 命令
+complete -c aptss -n "__fish_seen_subcommand_from list" -l installed -d '已安装的软件包'
+complete -c aptss -n "__fish_seen_subcommand_from list" -l upgradable -d '可升级的软件包'
+complete -c aptss -n "__fish_seen_subcommand_from list" -l manual-installed -d '手动安装的软件包'
+complete -c aptss -n "__fish_seen_subcommand_from list" -s v -l verbose -d '详细模式'
+complete -c aptss -n "__fish_seen_subcommand_from list" -s a -l all-versions -d '显示所有版本'
+complete -c aptss -n "__fish_seen_subcommand_from list" -s t -l target-release -d '目标版本'
+
+# show 命令
+complete -c aptss -n "__fish_seen_subcommand_from show" -s a -l all-versions -d '显示所有版本'
+
+# depends 和 rdepends 命令（逐项添加各选项）
+for opt in i important installed pre-depends depends recommends suggests replaces breaks conflicts enhances recurse implicit
+    complete -c aptss -n "__fish_seen_subcommand_from depends rdepends" -l $opt -d $opt
+end
+complete -c aptss -n "__fish_seen_subcommand_from depends rdepends" -s i -d '选项 -i'
+
+# search 命令
+complete -c aptss -n "__fish_seen_subcommand_from search" -s n -l names-only -d '仅匹配名称'
+complete -c aptss -n "__fish_seen_subcommand_from search" -s f -l full -d '全文搜索'
+
+# showsrc 命令
+complete -c aptss -n "__fish_seen_subcommand_from showsrc" -l only-source -d '仅显示源代码'
+
+# source 命令
+complete -c aptss -n "__fish_seen_subcommand_from source" -s s -l simulate -d '模拟'
+complete -c aptss -n "__fish_seen_subcommand_from source" -s b -l compile -d '编译/构建'
+complete -c aptss -n "__fish_seen_subcommand_from source" -s P -l build-profiles -d '构建配置'
+complete -c aptss -n "__fish_seen_subcommand_from source" -l diff-only -d '仅显示差异'
+complete -c aptss -n "__fish_seen_subcommand_from source" -l debian-only -d '仅限 Debian'
+complete -c aptss -n "__fish_seen_subcommand_from source" -l tar-only -d '仅打包 tar'
+complete -c aptss -n "__fish_seen_subcommand_from source" -l dsc-only -d '仅下载 DSC'
+complete -c aptss -n "__fish_seen_subcommand_from source" -s t -l target-release -d '目标版本'
+
+# build-dep 命令
+complete -c aptss -n "__fish_seen_subcommand_from build-dep" -s a -l host-architecture -d '主机架构'
+complete -c aptss -n "__fish_seen_subcommand_from build-dep" -s s -l simulate -d '模拟'
+complete -c aptss -n "__fish_seen_subcommand_from build-dep" -s P -l build-profiles -d '构建配置'
+complete -c aptss -n "__fish_seen_subcommand_from build-dep" -s t -l target-release -d '目标版本'
+complete -c aptss -n "__fish_seen_subcommand_from build-dep" -l purge -d '清除'
+complete -c aptss -n "__fish_seen_subcommand_from build-dep" -l solver -d '求解依赖'
+
+# moo 命令
+complete -c aptss -n "__fish_seen_subcommand_from moo" -l color -d '彩蛋模式'
+
+# clean 和 autoclean 命令
+complete -c aptss -n "__fish_seen_subcommand_from clean autoclean" -s s -l simulate -d '模拟'
+
+### 针对 -t/--target-release 的特殊补全
+complete -c aptss -n '
+    begin
+        set -l prev (commandline -poc | string trim)
+        test "$prev" = "-t" -o "$prev" = "--target-release"
+    end
+' -a '(__fish_aptss_target_release)' -d '目标版本'
+
+### 软件包补全
+# 对于需要二进制软件包名称的子命令，调用 __fish_aptss_print_packages，
+# 输出的每一行格式为 "包名<TAB>简介"，Fish 会将 TAB 后内容显示为注释。
+complete -c aptss -n "__fish_seen_subcommand_from $__aptss_pkg_subcmds" -a '(__fish_aptss_print_packages)'
+
+# 对于 remove、purge、autoremove 命令，补全已安装的软件包（使用 dpkg-query 输出）
+complete -c aptss -n "__fish_seen_subcommand_from $__aptss_installed_pkg_subcmds" -a '(__fish_aptss_print_installed_packages)' -d '已安装软件包'
+
+# 对于 source、build-dep、showsrc、policy 命令，补全源代码包，
+# 如果存在对应的 Sources 索引文件，则调用 __fish_aptss_print_source_packages，
+# 否则可考虑默认使用二进制包的索引。
+complete -c aptss -n "__fish_seen_subcommand_from $__aptss_src_pkg_subcmds" -a '(__fish_aptss_print_source_packages)' -d '源代码包'

pkg/usr/share/polkit-1/actions/store.spark-app.ss-do-upgrade.policy

@@ -4,15 +4,15 @@
 <policyconfig>
     <vendor>Spark Store</vendor>
     <icon_name>x-package-repository</icon_name>
-    <action id="store.spark-app.ss-do-upgrade-worker">
-        <description>运行ss-do-upgrade-worker需要权限</description>
-        <message>要使用ss-do-upgrade-worker需要权限</message>
+    <action id="store.spark-app.ss-do-upgrade">
+        <description>运行ss-do-upgrade需要权限</description>
+        <message>要使用ss-do-upgrade需要权限</message>
         <defaults>
             <allow_any>yes</allow_any>
             <allow_inactive>yes</allow_inactive>
             <allow_active>yes</allow_active>
         </defaults>
-        <annotate key="org.freedesktop.policykit.exec.path">/opt/durapps/spark-store/bin/update-upgrade/ss-do-upgrade-worker.sh</annotate>
+        <annotate key="org.freedesktop.policykit.exec.path">/opt/durapps/spark-store/bin/update-upgrade/ss-do-upgrade.sh</annotate>
         <annotate key="org.freedesktop.policykit.exec.allow_gui">true</annotate>
     </action>
 </policyconfig>

spark-store-project.pro

@@ -7,8 +7,7 @@
 TARGET = spark-store
 TEMPLATE = subdirs
 
-#CONFIG += ordered
-CONFIG += wayland-compositor
+CONFIG += ordered
 
 SUBDIRS += \
         src/spark-store.pro
@@ -41,13 +40,16 @@ qm.path = /usr/share/spark-store/translations
 bash_completion.files += pkg/usr/share/bash-completion/completions/aptss
 bash_completion.path = /usr/share/bash-completion/completions
 
+fish_completion.files += pkg/usr/share/fish/completions/aptss.fish
+fish_completion.path = /usr/share/fish/completions/
+
 desktop.files += pkg/usr/share/applications/*.desktop
 desktop.path = /usr/share/applications
 
 service.files += pkg/usr/lib/systemd/system/spark-update-notifier.service
 service.path = /usr/lib/systemd/system/
 
-polkit-1.files += pkg/usr/share/polkit-1/actions/store.spark-app.ss-do-upgrade-worker.policy
+polkit-1.files += pkg/usr/share/polkit-1/actions/*
 polkit-1.path = /usr/share/polkit-1/actions/
 
 icon.files += pkg/usr/share/icons/hicolor/scalable/apps/*.svg
@@ -74,5 +76,6 @@ INSTALLS += \
         tmp \
         service \
         bash_completion \
+        fish_completion \
         polkit-1 
 #   暂时不添加

src/application.cpp

@@ -14,6 +14,7 @@
 
 #include <QSettings>
 #include <QStandardPaths>
+#include <QTranslator>
 
 DCORE_USE_NAMESPACE
 
@@ -35,13 +36,13 @@ Application::Application(int &argc, char **argv)
     setApplicationDisplayName(QObject::tr("Spark Store")); // 设置窗口显示标题 (Wayland 下会显示 Qt 原生标题栏)
     setProductName(QObject::tr("Spark Store"));
     setProductIcon(QIcon::fromTheme("spark-store"));
-    setApplicationHomePage("https://gitee.com/deepin-community-store");
+    setApplicationHomePage("https://gitee.com/spark-store-project");
     setApplicationDescription(
         QObject::tr(
             "<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>"));
-    setApplicationLicense(" <a href='https://gitee.com/deepin-community-store/spark-store/blob/Flamescion/LICENSE'>GPLv3</a> ");
+    setApplicationLicense(" <a href='https://gitee.com/spark-store-project/spark-store/blob/Flamescion/LICENSE'>Spark Opensource License</a> ");
 
     // 检查 ~/.config/spark-union/spark-store 文件夹是否存在
     checkAppConfigLocation();

src/assets/assets.qrc

@@ -45,22 +45,32 @@
         <file>icon/light/update.svg</file>
         <file>icon/logo.svg</file>
         <file>json/features.json</file>
-        <file>tags/a2d-small.png</file>
+        <file>tags/a2d_full.svg</file>
         <file>tags/a2d.png</file>
-        <file>tags/community-small.png</file>
+        <file>tags/a2d.svg</file>
+        <file>tags/community_full.svg</file>
         <file>tags/community.png</file>
         <file>tags/community.svg</file>
-        <file>tags/deepin-small.png</file>
+        <file>tags/debian_full.svg</file>
+        <file>tags/debian.png</file>
+        <file>tags/debian.svg</file>
+        <file>tags/deepin_full.svg</file>
+        <file>tags/deepin.png</file>
         <file>tags/deepin.svg</file>
-        <file>tags/dtk-small.png</file>
-        <file>tags/dwine2-small.png</file>
-        <file>tags/dwine5-small.png</file>
+        <file>tags/dtk_full.svg</file>
+        <file>tags/dtk.png</file>
+        <file>tags/dtk.svg</file>
+        <file>tags/dwine2_full.svg</file>
+        <file>tags/dwine2.png</file>
+        <file>tags/dwine2.svg</file>
+        <file>tags/dwine5_full.svg</file>
+        <file>tags/dwine5.png</file>
         <file>tags/dwine5.svg</file>
-        <file>tags/logo_icon.svg</file>
-        <file>tags/ubuntu-small.png</file>
+        <file>tags/ubuntu_full.svg</file>
         <file>tags/ubuntu.png</file>
-        <file>tags/uos-authorize.svg</file>
-        <file>tags/uos-small.png</file>
+        <file>tags/ubuntu.svg</file>
+        <file>tags/uos_full.svg</file>
+        <file>tags/uos.png</file>
         <file>tags/uos.svg</file>
         <file>translations/qtwebengine_zh.qm</file>
     </qresource>

src/assets/icon/logo-no-border.svg

@@ -0,0 +1,249 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   inkscape:export-ydpi="127"
+   inkscape:export-xdpi="127"
+   inkscape:export-filename="/home/zhangtianyi/Desktop/deepin-community-store.png"
+   width="200mm"
+   height="200mm"
+   viewBox="0 0 200 200"
+   version="1.1"
+   id="svg8"
+   inkscape:version="1.3 (0e150ed, 2023-07-21)"
+   sodipodi:docname="logo-no-border.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <defs
+     id="defs2">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient1200">
+      <stop
+         style="stop-color:#000000;stop-opacity:0.1299435"
+         offset="0"
+         id="stop1196" />
+      <stop
+         style="stop-color:#dadada;stop-opacity:0.81960785"
+         offset="1"
+         id="stop1198" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient1138"
+       inkscape:collect="always">
+      <stop
+         id="stop1134"
+         offset="0"
+         style="stop-color:#99e7ea;stop-opacity:1" />
+      <stop
+         id="stop1136"
+         offset="1"
+         style="stop-color:#007ffc;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient1128">
+      <stop
+         style="stop-color:#99e7ea;stop-opacity:1"
+         offset="0"
+         id="stop1124" />
+      <stop
+         style="stop-color:#007ffc;stop-opacity:1"
+         offset="1"
+         id="stop1126" />
+    </linearGradient>
+    <inkscape:path-effect
+       effect="bspline"
+       id="path-effect960"
+       is_visible="true"
+       weight="33.333333"
+       steps="2"
+       helper_size="0"
+       apply_no_weight="true"
+       apply_with_weight="true"
+       only_selected="false" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1128"
+       id="radialGradient1130"
+       cx="100.35268"
+       cy="199.86011"
+       fx="100.35268"
+       fy="199.86011"
+       r="90.135414"
+       gradientTransform="matrix(1,0,0,0.98112945,0,3.7714702)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1138"
+       id="radialGradient1132"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.98112945,0,3.7714702)"
+       cx="100.35268"
+       cy="199.86011"
+       fx="100.35268"
+       fy="199.86011"
+       r="90.135414" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1200"
+       id="radialGradient1202"
+       cx="100.35268"
+       cy="199.86011"
+       fx="100.35268"
+       fy="199.86011"
+       r="90.135414"
+       gradientTransform="matrix(1,0,0,0.98112945,0,3.7714702)"
+       gradientUnits="userSpaceOnUse" />
+    <filter
+       style="color-interpolation-filters:sRGB;"
+       inkscape:label="Drop Shadow"
+       id="filter1448">
+      <feFlood
+         flood-opacity="0.372549"
+         flood-color="rgb(145,145,145)"
+         result="flood"
+         id="feFlood1438" />
+      <feComposite
+         in="flood"
+         in2="SourceGraphic"
+         operator="in"
+         result="composite1"
+         id="feComposite1440" />
+      <feGaussianBlur
+         in="composite1"
+         stdDeviation="5.2918"
+         result="blur"
+         id="feGaussianBlur1442" />
+      <feOffset
+         dx="0"
+         dy="0"
+         result="offset"
+         id="feOffset1444" />
+      <feComposite
+         in="SourceGraphic"
+         in2="offset"
+         operator="over"
+         result="composite2"
+         id="feComposite1446" />
+    </filter>
+    <filter
+       style="color-interpolation-filters:sRGB;"
+       inkscape:label="Drop Shadow"
+       id="filter2201"
+       x="-0.06449152"
+       y="-0.061604632"
+       width="1.128983"
+       height="1.1232093">
+      <feFlood
+         flood-opacity="0.372549"
+         flood-color="rgb(145,145,145)"
+         result="flood"
+         id="feFlood2191" />
+      <feComposite
+         in="flood"
+         in2="SourceGraphic"
+         operator="in"
+         result="composite1"
+         id="feComposite2193" />
+      <feGaussianBlur
+         in="composite1"
+         stdDeviation="3.76995"
+         result="blur"
+         id="feGaussianBlur2195" />
+      <feOffset
+         dx="0"
+         dy="0"
+         result="offset"
+         id="feOffset2197" />
+      <feComposite
+         in="SourceGraphic"
+         in2="offset"
+         operator="over"
+         result="composite2"
+         id="feComposite2199" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.98994949"
+     inkscape:cx="476.28692"
+     inkscape:cy="375.77675"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1920"
+     inkscape:window-height="974"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:document-rotation="0"
+     inkscape:showpageshadow="2"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1" />
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-97)" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="Layer 2">
+    <path
+       style="fill:#ffc344;fill-opacity:1;stroke:none;stroke-width:0.309114px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 94.205599,38.155907 c 0,0 11.145081,-0.157476 22.599701,6.928753 11.45465,7.086223 18.11074,13.857508 20.27783,18.266716 2.16708,4.409209 9.28755,12.125332 9.13277,26.297795 -0.15488,14.172409 -3.40543,23.620739 -8.97797,31.494299 -5.57254,7.87359 -15.63405,13.85751 -27.70786,14.17247 -12.073829,0.31494 -19.813453,-7.55863 -22.444927,-11.96786 -2.631469,-4.4092 -3.715019,-13.85751 -0.464377,-20.62877 3.250645,-6.771296 8.358796,-6.771296 10.061513,-6.141389 1.702724,0.629897 2.167092,1.574691 3.095852,3.306872 0.928749,1.732187 1.547929,1.417257 2.941089,0.472427 1.39311,-0.944834 1.85748,-2.047138 1.54792,-3.464372 -0.30958,-1.417247 -2.16711,-3.149427 -3.71505,-3.621847 -1.547909,-0.47241 -3.715016,-1.88966 -6.810869,-1.41721 -3.095848,0.47238 -9.132757,2.04711 -14.240906,8.975819 -5.108153,6.92875 -4.488988,17.63684 -1.393134,22.67593 3.095849,5.0391 8.977962,14.48739 21.980539,17.79431 13.00259,3.30693 34.05435,-6.45633 41.32959,-21.57361 7.27524,-15.1173 7.43004,-22.203505 7.12048,-34.64374 C 148.22821,72.642208 137.23793,54.060548 125.00933,47.289265 112.78073,40.517979 103.64797,36.581186 94.205599,38.155907 Z"
+       id="path1002"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#f06767;fill-opacity:1;stroke:none;stroke-width:0.309114px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 100.67541,101.06311 c 0,0 -3.06474,-2.895088 -5.801108,2.22698 -2.736373,5.12205 -4.049827,9.68737 -1.313459,15.25486 2.736367,5.56745 8.428007,8.90792 17.184447,8.79659 8.75636,-0.11148 15.21419,-2.22699 19.0451,-8.5739 3.83094,-6.34692 6.7862,-11.02357 7.11457,-13.36191 0.32839,-2.33835 2.07965,0.33404 1.53239,2.33834 -0.54728,2.00426 -0.43783,5.9015 1.09454,5.12204 1.53237,-0.77942 2.73637,-2.00427 2.95526,-1.44753 0.21893,0.55673 -1.75127,4.00859 -2.68162,5.73449 -0.93039,1.7259 -3.83094,5.90153 -5.5275,7.51607 -1.69652,1.61458 -4.04981,3.89724 -6.84092,5.56747 -2.79109,1.67024 -7.11454,3.61887 -9.52255,4.06427 -2.40801,0.44539 -7.22403,1.39184 -9.96042,1.2805 -2.73635,-0.11137 -6.23892,-0.61243 -10.124558,-2.56104 -3.885645,-1.94859 -8.099657,-4.95505 -9.741479,-7.96148 -1.641825,-3.00643 -4.159283,-5.73449 -3.61201,-13.30623 0.547277,-7.57175 3.010008,-11.46899 4.870741,-13.250551 1.860731,-1.781588 4.597103,-2.561035 6.403105,-2.171298 1.806004,0.38971 2.955282,1.447544 3.393102,2.226958 0.43781,0.779437 1.149279,2.226981 1.532369,2.505371 z"
+       id="path1012"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#3f62eb;fill-opacity:1;stroke:none;stroke-width:0.309114px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 132.18114,140.09049 c 0,0 13.13457,-7.6831 19.26404,-19.82016 6.12948,-12.13707 8.7564,-19.93152 7.99021,-31.84589 -0.76619,-11.914358 -2.62692,-6.012854 -0.54728,-11.134928 2.07964,-5.122074 -1.31345,-15.254857 0.10943,-15.922949 1.42292,-0.668097 4.48765,4.453971 5.3633,8.573903 0.87562,4.119922 4.70654,16.813721 1.64181,32.959364 -3.06472,16.14564 -10.28872,22.60391 -15.10475,26.94655 -4.81603,4.34261 -15.7615,11.91437 -17.40332,11.80302 -1.64183,-0.11148 -1.86073,-0.11148 -1.31348,-1.55891 z"
+       id="path1014"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#fce102;fill-opacity:1;stroke:none;stroke-width:0.309114px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 104.83471,117.2363 c 0,0 7.00512,1.5589 12.36838,-1.78156 5.3633,-3.3405 9.5226,-8.79661 10.17931,-10.91225 0.65672,-2.11564 0.76619,1.89294 1.53236,-0.11125 0.76618,-2.00432 3.83093,-6.012871 2.29855,-15.366212 -1.53237,-9.35333 -1.64182,-9.798747 -4.48762,-14.809463 -2.84586,-5.010719 -9.63207,-11.91437 -13.79134,-14.141359 -4.15927,-2.226986 -9.96037,-5.567464 -17.950594,-5.344766 -7.990202,0.222699 -5.363286,-0.334048 -13.025124,1.002146 -7.661836,1.336187 -14.557491,5.010717 -16.856041,7.015006 -2.298552,2.004286 -8.428023,7.460405 -10.61712,10.46684 -2.189098,3.00643 -8.209113,9.798741 -11.383303,19.263442 -3.174189,9.464656 -4.487646,10.466796 -4.706555,16.702366 -0.21891,6.23557 0.547274,7.90578 -0.766185,8.46256 -1.31346,0.55673 -1.094547,-4.67668 -0.985094,-8.35123 0.109463,-3.6745 0.109463,-13.250536 4.925468,-23.940057 4.816015,-10.689538 13.353489,-19.597489 18.169503,-22.826622 4.816009,-3.229128 10.398208,-7.571752 19.045135,-9.687392 8.646933,-2.115635 17.293863,-1.781586 22.65716,-0.779443 5.3633,1.002145 13.68187,4.453974 18.1695,7.905802 4.48766,3.45183 9.41314,7.683099 13.13459,14.586765 3.72146,6.903648 4.70654,15.700251 4.59709,19.374771 -0.10943,3.674531 -1.97019,12.137076 -4.81601,16.256986 -2.84583,4.11993 -6.67674,9.0193 -10.61711,10.80089 -3.94039,1.78157 -8.75642,2.33833 -12.69675,0.55674 -3.94039,-1.78161 -3.72147,-2.44969 -4.3782,-4.34263 z"
+       id="path1016"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#5ed938;fill-opacity:1;stroke:none;stroke-width:0.309114px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 104.83471,117.2363 c 0,0 5.54674,1.56707 10.22918,-0.55878 4.68248,-2.12587 6.4239,-4.17301 7.54615,-5.3934 1.12223,-1.22042 3.25064,-3.50376 3.83112,-4.56669 0.58046,-1.06292 1.19962,-1.69282 1.19962,-2.08649 0,-0.39369 -1.08353,-1.33853 -0.0386,-3.62186 1.04482,-2.283321 1.97361,-7.519246 1.50922,-9.881306 -0.46438,-2.362073 -1.54792,-15.471616 -10.83547,-24.211303 -9.28753,-8.739678 -18.497709,-9.763242 -18.497709,-9.763242 0,0 14.705309,4.645415 21.593569,18.739134 6.88828,14.093741 4.64376,23.148323 0.23218,28.659827 -4.41158,5.51151 -10.68068,6.14141 -12.38342,4.72415 -1.70268,-1.41725 -5.2113,6.47164 -4.38574,7.95996 z"
+       id="path1018"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#8fdbe9;fill-opacity:1;stroke:none;stroke-width:0.309114px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 86.930353,66.680267 c 0,0 -9.906718,-0.07875 -17.414156,4.881616 -7.507436,4.960371 -11.14506,8.975903 -13.23476,12.125332 -2.089697,3.149446 -4.488981,7.479909 -4.179395,7.401179 0.309585,-0.0788 9.055364,-12.2828 15.866229,-15.432236 6.81087,-3.149436 13.621741,-7.558644 22.986687,-4.330482 9.364952,3.228184 13.776542,7.716118 15.788842,6.613829 2.0123,-1.1023 2.3993,-2.440824 1.23835,-3.936804 -1.16094,-1.495979 -9.364961,-8.818417 -21.051797,-7.322434 z"
+       id="path1020"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#fd7aff;fill-opacity:1;stroke:none;stroke-width:0.309114px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 72.107699,130.12526 c 0.65673,0.33404 5.58219,8.90795 9.522571,10.35548 3.940372,1.44755 6.567286,1.55888 7.005104,2.227 0.437821,0.66809 0.328367,4.00858 3.830921,5.45614 3.502555,1.44753 19.920785,6.01284 24.627325,6.45824 4.70658,0.4454 0.76621,3.22911 3.61202,4.23125 2.84584,1.00217 14.99532,1.5589 17.95061,0.33405 2.95527,-1.22483 2.95527,1.1135 -2.1891,3.1178 -5.14437,2.00427 -18.71677,6.79231 -27.58261,5.67882 -8.86586,-1.1135 -19.373526,-3.00644 -25.284086,-7.23772 -5.910565,-4.23126 -8.42802,-6.1242 -6.238924,-6.45824 2.189096,-0.33407 7.990199,5.9015 10.507662,6.56959 2.517463,0.66809 4.597103,0.66809 3.064735,-0.8908 -1.532366,-1.55888 -11.492755,-8.46253 -12.477849,-8.1285 -0.985092,0.33405 -3.064737,0.55674 -4.816012,-1.78159 -1.751278,-2.33832 -10.945484,-15.25485 -10.39821,-22.1585 0.547273,-6.90365 2.298552,-5.12208 4.378195,-2.56103 2.079641,2.56103 4.487648,4.78801 4.487648,4.78801 z"
+       id="path1022"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>

src/assets/json/features.json

@@ -20,6 +20,6 @@
             "description": "Fix 1 detailed description..."
         }
     ],
-    "linkUrl": "https://gitee.com/deepin-community-store/spark-store/releases/",
+    "linkUrl": "https://gitee.com/spark-store-project/spark-store/releases/",
     "linkButtonVisible": true
 }

src/assets/tags/logo_icon.svg

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="32px" height="32px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>logo icon</title>
-    <defs>
-        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
-            <stop stop-color="#00F1FF" offset="0%"></stop>
-            <stop stop-color="#008AFF" offset="100%"></stop>
-        </linearGradient>
-    </defs>
-    <g id="light" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="1" transform="translate(-460.000000, -159.000000)">
-            <g id="tittlebar" transform="translate(450.000000, 150.000000)">
-                <g id="logo-icon" transform="translate(10.000000, 9.000000)">
-                    <g>
-                        <rect id="矩形" fill="url(#linearGradient-1)" x="0" y="0" width="32" height="32" rx="8"></rect>
-                        <path d="M23,25 L23,24.0002278 C21.6666667,24.0002278 21,24.0002278 21,24.0002278 L21,20 L22,20 L22,19 L21,19 L21,17 L20,17.5 L20,19 L19,19 L19,20 L20,20 L20,24.0002278 C20,24.0002278 20,24.0002278 20,24.0002278 C20,24.5523868 20.4476132,25 20.9997722,25 C20.9998481,25 20.9999241,25 21,25 L23,25 Z M24.0210414,23.9789586 L24.0210414,22.2215556 L24.0210414,22.2215556 L24.6565969,21.6226667 L27.2207674,25 L29.0052118,25 L25.6099302,20.7304444 L28.4678057,18.0074755 L26.6711391,18.0074755 L24.0210414,20.6204444 L24,15.5 L23,15 L23,25 C23.5639056,25 24.0210414,24.5428642 24.0210414,23.9789586 Z" id="tk" fill="#FFFFFF" fill-rule="nonzero"></path>
-                        <path d="M10.275,24 C13.175,24 15.35,23.2 16.85,21.6 C18.275,20.075 19,17.825 19,15 C19,12.15 18.275,10.05 16.85,8.55 C15.35,6.95 13.175,6 10.275,6 L4,6 L4,24 L10.275,24 Z M9.725,21 L7,21 L7,9 L9.725,9 C11.95,9 13.575,9.15 14.6,10.175 C15.6,11.175 16,12.75 16,15 C16,17.2 15.6,18.9 14.6,19.95 C13.575,20.975 11.95,21 9.725,21 Z" id="D" fill="#FFFFFF" fill-rule="nonzero"></path>
-                    </g>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>

src/assets/tags/uos-authorize.svg

@@ -1,13 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
-  <defs>
-    <linearGradient id="uos-托盘1-a" x1="15.968%" x2="100%" y1="14.224%" y2="60.554%">
-      <stop offset="0%" stop-color="#0071FF"/>
-      <stop offset="48.72%" stop-color="#00E8FC"/>
-      <stop offset="100%" stop-color="#00A2FF"/>
-    </linearGradient>
-  </defs>
-  <g fill="none" transform="translate(1 1)">
-    <circle cx="9" cy="9" r="9" fill="url(#uos-托盘1-a)"/>
-    <path fill="#FFF" d="M13,4.5 C13.5128358,4.5 13.9355072,4.88604019 13.9932723,5.38337887 L14,5.5 L14,9.5 C14,12.5 12,14.5 9,14.5 C6,14.5 4,12.5 4.0043492,9.70016408 L4,9.5 L4,5.5 C4,4.94771525 4.44771525,4.5 5,4.5 C5.51283584,4.5 5.93550716,4.88604019 5.99327227,5.38337887 L6,5.5 L6,9.5 C6,11.5 7.5,12.5 9,12.5 C10.5,12.5 12,11.5 12,9.5 L12,5.5 C12,4.94771525 12.4477153,4.5 13,4.5 Z"/>
-  </g>
-</svg>

src/backend/DataCollectorAndUploader.cpp

@@ -66,7 +66,7 @@ void DataCollectorAndUploader::collectData()
 
     // Initialize a network request
     QNetworkAccessManager *manager = new QNetworkAccessManager(this);
-    QUrl url("http://zunyun01.store.deepinos.org.cn:12345");
+    QUrl url("https://status.deepinos.org.cn/upload");
 
     QNetworkRequest request(url);
     request.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");

src/backend/downloadworker.cpp

@@ -120,6 +120,8 @@ void DownloadController::startDownload(const QString &url)
         QString downloadDir = "/tmp/spark-store/"; //下载目录
         QString aria2ConnectionPerServer = "--max-connection-per-server=1"; //每个服务器最大连接数
         QString aria2ConnectionMax = "--max-concurrent-downloads=16"; //最大同时下载数
+        QString aria2ConnectionTimeout = "--connect-timeout=5"; // 5 秒服务器连接超时
+        QString aria2MaxRetry = "--max-tries=1"; //设置最大重试次数
 
 
         if (useMetalink) //如果是metalink
@@ -147,6 +149,8 @@ void DownloadController::startDownload(const QString &url)
         command.append(aria2SizePerThreads.toUtf8());
         command.append(aria2ConnectionPerServer.toUtf8());
         command.append(aria2ConnectionMax.toUtf8());
+        command.append(aria2ConnectionTimeout.toUtf8());
+        command.append(aria2MaxRetry.toUtf8());
 
         if (useMetalink)
         {

src/backend/sparkapi.cpp

@@ -10,6 +10,8 @@ QString SparkAPI::serverUrl = "";
 
 #elif __aarch64__
     QString SparkAPI::serverUrlDir = "aarch64-store";
+#elif __loongarch__
+    QString SparkAPI::serverUrlDir = "loong64-store";
 #endif
 
 SparkAPI::SparkAPI(QObject *parent) : QObject(parent)
@@ -26,6 +28,7 @@ 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();
@@ -51,6 +54,7 @@ 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);

src/main.cpp

@@ -13,7 +13,6 @@
 
 #include <DSysInfo>
 #include <DApplicationSettings>
-#include <DWidgetUtil>
 
 #include <QDate>
 #include <QProcessEnvironment>
@@ -67,7 +66,7 @@ void crashHandler(int sig) {
     }
 
     logFile << "Please send this log to the developer. QQ Group: 872690351\n";
-    logFile << "Gitee: https://gitee.com/deepin-community-store/spark-store/issues\n";
+    logFile << "Gitee: https://gitee.com/spark-store-project/spark-store/issues\n";
     logFile << "Gihub: https://github.com/spark-store-project/spark-store/issues\n";
     logFile << "Build Date and Time: " << buildDateTime.toStdString() << "\n";
     gatherInfo(popen("cat ~/.config/spark-union/spark-store/config.ini", "r"), logFile, "User Config File");
@@ -77,7 +76,7 @@ void crashHandler(int sig) {
     gatherInfo(popen("LANG=en_US.UTF-8 lsb_release -a", "r"), logFile, "Distribution info");
     gatherInfo(popen("LANG=en_US.UTF-8 lscpu", "r"), logFile, "All CPU Info");
     gatherInfo(popen("LANG=en_US.UTF-8 free -h | grep Mem | awk '{print $2}'", "r"), logFile, "Memory Size");
-  
+
 
 
     logFile << "Error: signal " << sig << ":\n";
@@ -140,81 +139,37 @@ int main(int argc, char *argv[])
     // Set display backend
     Utils::setQPAPlatform();
 
-    // 龙芯机器配置,使得 DApplication 能正确加载 QTWEBENGINE
+    // 龙芯机器配置,使得 DApplication 能正确加载 QtWebEngine
     qputenv("DTK_FORCE_RASTER_WIDGETS", "FALSE");
-    // qputenv("QTWEBENGINE_CHROMIUM_FLAGS", "--disable-features=UseModernMediaControls");
-    // qputenv("QTWEBENGINE_CHROMIUM_FLAGS", "--disable-web-security");
-
 
     // 浏览器开启 GPU 支持
+    // qputenv("QTWEBENGINE_CHROMIUM_FLAGS", "--disable-features=UseModernMediaControls");
+    // qputenv("QTWEBENGINE_CHROMIUM_FLAGS", "--disable-web-security");
+    // 全平台软件渲染Webkit
+    qputenv("QTWEBENGINE_CHROMIUM_FLAGS", "--disable-gpu");
 #ifdef __sw_64__
     qputenv("QTWEBENGINE_CHROMIUM_FLAGS", "--no-sandbox");
-#elif __aarch64__
-    if (!Utils::isWayland()) {
-        QString env = QString::fromUtf8(qgetenv("QTWEBENGINE_CHROMIUM_FLAGS"));
-        env = env.trimmed();
-        /**
-         * NOTE: 参考帮助手册代码，对于部分ARM CPU 设备，
-         * --disable-gpu 保证 X11 环境下网页正常显示
-         * --single-process 避免 X11 环境下 QtWebEngine 崩溃（可选）
-         */
-        env += " --disable-gpu";
-        qputenv("QTWEBENGINE_CHROMIUM_FLAGS", env.trimmed().toUtf8());
-
-        QSurfaceFormat format;
-        format.setRenderableType(QSurfaceFormat::OpenGLES);
-        QSurfaceFormat::setDefaultFormat(format);
-
-        /**
-         * NOTE: https://zhuanlan.zhihu.com/p/550285855
-         * 避免 X11 环境下从 QtWebEngine 后退回到 QWidget 时黑屏闪烁
-         */
-        qputenv("QMLSCENE_DEVICE", "softwarecontext");
-        DApplication::setAttribute(Qt::AA_UseSoftwareOpenGL);
-    }
 #endif
 
-
-
+#ifdef __loongarch__
+    qputenv("QTWEBENGINE_CHROMIUM_FLAGS", "--no-sandbox");
+#endif
     /**
-     * FIXME: 对于麒麟 CPU 设备，调用 QtWebEngine 会导致客户端崩溃；
-     * 暂时不对 CPU 进行判断，对 wayland 环境下统一处理
+     * NOTE: https://zhuanlan.zhihu.com/p/550285855
+     * 避免 wayland 环境下从 QtWebEngine 后退回到 QWidget 时黑屏闪烁
      */
     if (Utils::isWayland()) {
-        QString env = QString::fromUtf8(qgetenv("QTWEBENGINE_CHROMIUM_FLAGS"));
-        env = env.trimmed();
-        /**
-         * NOTE: 参考帮助手册代码，对于麒麟 CPU 设备，
-         * --disable-gpu 保证 wayland 环境下网页正常显示
-         * --single-process 避免 wayland 环境下 QtWebEngine 崩溃（可选）
-         */
-        env += " --disable-gpu";
-        qputenv("QTWEBENGINE_CHROMIUM_FLAGS", env.trimmed().toUtf8());
-
-        /**
-         * NOTE: 参考帮助手册代码，对于麒麟 CPU 设备，
-         * 避免 wayland 环境下 QtWebEngine 崩溃
-         */
-        qputenv("QT_WAYLAND_SHELL_INTEGRATION", "kwayland-shell");
-        QSurfaceFormat format;
-        format.setRenderableType(QSurfaceFormat::OpenGLES);
-        QSurfaceFormat::setDefaultFormat(format);
-
-        /**
-         * NOTE: https://zhuanlan.zhihu.com/p/550285855
-         * 避免 wayland 环境下从 QtWebEngine 后退回到 QWidget 时黑屏闪烁
-         */
         qputenv("QMLSCENE_DEVICE", "softwarecontext");
         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);
-    }
+    // 开启 Hidpi 支持
+    qDebug() << "Enable HiDPI Support.";
+    DApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
+    DApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
 #endif
 
     // 强制使用 DTK 平台插件
@@ -242,8 +197,6 @@ int main(int argc, char *argv[])
 
     MainWindow w;
     a.setMainWindow(&w); // 设置应用程序主窗口，用于初始化关于对话框
-    // 让打开时界面显示在正中
-    Dtk::Widget::moveToCenter(&w);
 
     if (argc > 1)
     {

src/mainwindow-dtk.cpp

@@ -22,10 +22,7 @@
 #define AppPageSearchlist 1
 #define AppPageAppdetail 2
 #define AppPageSettings 3
-#define WaylandSearchCenter 1
-#define OtherSearchCenter 2
-#define RightSearchSpace 1
-#define UploadServerUrl "https://upload.deepinos.org/"
+#define UploadServerUrl "https://upload.deepinos.org.cn/"
 
 MainWindow::MainWindow(QWidget *parent)
     : BaseWidgetOpacity(parent)
@@ -48,6 +45,11 @@ MainWindow::~MainWindow()
     delete ui;
 
     downloadlistwidget->deleteLater();
+
+    QSettings config(QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) + "/config.ini", QSettings::IniFormat);
+    config.setValue("window/width", width());
+    config.setValue("window/height", height());
+    config.sync();
 }
 
 void MainWindow::initDbus()
@@ -121,8 +123,29 @@ void MainWindow::closeEvent(QCloseEvent *event)
     BaseWidgetOpacity::closeEvent(event);
 }
 
+void MainWindow::changeEvent(QEvent *event)
+{
+    if (event->type() != QEvent::StyleChange) {
+        return BaseWidgetOpacity::changeEvent(event);
+    }
+
+    BaseWidgetOpacity::changeEvent(event);
+    downloadButton->setFixedSize(searchEdit->sizeHint().height(), searchEdit->sizeHint().height());
+}
+
 void MainWindow::initUI()
 {
+    QSettings config(QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) + "/config.ini", QSettings::IniFormat);
+    QSize size;
+    size.rwidth() = config.value("window/width").toInt();
+    size.rheight() = config.value("window/height").toInt();
+    if (!size.isEmpty()) {
+        resize(size);
+    }
+
+    // 让打开时界面显示在正中
+    moveToCenter(this);
+
     setWindowTitle(QObject::tr("Spark Store"));
     setMaskAlpha(250);
 
@@ -143,43 +166,49 @@ void MainWindow::initTitleBar()
     ui->titlebar->setBackgroundTransparent(true);
 
     // 初始化标题栏控件
-    DLabel *title = new DLabel(ui->titlebar);
-    title->setText(tr("Spark Store"));
+    DLabel *titleLabel = new DLabel(ui->titlebar);
+    titleLabel->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
+    titleLabel->setText(tr("Spark Store"));
 
     backButton = new DPushButton(ui->titlebar);
 
     searchEdit = new DSearchEdit(ui->titlebar);
     searchEdit->setPlaceholderText(tr("Search or enter spk://"));
+    searchEdit->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
+    searchEdit->lineEdit()->setFixedWidth(350);
 
     downloadButton = new ProgressButton(ui->titlebar);
+    downloadButton->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
     downloadButton->setDownloadListWidget(downloadlistwidget);
     downloadButton->setFocusPolicy(Qt::FocusPolicy::ClickFocus);
+    downloadButton->setFixedSize(searchEdit->sizeHint().height(), searchEdit->sizeHint().height());
     downloadlistwidget->setFocusProxy(downloadButton);
 
-    QWidget *w_titlebar = new QWidget(ui->titlebar);
-    QHBoxLayout *ly_titlebar = new QHBoxLayout(w_titlebar);
-    ly_titlebar->addWidget(title);
-    ly_titlebar->addWidget(backButton);
-    // Check wayland configs
-    QSettings config(QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) + "/config.ini", QSettings::IniFormat);
-    if (!config.value("runtime/isDDE").toBool() && config.value("runtime/useWayland").toBool())
-    {
-        // Wayland 搜索栏居中
-        ly_titlebar->addStretch(WaylandSearchCenter);
-    }
-    else
-    {
-        // dwayland dxcb 搜索栏顶部右侧居中
-        ly_titlebar->addStretch(OtherSearchCenter);
-    }
-    ly_titlebar->addWidget(searchEdit);
-    ly_titlebar->addWidget(downloadButton);
-    ly_titlebar->addStretch(RightSearchSpace);
-    ui->titlebar->setCustomWidget(w_titlebar);
+    QWidget *customWidget = new QWidget(ui->titlebar);
+    customWidget->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
+    ui->titlebar->setCustomWidget(customWidget);
+
+    QHBoxLayout *customWidgetLayout = new QHBoxLayout(customWidget);
+    customWidgetLayout->setContentsMargins(8, 0, 0, 0);
+    customWidgetLayout->setSpacing(0);
+    customWidgetLayout->addWidget(titleLabel, 0, Qt::AlignLeft);
+    customWidgetLayout->addSpacing(8);
+    customWidgetLayout->addWidget(backButton, 0, Qt::AlignLeft);
+    QWidget *centralWidget = new QWidget(customWidget);
+    centralWidget->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
+    customWidgetLayout->addWidget(centralWidget, 1, Qt::AlignHCenter);
+
+    QHBoxLayout *centralLayout = new QHBoxLayout(centralWidget);
+    centralLayout->setContentsMargins(20, 0, 10, 0);
+    centralLayout->setSpacing(0);
+
+    centralLayout->addWidget(searchEdit, 0, Qt::AlignHCenter);
+    centralLayout->addSpacing(10);
+    centralLayout->addWidget(downloadButton, 0, Qt::AlignHCenter);
 
     initTitleBarMenu();
 
-    backButton->hide();
+    backButton->setDisabled(true);
     downloadlistwidget->hide();
 }
 
@@ -335,9 +364,9 @@ void MainWindow::initConnections()
         ui->stackedWidget->setCurrentIndex(pageHistory.at(pageHistory.count() - 2));
         pageHistory.removeLast();
         if (pageHistory.count() > 1) {
-            backButton->show();
+            backButton->setEnabled(true);
         } else {
-            backButton->hide();
+            backButton->setDisabled(true);
         } });
 
     // 搜索事件
@@ -428,11 +457,11 @@ void MainWindow::switchPage(int now) // 临时方案，回家后修改
     qDebug() << pageHistory.count();
     if (pageHistory.count() >= 1)
     {
-        backButton->show();
+        backButton->setEnabled(true);
     }
     else
     {
-        backButton->hide();
+        backButton->setDisabled(true);
     }
     ui->stackedWidget->setCurrentIndex(now);
     ui->stackedWidget->currentWidget()->setFocus();
@@ -493,9 +522,13 @@ 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())
+    // 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([=]

src/mainwindow-dtk.h

@@ -34,6 +34,7 @@ public:
 
 protected:
     void closeEvent(QCloseEvent *event) override;
+    void changeEvent(QEvent *event) override;
 
 private:
     void initUI();

src/pages/appintopage.cpp

@@ -13,6 +13,7 @@
 #include <QFile>
 
 #include <DSysInfo>
+#include <QAtomicInt>
 
 AppIntoPage::AppIntoPage(QWidget *parent)
     : QWidget(parent)
@@ -21,6 +22,7 @@ AppIntoPage::AppIntoPage(QWidget *parent)
 {
     initUI();
     initConnections();
+    m_userAgent = QString("Mozilla/5.0 Spark-Store/" + QString(APP_VERSION) + " (Linux;  " + QSysInfo::prettyProductName().toUtf8() + ";)").toLatin1();
 }
 
 AppIntoPage::~AppIntoPage()
@@ -53,29 +55,39 @@ void AppIntoPage::openUrl(const QUrl &url)
         ui->label_2->setText(info["More"].toString());
 
         // 显示 tags
-        QStringList taglist = info["Tags"].toString().split(";", QString::SkipEmptyParts);
+        #if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
+            QStringList taglist = info["Tags"].toString().split(";", Qt::SkipEmptyParts);
+        #else
+            QStringList taglist = info["Tags"].toString().split(";", QString::SkipEmptyParts);
+        #endif
+
         setAppinfoTags(taglist);
 
-        // 获取图标
-        QNetworkRequest request;
-        QNetworkAccessManager *manager = new QNetworkAccessManager(this);
+        // 获取图标和截图
         QString pkgUrlBase = api->getImgServerUrl() + SparkAPI::getArchDir() + url.path();
-        qDebug() << "Icon URL: " << pkgUrlBase + "/icon.png";
-        request.setUrl(QUrl(pkgUrlBase + "/icon.png"));
-        request.setRawHeader("User-Agent", "Mozilla/5.0");
-        request.setRawHeader("Content-Type", "charset='utf-8'");
-        manager->get(request);
-        QObject::connect(manager, &QNetworkAccessManager::finished, [=](QNetworkReply *reply)
-            {
-                QByteArray jpegData = reply->readAll();
-                iconpixmap.loadFromData(jpegData);
-                iconpixmap.scaled(210, 200, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
-                ui->icon->setPixmap(iconpixmap);
-                ui->icon->setScaledContents(true);
+        // 创建网络请求管理器
+        QNetworkAccessManager *iconManager = new QNetworkAccessManager(this);
 
-                manager->deleteLater(); });
+        // 获取图标
+        QNetworkRequest iconRequest;
+        iconRequest.setUrl(QUrl(pkgUrlBase + "/icon.png"));
+        iconRequest.setHeader(QNetworkRequest::UserAgentHeader, m_userAgent);
+        iconRequest.setHeader(QNetworkRequest::ContentTypeHeader, "charset='utf-8'");
+        iconRequest.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true);
+
+        iconManager->get(iconRequest);
+        QObject::connect(iconManager, &QNetworkAccessManager::finished, [=](QNetworkReply *reply)
+        {
+            QByteArray jpegData = reply->readAll();
+            iconpixmap.loadFromData(jpegData);
+            iconpixmap = iconpixmap.scaled(210, 200, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
+            ui->icon->setPixmap(iconpixmap);
+            ui->icon->setScaledContents(true);
+
+            iconManager->deleteLater();
+            reply->deleteLater();
+        });
 
-        // 获取截图
 
         for (int i = 0; i < 5 /* 魔法数字，最多五个截图 */; i++)
         {
@@ -83,8 +95,9 @@ void AppIntoPage::openUrl(const QUrl &url)
             QNetworkRequest request;
             QNetworkAccessManager *manager = new QNetworkAccessManager(this);
             request.setUrl(QUrl(imgUrl));
-            request.setRawHeader("User-Agent", "Mozilla/5.0");
-            request.setRawHeader("Content-Type", "charset='utf-8'");
+            request.setHeader(QNetworkRequest::UserAgentHeader, m_userAgent);
+            request.setHeader(QNetworkRequest::ContentTypeHeader, "charset='utf-8'");
+            request.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true);
             manager->get(request);
             QObject::connect(manager, &QNetworkAccessManager::finished, [=](QNetworkReply *reply)
                 {
@@ -98,18 +111,23 @@ void AppIntoPage::openUrl(const QUrl &url)
                         // img->setScaledContents(true);
                         QListWidgetItem *pItem = new QListWidgetItem();
                         pItem->setSizeHint(QSize(280, 200));
-                        ui->listWidget->addItem(pItem);
+                        ui->listWidget->insertItem(i, pItem);
                         ui->listWidget->setItemWidget(pItem, img);
                         qDebug() << imgUrl;
                     }
 
-                    manager->deleteLater(); 
+                    manager->deleteLater();
                 });
         }
 
+
+        /**
+         * 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()){
+        // 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!";
             ui->downloadButton->setText(tr("Developer Mode Disabled"));
             ui->downloadButton->setEnabled(false);
@@ -121,11 +139,15 @@ void AppIntoPage::openUrl(const QUrl &url)
             bool isInstalled;
             bool isUpdated;
             QString packagename = info["Pkgname"].toString();
-            isInstall.start("dpkg", QStringList() << "-s" << info["Pkgname"].toString());
+            isInstall.start("/opt/durapps/spark-store/bin/store-helper/check-is-installed", QStringList() << info["Pkgname"].toString());
             qDebug() << info["Pkgname"].toString();
             isInstall.waitForFinished(180 * 1000); // 默认超时 3 分钟
-            int error = QString::fromStdString(isInstall.readAllStandardError().toStdString()).length();
-            if (error == 0)
+
+            int exitCode = isInstall.exitCode();
+            QProcess::ExitStatus exitStatus = isInstall.exitStatus();
+            isInstall.close();
+
+            if (exitCode == 0 && exitStatus == QProcess::NormalExit)
             {
                 isInstalled = true;
 
@@ -138,7 +160,7 @@ void AppIntoPage::openUrl(const QUrl &url)
 
                 isUpdate.start("dpkg", QStringList() << "--compare-versions" << localVersion << "ge" << info["Version"].toString());
                 isUpdate.waitForFinished(180 * 1000); // 默认超时 3 分钟
-                if (!isUpdate.exitCode())
+                if (isUpdate.exitCode() == 0 && isUpdate.exitStatus() == QProcess::NormalExit)
                 {
                     isUpdated = true;
                 }
@@ -146,6 +168,7 @@ void AppIntoPage::openUrl(const QUrl &url)
                 {
                     isUpdated = false;
                 }
+                isUpdate.close();
             }
             else
             {
@@ -157,7 +180,19 @@ void AppIntoPage::openUrl(const QUrl &url)
             {
                 if (isUpdated)
                 {
-                    ui->downloadButton->setText(tr("Reinstall"));
+                    QProcess process;
+                    QStringList arguments;
+                    arguments << "check" << info["Pkgname"].toString();
+                    process.start("/opt/durapps/spark-store/bin/store-helper/ss-launcher", arguments);
+                    if (process.waitForFinished()) {
+                            exitCode = process.exitCode();
+                            exitStatus = process.exitStatus();
+                            if (exitCode != 0){
+                                ui->downloadButton->setText(tr("Reinstall"));
+                            }else{
+                                ui->downloadButton->setText(tr("Launch"));
+                            }
+                    }
                     ui->downloadButton->setEnabled(true);
                     ui->downloadButton->show();
                     ui->pushButton_3->show();
@@ -196,6 +231,7 @@ void AppIntoPage::clear()
     ui->tag_deepin->hide();
     ui->tag_dwine2->hide();
     ui->tag_dwine5->hide();
+    ui->tag_debian->hide();
     ui->tag_ubuntu->hide();
     ui->tag_community->hide();
     ui->icon->clear();
@@ -264,8 +300,10 @@ void AppIntoPage::setDownloadWidget(DownloadListWidget *w)
     }
 
     dw = w;
-    connect(w, &DownloadListWidget::downloadFinished, [=]()
-    { isDownloading(SparkAPI::getServerUrl() + SparkAPI::getArchDir() + spk.path() + "/" + info["Filename"].toString()); });
+    connect(w, &DownloadListWidget::downloadFinished, this, [=]() {
+            isDownloading(SparkAPI::getServerUrl() + SparkAPI::getArchDir() + spk.path() + "/" + info["Filename"].toString());
+        },
+            Qt::QueuedConnection);
 }
 
 void AppIntoPage::initUI()
@@ -325,10 +363,38 @@ void AppIntoPage::isDownloading(const QUrl &url)
     }
     if (item->download == 3)
     {
-        ui->downloadButton->setEnabled(true);
-        ui->downloadButton->setText(tr("Reinstall"));
-        ui->downloadButton->show();
-        ui->pushButton_3->show();
+        QString packageName = info["Pkgname"].toString();
+        QProcess process;
+        process.start("/opt/durapps/spark-store/bin/store-helper/check-is-installed", {packageName});
+        process.waitForFinished(-1);
+
+        int exitCode = process.exitCode();
+        QProcess::ExitStatus exitStatus = process.exitStatus();
+
+        if (exitCode == 0 && exitStatus == QProcess::NormalExit)
+        {
+            QStringList arguments;
+            arguments << "check" << info["Pkgname"].toString();
+            process.start("/opt/durapps/spark-store/bin/store-helper/ss-launcher", arguments);
+            if (process.waitForFinished()) {
+                    exitCode = process.exitCode();
+                    exitStatus = process.exitStatus();
+                    if (exitCode != 0){
+                        ui->downloadButton->setText(tr("Reinstall"));
+                    }else{
+                        ui->downloadButton->setText(tr("Launch"));
+                    }
+            }
+            ui->downloadButton->setEnabled(true);
+            ui->downloadButton->show();
+            ui->pushButton_3->show();
+            process.close();
+        }
+        else
+        {
+            ui->downloadButton->setEnabled(true);
+            ui->downloadButton->setText(tr("Download and Install"));
+        }
     }
 }
 
@@ -337,12 +403,18 @@ void AppIntoPage::setAppinfoTags(const QStringList &tagList)
     bool ubuntuSupport = false;
     bool deepinSupport = false;
     bool uosSupport = false;
+    bool debianSupport = false;
     foreach (const QString &tag, tagList)
     {
         if (tag == "community")
         {
             ui->tag_community->show();
         }
+        else if (tag == "debian")
+        {
+            ui->tag_debian->show();
+            debianSupport = true;
+        }
         else if (tag == "ubuntu")
         {
             ui->tag_ubuntu->show();
@@ -376,10 +448,10 @@ void AppIntoPage::setAppinfoTags(const QStringList &tagList)
             ui->tag_a2d->show();
         }
     }
-    notifyUserUnsupportedTags(ubuntuSupport, deepinSupport, uosSupport);
+    notifyUserUnsupportedTags(ubuntuSupport, deepinSupport, uosSupport ,debianSupport);
 }
 
-void AppIntoPage::notifyUserUnsupportedTags(bool ubuntuSupport, bool deepinSupport, bool uosSupport)
+void AppIntoPage::notifyUserUnsupportedTags(bool ubuntuSupport, bool deepinSupport, bool uosSupport, bool debianSupport)
 {
     if (!SettingsPage::needUncompatibleNotification) {
         return;
@@ -390,40 +462,45 @@ void AppIntoPage::notifyUserUnsupportedTags(bool ubuntuSupport, bool deepinSuppo
     bool checkdeepin = (isDeepin && !deepinSupport);
     bool checkuos = (isUOS && !uosSupport);
     bool isUbuntu = false;
+    bool isDebian = false;
     if (!checkdeepin && !checkuos)
     {
-        // 检查是否为 ubuntu 系统
-        QFile lsb("/etc/lsb-release");
-        if (!lsb.open(QIODevice::ReadOnly))
-        {
-            qDebug() << "打开 /etc/lsb-release 失败";
-        }
-        else if (lsb.readAll().contains("Ubuntu"))
-        {
-            isUbuntu = true;
-            lsb.close();
+        // 使用更可靠的/etc/os-release检测
+        QFile osRelease("/etc/os-release");
+        if (osRelease.open(QIODevice::ReadOnly)) {
+            QString content = osRelease.readAll();
+            isUbuntu = content.contains("ID=ubuntu");
+            isDebian = content.contains("ID=debian") || content.contains("ID_LIKE=debian"); // 合并Debian系检测
+            osRelease.close();
         }
     }
+
     bool checkubuntu = (isUbuntu && !ubuntuSupport);
+    bool checkdebian = (isDebian && !debianSupport);
 
     if (checkdeepin)
     {
-        Utils::sendNotification("spark-store", tr("Warning"), tr("The current application does not support deepin, there may be problems"));
+        Utils::sendNotification("spark-store", tr("Warning"), tr("The current application does not support or tested on deepin, there may be problems"));
     }
     else if (checkuos)
     {
-        Utils::sendNotification("spark-store", tr("Warning"), tr("The current application does not support UOS, there may be problems"));
+        Utils::sendNotification("spark-store", tr("Warning"), tr("The current application does not support or tested on UOS, there may be problems"));
     }
     else if (checkubuntu)
     {
-        Utils::sendNotification("spark-store", tr("Warning"), tr("The current application does not support Ubuntu, there may be problems"));
+        Utils::sendNotification("spark-store", tr("Warning"), tr("The current application does not support or tested on Ubuntu, there may be problems"));
     }
-    else if (!isUbuntu && !isDeepin && !isUOS)
+    else if (checkdebian)
     {
-        Utils::sendNotification("spark-store", tr("Warning"), tr("The current application does not support current platform, there may be problems"));
+        Utils::sendNotification("spark-store", tr("Warning"), tr("The current application does not support or tested on Debian, there may be problems"));
+    }
+    if (!isUbuntu && !isDeepin && !isUOS && !isDebian)
+    {
+        Utils::sendNotification("spark-store", tr("Warning"), tr("The current application does not support or tested on current platform, there may be problems"));
     }
 
     return;
+
 }
 
 void AppIntoPage::on_downloadButton_clicked()
@@ -437,13 +514,25 @@ void AppIntoPage::on_downloadButton_clicked()
             return;
         }
 
-        connect(item, &DownloadItem::finished, [=]() { isDownloading(downloadUrl); });
+        connect(item, &DownloadItem::finished, this, [=]() {
+                isDownloading(downloadUrl);
+            },
+                Qt::QueuedConnection);
 
         item->install(0);
         isDownloading(downloadUrl);
 
         return;
     }
+    else if (ui->downloadButton->text() == tr("Launch"))
+    {
+        QString scriptPath = "/opt/durapps/spark-store/bin/store-helper/ss-launcher";
+        QStringList arguments;
+        arguments << "launch" << info["Pkgname"].toString();
+        QProcess process;
+        process.startDetached(scriptPath, arguments);
+        return;
+    }
 
     emit clickedDownloadBtn();
 
@@ -452,13 +541,15 @@ void AppIntoPage::on_downloadButton_clicked()
     {
         return;
     }
-
     if (ui->downloadButton->text() == tr("Reinstall"))
     {
         item->reinstall = true;
     }
     ui->downloadButton->setEnabled(false);
-    connect(item, &DownloadItem::finished, [=]() { isDownloading(downloadUrl); });
+    connect(item, &DownloadItem::finished, this, [=]() {
+        isDownloading(downloadUrl);
+    },
+        Qt::QueuedConnection);
 
     isDownloading(downloadUrl);
 }
@@ -471,24 +562,26 @@ void AppIntoPage::on_pushButton_3_clicked()
         ui->pushButton_3->setEnabled(false);
 
         QProcess uninstall;
-        uninstall.start("pkexec", QStringList() << "apt" << "autopurge" << "-y" << info["Pkgname"].toString().toLower());
+        uninstall.start("pkexec", QStringList() << "/opt/durapps/spark-store/bin/store-helper/uninstaller" << info["Pkgname"].toString().toLower());
         uninstall.waitForFinished(-1);
+        uninstall.close();
 
         QProcess check;
         check.start("dpkg", QStringList() << "-s" << info["Pkgname"].toString().toLower());
-        check.waitForFinished(10*1000);
+        check.waitForFinished(-1);
 
-        if (check.readAllStandardOutput().isEmpty())
+        if (check.exitCode() != 0 || check.exitStatus() != QProcess::NormalExit)
         {
             ui->downloadButton->setText(tr("Download and Install"));
             ui->pushButton_3->hide();
 
-            updatesEnabled();
             Utils::sendNotification("spark-store",tr("Spark Store"),tr("Uninstall succeeded"));
         }
 
         ui->downloadButton->setEnabled(true);
         ui->pushButton_3->setEnabled(true);
+
+        check.close();
     });
 }
 
@@ -502,16 +595,6 @@ void AppIntoPage::on_shareButton_clicked()
 
 void AppIntoPage::on_updateButton_clicked()
 {
-    QString feedbackSpk = "spk://store/chat/store.spark-app.feedback";
-    QFileInfo actionSubmissionClientStatus("/opt/durapps/store.spark-app.feedback");
-    if (actionSubmissionClientStatus.exists() && actionSubmissionClientStatus.isDir())
-    {
-        qDebug() << "反馈器存在";
-        QProcess::startDetached("sh", QStringList() << "/opt/durapps/store.spark-app.feedback/launch.sh");
-    }
-    else
-    {
-        qDebug() << "反馈器不存在，跳转页面";
-        openUrl(feedbackSpk);
-    }
-}
+    QString feedbackURL = "https://bbs.spark-app.store/";
+    QProcess::startDetached("xdg-open", QStringList{feedbackURL});
+}

src/pages/appintopage.h

@@ -29,7 +29,7 @@ private:
     void initConnections();
     void isDownloading(const QUrl &url);
     void setAppinfoTags(const QStringList &tagList);
-    void notifyUserUnsupportedTags(bool ubuntuSupport, bool deepinSupport, bool uosSupport);
+    void notifyUserUnsupportedTags(bool ubuntuSupport, bool deepinSupport, bool uosSupport, bool debianSupport);
 
 signals:
     void clickedDownloadBtn();
@@ -49,6 +49,8 @@ private:
     QJsonObject info;
     QPixmap iconpixmap;
     QUrl spk;
+
+    QByteArray m_userAgent;
 };
 
 #endif // APPINTOPAGE_H

src/pages/appintopage.ui

@@ -160,7 +160,6 @@
            <property name="font">
             <font>
              <pointsize>14</pointsize>
-             <weight>75</weight>
              <bold>true</bold>
             </font>
            </property>
@@ -369,24 +368,124 @@
            <property name="orientation">
             <enum>Qt::Vertical</enum>
            </property>
-           <property name="sizeType">
-            <enum>QSizePolicy::Expanding</enum>
-           </property>
            <property name="sizeHint" stdset="0">
             <size>
              <width>20</width>
-             <height>20</height>
+             <height>40</height>
             </size>
            </property>
           </spacer>
          </item>
          <item>
           <layout class="QHBoxLayout" name="horizontalLayout_4">
-           <property name="topMargin">
-            <number>0</number>
-           </property>
+           <item>
+            <spacer name="horizontalSpacer_6">
+             <property name="orientation">
+              <enum>Qt::Horizontal</enum>
+             </property>
+             <property name="sizeHint" stdset="0">
+              <size>
+               <width>184</width>
+               <height>20</height>
+              </size>
+             </property>
+            </spacer>
+           </item>
+           <item>
+            <widget class="QLabel" name="tag_ubuntu">
+             <property name="maximumSize">
+              <size>
+               <width>40</width>
+               <height>40</height>
+              </size>
+             </property>
+             <property name="toolTip">
+              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Capable to Ubuntu 22.04&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+             </property>
+             <property name="whatsThis">
+              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Capable to Ubuntu 22.04&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+             </property>
+             <property name="pixmap">
+              <pixmap resource="../assets/assets.qrc">:/tags/ubuntu.png</pixmap>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QLabel" name="tag_uos">
+             <property name="maximumSize">
+              <size>
+               <width>40</width>
+               <height>40</height>
+              </size>
+             </property>
+             <property name="toolTip">
+              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Capable to UOS home 20&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+             </property>
+             <property name="whatsThis">
+              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Capable to UOS home 20&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+             </property>
+             <property name="pixmap">
+              <pixmap resource="../assets/assets.qrc">:/tags/uos.png</pixmap>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QLabel" name="tag_deepin">
+             <property name="maximumSize">
+              <size>
+               <width>40</width>
+               <height>40</height>
+              </size>
+             </property>
+             <property name="toolTip">
+              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Capable to deepin 23&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+             </property>
+             <property name="whatsThis">
+              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Capable to deepin 23&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+             </property>
+             <property name="pixmap">
+              <pixmap resource="../assets/assets.qrc">:/tags/deepin.png</pixmap>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QLabel" name="tag_debian">
+             <property name="maximumSize">
+              <size>
+               <width>40</width>
+               <height>40</height>
+              </size>
+             </property>
+             <property name="toolTip">
+              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Capable to Debian Stable&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+             </property>
+             <property name="whatsThis">
+              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Capable to Debian Stable&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+             </property>
+             <property name="pixmap">
+              <pixmap resource="../assets/assets.qrc">:/tags/debian.png</pixmap>
+             </property>
+            </widget>
+           </item>
            <item>
             <spacer name="horizontalSpacer_5">
+             <property name="orientation">
+              <enum>Qt::Horizontal</enum>
+             </property>
+             <property name="sizeHint" stdset="0">
+              <size>
+               <width>184</width>
+               <height>20</height>
+              </size>
+             </property>
+            </spacer>
+           </item>
+          </layout>
+         </item>
+         <item>
+          <layout class="QHBoxLayout" name="horizontalLayout_13">
+           <item>
+            <spacer name="horizontalSpacer_13">
              <property name="orientation">
               <enum>Qt::Horizontal</enum>
              </property>
@@ -398,12 +497,31 @@
              </property>
             </spacer>
            </item>
+           <item>
+            <widget class="QLabel" name="tag_a2d">
+             <property name="maximumSize">
+              <size>
+               <width>40</width>
+               <height>40</height>
+              </size>
+             </property>
+             <property name="toolTip">
+              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;An Appimage to deb app.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+             </property>
+             <property name="whatsThis">
+              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;An Appimage to deb app.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+             </property>
+             <property name="pixmap">
+              <pixmap resource="../assets/assets.qrc">:/tags/a2d.png</pixmap>
+             </property>
+            </widget>
+           </item>
            <item>
             <widget class="QLabel" name="tag_community">
              <property name="maximumSize">
               <size>
-               <width>30</width>
-               <height>16777215</height>
+               <width>40</width>
+               <height>40</height>
               </size>
              </property>
              <property name="toolTip">
@@ -412,65 +530,8 @@
              <property name="whatsThis">
               <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This app is developed by community user,we give this tag to honor those who contribute to the Linux Ecology&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
              </property>
-             <property name="text">
-              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;img src=&quot;:/tags/community-small.png&quot;/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QLabel" name="tag_ubuntu">
-             <property name="maximumSize">
-              <size>
-               <width>30</width>
-               <height>16777215</height>
-              </size>
-             </property>
-             <property name="toolTip">
-              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Capable to Ubuntu 22.04&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-             </property>
-             <property name="whatsThis">
-              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Capable to Ubuntu 22.04&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-             </property>
-             <property name="text">
-              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;img src=&quot;:/tags/ubuntu-small.png&quot;/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QLabel" name="tag_uos">
-             <property name="maximumSize">
-              <size>
-               <width>30</width>
-               <height>16777215</height>
-              </size>
-             </property>
-             <property name="toolTip">
-              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Capable to UOS home 20&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-             </property>
-             <property name="whatsThis">
-              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Capable to UOS home 20&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-             </property>
-             <property name="text">
-              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;img src=&quot;:/tags/uos-small.png&quot;/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QLabel" name="tag_dwine2">
-             <property name="maximumSize">
-              <size>
-               <width>30</width>
-               <height>16777215</height>
-              </size>
-             </property>
-             <property name="toolTip">
-              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;A deepin-wine2 app. Spark Store will automatically configure the wine kit for you.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-             </property>
-             <property name="whatsThis">
-              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;A deepin-wine2 app. Spark Store will automatically configure the wine kit for you.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-             </property>
-             <property name="text">
-              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;img src=&quot;:/tags/dwine2-small.png&quot;/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+             <property name="pixmap">
+              <pixmap resource="../assets/assets.qrc">:/tags/community.png</pixmap>
              </property>
             </widget>
            </item>
@@ -478,8 +539,8 @@
             <widget class="QLabel" name="tag_dtk5">
              <property name="maximumSize">
               <size>
-               <width>30</width>
-               <height>16777215</height>
+               <width>40</width>
+               <height>40</height>
               </size>
              </property>
              <property name="toolTip">
@@ -488,46 +549,27 @@
              <property name="whatsThis">
               <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is a  DTK5 app,which means it would have better effect on Deepin Desktop Environment&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
              </property>
-             <property name="text">
-              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;img src=&quot;:/tags/dtk-small.png&quot;/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+             <property name="pixmap">
+              <pixmap resource="../assets/assets.qrc">:/tags/dtk.png</pixmap>
              </property>
             </widget>
            </item>
            <item>
-            <widget class="QLabel" name="tag_deepin">
+            <widget class="QLabel" name="tag_dwine2">
              <property name="maximumSize">
               <size>
-               <width>30</width>
-               <height>16777215</height>
+               <width>40</width>
+               <height>40</height>
               </size>
              </property>
              <property name="toolTip">
-              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Capable to deepin 20&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;A deepin-wine2 app. Spark Store will automatically configure the wine kit for you.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
              </property>
              <property name="whatsThis">
-              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Capable to deepin 20&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;A deepin-wine2 app. Spark Store will automatically configure the wine kit for you.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
              </property>
-             <property name="text">
-              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;img src=&quot;:/tags/deepin-small.png&quot;/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QLabel" name="tag_a2d">
-             <property name="maximumSize">
-              <size>
-               <width>30</width>
-               <height>16777215</height>
-              </size>
-             </property>
-             <property name="toolTip">
-              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;An Appimage to deb app.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-             </property>
-             <property name="whatsThis">
-              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;An Appimage to deb app.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-             </property>
-             <property name="text">
-              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;img src=&quot;:/tags/a2d-small.png&quot;/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+             <property name="pixmap">
+              <pixmap resource="../assets/assets.qrc">:/tags/dwine2.png</pixmap>
              </property>
             </widget>
            </item>
@@ -535,8 +577,8 @@
             <widget class="QLabel" name="tag_dwine5">
              <property name="maximumSize">
               <size>
-               <width>30</width>
-               <height>16777215</height>
+               <width>40</width>
+               <height>40</height>
               </size>
              </property>
              <property name="toolTip">
@@ -545,13 +587,13 @@
              <property name="whatsThis">
               <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;A Wine app.Spark Store will automatically configure the wine kit for you&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
              </property>
-             <property name="text">
-              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;img src=&quot;:/tags/dwine5-small.png&quot;/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+             <property name="pixmap">
+              <pixmap resource="../assets/assets.qrc">:/tags/dwine5.png</pixmap>
              </property>
             </widget>
            </item>
            <item>
-            <spacer name="horizontalSpacer_6">
+            <spacer name="horizontalSpacer_14">
              <property name="orientation">
               <enum>Qt::Horizontal</enum>
              </property>
@@ -676,7 +718,7 @@
           <rect>
            <x>0</x>
            <y>0</y>
-           <width>482</width>
+           <width>524</width>
            <height>601</height>
           </rect>
          </property>
@@ -757,7 +799,6 @@
                  <property name="font">
                   <font>
                    <pointsize>12</pointsize>
-                   <weight>75</weight>
                    <bold>true</bold>
                   </font>
                  </property>
@@ -895,7 +936,6 @@
                  <property name="font">
                   <font>
                    <pointsize>12</pointsize>
-                   <weight>75</weight>
                    <bold>true</bold>
                   </font>
                  </property>
@@ -1060,7 +1100,6 @@ QListWidget::item::selected
                  <property name="font">
                   <font>
                    <pointsize>12</pointsize>
-                   <weight>75</weight>
                    <bold>true</bold>
                   </font>
                  </property>
@@ -1413,6 +1452,8 @@ QListWidget::item::selected
    </item>
   </layout>
  </widget>
- <resources/>
+ <resources>
+  <include location="../assets/assets.qrc"/>
+ </resources>
  <connections/>
 </ui>

src/pages/applistpage.cpp

@@ -1,108 +1,105 @@
-#include "applistpage.h"
-#include "ui_applistpage.h"
-
-
-
-AppListPage::AppListPage(QWidget *parent) : QWidget(parent),
-                                            ui(new Ui::AppListPage)
-{
-    ui->setupUi(this);
-    ui->webEngineView->page()->setBackgroundColor(Qt::transparent);
-}
-void AppListPage::setTheme(bool dark)
-{
-    isDark = dark;
-    if (dark)
-    {
-        this->setStyleSheet("#frame{background-color: #252525;border-radius:14px;border:1px solid rgb(64, 64, 64);}");
-    }
-    else
-    {
-        // 亮色模式
-        this->setStyleSheet("#frame{background-color: #ffffff;border-radius:14px;border:1px solid rgb(229,229,229);}");
-    }
-    if (isSearch)
-    {
-        getSearchList(nowType);
-    }
-    else
-    {
-        getAppList(nowType);
-    }
-}
-void AppListPage::getAppList(QString type)
-{
-    isSearch = false;
-    nowType = type;
-    SparkAPI *api = new SparkAPI(this);
-    QString url;
-    QString theme;
-    if (isDark)
-    {
-        theme = "theme=dark";
-    }
-    else
-    {
-        theme = "theme=light";
-    }
-    if (type == "")
-    {
-        url = api->getServerUrl() + SparkAPI::getArchDir() + "/#/flamescion/?" + theme + "&" + "arch=x86";
-        #ifdef __aarch64__
-        url = api->getServerUrl() + SparkAPI::getArchDir() + "/#/flamescion/?" + theme + "&" + "arch=aarch64";
-        #endif
-    }
-    else
-    {
-        url = api->getServerUrl() + SparkAPI::getArchDir() + "/#/flamescion/applist?type=" + type + "&" + theme + "&" + "arch=x86";
-        #ifdef __aarch64__
-        url = api->getServerUrl() + SparkAPI::getArchDir() + "/#/flamescion/applist?type=" + type + "&" + theme + "&" + "arch=aarch64";
-        #endif
-    }
-
-    ui->webEngineView->setUrl(url);
-    delete api;
-}
-
-void AppListPage::getSearchList(const QString &keyword)
-{
-    isSearch = true;
-    nowType = keyword;
-    SparkAPI *api = new SparkAPI(this);
-    QString url;
-    QString theme;
-    if (isDark)
-    {
-        theme = "theme=dark";
-    }
-    else
-    {
-        theme = "theme=light";
-    }
-
-    url = api->getServerUrl() + SparkAPI::getArchDir() + "/#/flamescion/search?keywords=" + QUrl::toPercentEncoding(keyword) + "&" + theme + "&" + "arch=x86";
-    #ifdef __aarch64__
-    url = api->getServerUrl() + SparkAPI::getArchDir() + "/#/flamescion/search?keywords=" + QUrl::toPercentEncoding(keyword) + "&" + theme + "&" + "arch=aarch64";
-    #endif
-    ui->webEngineView->setUrl(url);
-    delete api;
-}
-
-AppListPage::~AppListPage()
-{
-    delete ui;
-}
-
-void AppListPage::on_webEngineView_urlChanged(const QUrl &arg1)
-{
-    if (arg1.path().right(8) == "app.json")
-    {
-        QString url = arg1.toString();
-        url = url.mid(url.indexOf("/" + SparkAPI::getArchDir() + "/"));
-        url = "spk:/" + url;
-        url = url.mid(0, url.indexOf("/app.json"));
-        qDebug() << "程序跳转链接地址：" << url;
-        ui->webEngineView->back();
-        emit clicked(url);
-    }
-}
+#include "applistpage.h"
+#include "ui_applistpage.h"
+
+#define BUILD_URL(theme, arch) \
+    api->getServerUrl() + SparkAPI::getArchDir() + "/#/flamescion/" + (type.isEmpty() ? "?" : "applist?type=" + type + "&") + theme + "&arch=" + arch
+
+AppListPage::AppListPage(QWidget *parent) : QWidget(parent),
+                                            ui(new Ui::AppListPage)
+{
+    ui->setupUi(this);
+    ui->webEngineView->page()->setBackgroundColor(Qt::transparent);
+}
+void AppListPage::setTheme(bool dark)
+{
+    isDark = dark;
+    if (dark)
+    {
+        this->setStyleSheet("#frame{background-color: #252525;border-radius:14px;border:1px solid rgb(64, 64, 64);}");
+    }
+    else
+    {
+        // 亮色模式
+        this->setStyleSheet("#frame{background-color: #ffffff;border-radius:14px;border:1px solid rgb(229,229,229);}");
+    }
+    if (isSearch)
+    {
+        getSearchList(nowType);
+    }
+    else
+    {
+        getAppList(nowType);
+    }
+}
+void AppListPage::getAppList(QString type)
+{
+    isSearch = false;
+    nowType = type;
+    SparkAPI *api = new SparkAPI(this);
+    QString url;
+    QString theme;
+    if (isDark)
+    {
+        theme = "theme=dark";
+    }
+    else
+    {
+        theme = "theme=light";
+    }
+    
+    #ifdef __aarch64__
+        url = BUILD_URL(theme, "aarch64");
+    #elif __loongarch__
+        url = BUILD_URL(theme, "loong64");
+    #else
+        url = BUILD_URL(theme, "x86");
+    #endif
+
+    ui->webEngineView->setUrl(url);
+    delete api;
+}
+
+void AppListPage::getSearchList(const QString &keyword)
+{
+    isSearch = true;
+    nowType = keyword;
+    SparkAPI *api = new SparkAPI(this);
+    QString url;
+    QString theme;
+    if (isDark)
+    {
+        theme = "theme=dark";
+    }
+    else
+    {
+        theme = "theme=light";
+    }
+
+    url = api->getServerUrl() + SparkAPI::getArchDir() + "/#/flamescion/search?keywords=" + QUrl::toPercentEncoding(keyword) + "&" + theme + "&" + "arch=x86";
+    #ifdef __aarch64__
+    url = api->getServerUrl() + SparkAPI::getArchDir() + "/#/flamescion/search?keywords=" + QUrl::toPercentEncoding(keyword) + "&" + theme + "&" + "arch=aarch64";
+    #elif __loongarch__
+    url = api->getServerUrl() + SparkAPI::getArchDir() + "/#/flamescion/search?keywords=" + QUrl::toPercentEncoding(keyword) + "&" + theme + "&" + "arch=loong64";
+    #endif
+    ui->webEngineView->setUrl(url);
+    delete api;
+}
+
+AppListPage::~AppListPage()
+{
+    delete ui;
+}
+
+void AppListPage::on_webEngineView_urlChanged(const QUrl &arg1)
+{
+    if (arg1.path().right(8) == "app.json")
+    {
+        QString url = arg1.toString();
+        url = url.mid(url.indexOf("/" + SparkAPI::getArchDir() + "/"));
+        url = "spk:/" + url;
+        url = url.mid(0, url.indexOf("/app.json"));
+        qDebug() << "程序跳转链接地址：" << url;
+        ui->webEngineView->back();
+        emit clicked(url);
+    }
+}

src/pages/settingspage.cpp

@@ -9,7 +9,7 @@
 
 #define TMP_PATH "/tmp/spark-store"
 #define DEFAULT_SERVER_URL "https://cdn.d.store.deepinos.org.cn/"
-#define DEFAULT_CHECK_DOMAIN "deepinos"
+
 
 bool SettingsPage::needUncompatibleNotification = true;
 bool SettingsPage::isdownload = false;
@@ -57,10 +57,7 @@ void SettingsPage::readServerList()
 
     // 创建 QTextStream 对象
     QTextStream textStream(&file);
-    if (!textStream.readAll().contains(DEFAULT_CHECK_DOMAIN)) // 校验配置文件有效性
-    {
-        return;
-    }
+
     textStream.seek(0);                       // 回到开头
     QString lineData = textStream.readLine(); // 读取文件的第一行
     ui->comboBox_server->addItem(lineData);

src/pages/settingspage.ui

@@ -72,8 +72,8 @@
           <rect>
            <x>0</x>
            <y>0</y>
-           <width>743</width>
-           <height>950</height>
+           <width>688</width>
+           <height>940</height>
           </rect>
          </property>
          <layout class="QVBoxLayout" name="verticalLayout_23">
@@ -356,8 +356,7 @@
              <item>
               <widget class="QLabel" name="label_10">
                <property name="text">
-                <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;We are &lt;span style=&quot; font-weight:600;&quot;&gt;NOT&lt;/span&gt; the official team, just like you, we are just one of the many Linux/deepin system enthusiasts and users, we develop and run the &amp;quot;Spark Store&amp;quot;! &amp;quot;, is to bring the community together to share useful software, or to participate in development together, so that we all use the latest and greatest software. &lt;/p&gt;&lt;p&gt;We don't make a profit from this, all developers and maintainers don't get paid, and we rely on the community's donations to us for most of our expenses, which we are grateful for and which allow us not to spend too much energy worrying about funding. &lt;/p&gt;&lt;p&gt;Our service and software are free for everyone to use, communicate, and learn, but you must comply with local laws and regulations in the process of your use, otherwise any problems have nothing to do with us. &lt;/p&gt;&lt;p&gt;If any part of the store infringes your rights, please tell us &lt;a href=&quot;mailto:jifengshenmo@outlook.com&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0082fa;&quot;&gt;jifengshenmo@outlook.com&lt;/span&gt;&lt;/a&gt; we will remove the infringing content as soon as possible. &lt;/p&gt;&lt;p&gt;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. &lt;/p&gt;
-&lt;p&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;&lt;br/&gt;&lt;/span&gt;Our contact method can be found at &lt;a href=&quot;https://blog.shenmo.tech/post/%E6%95%85%E9%9A%9C%E5%85%AC%E5%91%8A/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0082fa;&quot;&gt;Here&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;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. &lt;/p&gt;&lt;p&gt;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. &lt;/p&gt;&lt;p&gt;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. &lt;/p&gt;&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;If any part of the store infringes your rights, please tell us &lt;a href=&quot;mailto:jifengshenmo@outlook.com&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0082fa;&quot;&gt;jifengshenmo@outlook.com&lt;/span&gt;&lt;/a&gt; we will remove the infringing content as soon as possible. &lt;/p&gt;&lt;p&gt;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. &lt;/p&gt;&lt;p&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;&lt;br/&gt;&lt;/span&gt;Our contact method can be found at &lt;a href=&quot;https://blog.shenmo.tech/post/%E6%95%85%E9%9A%9C%E5%85%AC%E5%91%8A/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0082fa;&quot;&gt;Here&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
                </property>
                <property name="wordWrap">
                 <bool>true</bool>

src/spark-store.pro

@@ -106,3 +106,5 @@ TRANSLATIONS += \
 qnx: target.path = /tmp/$${TARGET}/bin
 else: unix:!android: target.path = /opt/durapps/$${TARGET}/bin
 !isEmpty(target.path): INSTALLS += target
+
+DISTFILES +=

src/utils/httprequest.cpp

@@ -1,14 +1,21 @@
 #include "httprequest.h"
 
-HttpRequest::HttpRequest()
+HttpRequest::HttpRequest(QObject *parent):QObject(parent)
 {
+    QString headers = "Mozilla/5.0 Spark-Store/"+ QString(APP_VERSION)+" (Linux;  "+QSysInfo::prettyProductName().toUtf8()+");";
+    QByteArray ba = headers.toLatin1();
+    rawHeaders = strdup(ba.data());
+}
+// 在析构函数中释放 rawHeaders 的内存
+HttpRequest::~HttpRequest()
+{
+    free(rawHeaders);
 }
 
 void HttpRequest::getRequest(QNetworkRequest request)
 {
     QNetworkAccessManager *naManager = new QNetworkAccessManager(this);
-
-    request.setRawHeader("User-Agent", "Mozilla/5.0");
+    request.setRawHeader("User-Agent", rawHeaders);
     request.setRawHeader("Content-Type", "charset='utf-8'");
     request.setRawHeader("Content-Type", "application/json");
 
@@ -26,6 +33,7 @@ QString HttpRequest::postRequest(QString url, QString jsondata)
     QNetworkAccessManager *naManager = new QNetworkAccessManager(this);
     QUrl strUrl = url.replace("+", "%2B");
     request.setUrl(strUrl);
+    request.setRawHeader("User-Agent", rawHeaders);
     request.setRawHeader("Content-Type", "charset='utf-8'");
     request.setRawHeader("Content-Type", "application/json");
 

src/utils/httprequest.h

@@ -10,8 +10,11 @@
 class HttpRequest : public QObject
 {
     Q_OBJECT
+private:
+    char*  rawHeaders;
 public:
-    HttpRequest();
+    HttpRequest(QObject *parent = nullptr);
+    ~HttpRequest();
 
     void getRequest(QNetworkRequest request);
 

src/utils/utils.cpp

@@ -73,6 +73,36 @@ bool Utils::isWayland()
     return isWayland;
 }
 
+/**
+ * @brief 判断是否使用 TreeLand 混合器
+ * @return bool true: 使用 TreeLand 混合器 false: 非 TreeLand 混合器
+ */
+bool Utils::isTreeLand()
+{
+    bool isTreeLand = false;
+    if (qgetenv("DDE_CURRENT_COMPOSITOR").toLower() == "treeland") {
+        isTreeLand = true;
+    }
+
+    return isTreeLand;
+}
+
+bool Utils::isPhytium()
+{
+    bool isPhytium = false;
+    QProcess process;
+    process.start("lscpu");
+    process.waitForFinished();
+
+
+    QString output = process.readAllStandardOutput();
+    if (output.contains(QLatin1String("Phytium")))
+    {
+        isPhytium = true;
+    }
+
+    return isPhytium;
+}
 /**
  * @brief Utils::initConfig 初始化 config.ini 配置文件，去除废弃字段
  */
@@ -154,14 +184,18 @@ void Utils::setQPAPlatform()
 
     qDebug() << "System Wayland enabled:" << isWayland << "Spark Wayland enabled:" << useWayland;
 
-    if (isWayland && useWayland && !(Dtk::Core::DSysInfo::isDeepin() || isDDE))
+    /**
+     * NOTE: https://github.com/linuxdeepin/developer-center/issues/7217#issuecomment-1922653903
+     * DDE Wayland has been deprecated, so using wayland plugin only
+     */
+    if (isWayland && useWayland /*&& !(Dtk::Core::DSysInfo::isDeepin() || isDDE)*/)
     {
         qputenv("QT_QPA_PLATFORM", "wayland");
     }
-    else if (isWayland && useWayland && (Dtk::Core::DSysInfo::isDeepin() && isDDE))
-    {
-        qputenv("QT_QPA_PLATFORM", "dwayland");
-    }
+    // else if (isWayland && useWayland && (Dtk::Core::DSysInfo::isDeepin() && isDDE))
+    // {
+    //     qputenv("QT_QPA_PLATFORM", "dwayland");
+    // }
     else
     {
         qputenv("QT_QPA_PLATFORM", "dxcb");

src/utils/utils.h

@@ -10,8 +10,10 @@ public:
     static void sendNotification(const QString &icon, const QString &title, const QString &body);
     static bool isDDE();
     static bool isWayland();
+    static bool isTreeLand();
     static void initConfig();
     static bool isUOS();
+    static bool isPhytium();
     static QString initUUID();
     static void setQPAPlatform();
     static void checkUOSDeveloperMode();

src/widgets/big_image.cpp

@@ -1,6 +1,8 @@
 #include "big_image.h"
+#include "qapplication.h"
 
 #include <QHBoxLayout>
+#include <QScreen>
 #include <QtConcurrent>
 
 big_image::big_image(DBlurEffectWidget *parent) : DBlurEffectWidget(parent),
@@ -25,6 +27,8 @@ big_image::big_image(DBlurEffectWidget *parent) : DBlurEffectWidget(parent),
 
 void big_image::setimage(QPixmap image)
 {
+    QScreen *screen = QApplication::primaryScreen();
+    image.setDevicePixelRatio(screen->devicePixelRatio());
     m_image->setPixmap(image);
 }
 

src/widgets/common/downloaditem.cpp

@@ -175,7 +175,7 @@ void DownloadItem::slotAsyncInstall(int t)
     switch (t)
     {
     case 0:
-        installer.start("pkexec", QStringList() << "ssinstall"
+        installer.start("pkexec", QStringList() << "/usr/local/bin/ssinstall"
                                                 << "/tmp/spark-store/" + ui->label_filename->text().toUtf8() << "--delete-after-install");
         break;
     case 1:
@@ -198,7 +198,7 @@ void DownloadItem::slotAsyncInstall(int t)
     for (int i = 0; i < everyOut.size(); i++)
     {
         tempOutput = everyOut[i];
-        if (everyOut[i].left(2) == tempOutput.contains("OMG-IT-GOES-WRONG"))
+        if (tempOutput.contains("OMG-IT-GOES-WRONG"))
         {
             haveError = true;
         }

src/widgets/common/progressbutton.cpp

@@ -9,10 +9,6 @@
 ProgressButton::ProgressButton(QWidget *parent)
     : QWidget{parent}
 {
-    // this->setWindowFlags(Qt::FramelessWindowHint);
-    // this->setAttribute(Qt::WA_TranslucentBackground, true);
-    setMinimumSize(36, 36);
-
     svgPath = "";
     backColor = Qt::transparent;
 
@@ -37,7 +33,7 @@ void ProgressButton::setProgress(int progress)
         buttonState = state::closeProgress;
         update();
         WaterDrop *waterDrop = new WaterDrop(parentWidget());
-        waterDrop->move(geometry().center());
+        waterDrop->move(QRectF(geometry()).center());
         waterDrop->show();
     }
     repaint();
@@ -77,12 +73,9 @@ void ProgressButton::mousePressEvent(QMouseEvent *event)
 
 void ProgressButton::mouseReleaseEvent(QMouseEvent *event)
 {
-    if (buttonState == state::hover || buttonState == state::normal)
-    {
-        widthChangeValue = (this->width() - 6) / 2;
-        update();
-    }
-    else if (buttonState == state::closeProgress)
+    if (buttonState == state::hover
+        || buttonState == state::normal
+        || buttonState == state::closeProgress)
     {
         update();
     }
@@ -131,19 +124,15 @@ void ProgressButton::paintEvent(QPaintEvent *event)
 {
     QPainter painter(this);
     painter.setRenderHint(QPainter::Antialiasing, true);
-    QRect rect = event->rect();
+    QRectF rect = this->rect();
 
     if (buttonState == state::normal || buttonState == state::hover)
     {
-        int radius = (rect.height() - 6) / 2;
+        qreal radius = rect.height() / 2;
         painter.translate(rect.center());
         painter.setPen(Qt::transparent);
-        painter.setBrush(QColor(buttonState == state::normal ? color : color.darker()));
-        // painter.drawEllipse(QPoint(0, 0), radius, radius);
-
-        // radiu -= 3;
         painter.setBrush(backColor);
-        painter.drawEllipse(QPoint(0, 0), radius, radius);
+        painter.drawEllipse(QPointF(0, 0), radius, radius);
 
         QSvgRenderer m_svgRender;
         m_svgRender.load(svgPath);
@@ -151,42 +140,34 @@ void ProgressButton::paintEvent(QPaintEvent *event)
     }
     else if (buttonState == state::openProgress)
     {
+        qreal radius = rect.height() / 2 - 1;
         painter.translate(rect.center());
-        int radius = (rect.height() - 6) / 2 - 3;
+        painter.setPen(QPen(backColor.darker(), 2));
         painter.setBrush(backColor);
-        painter.setPen(QPen(backColor, 3));
-        painter.drawEllipse(QPoint(0, 0), radius, radius);
+        painter.drawEllipse(QPointF(0, 0), radius, radius);
 
-        painter.setPen(QPen(backColor, 3));
+        QRectF rectF = QRectF(-radius, -radius, radius * 2, radius * 2);
+        painter.setPen(QPen(color.darker(100), 2));
+        qreal angle = progress * 360 / 100 * 1.0;
+        painter.drawArc(rectF, 90 * 16, -qIntCast(angle * 16));
 
         QSvgRenderer m_svgRender;
         m_svgRender.load(svgPath);
         m_svgRender.render(&painter, QRectF(-radius / 2, -radius / 2, radius, radius));
-
-        QRect rect = QRect(-radius, -radius,
-                           radius * 2, radius * 2);
-
-        painter.setPen(QPen(color.darker(100), 3));
-        qreal angle = progress * 360 / 100 * 1.0;
-        painter.drawArc(rect.adjusted(-3, -3, 3, 3), 90 * 16, -qIntCast(angle * 16));
     }
     else if (buttonState == state::closeProgress)
     {
-        auto radius = (rect.height() - 6) / 2;
+        qreal radius = rect.height() / 2 - 1;
         painter.translate(rect.center());
-        painter.setPen(Qt::transparent);
-        painter.setBrush(QColor(0, 0, 0, 63));
-        painter.drawEllipse(QPoint(0, 0), radius, radius);
-
-        radius -= 3;
+        painter.setPen(QPen(color.darker(100), 2));
         painter.setBrush(backColor);
-        painter.drawEllipse(QPoint(0, 0), radius, radius);
+        painter.drawEllipse(QPointF(0, 0), radius, radius);
 
-        painter.setPen(QPen(color, 3, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin));
-        painter.drawLine(QPoint(-radius / 3, 0),
-                         QPoint(-radius / 5, radius / 3));
-        painter.drawLine(QPoint(-radius / 5, radius / 3),
-                         QPoint(radius / 4, -radius / 4));
+        painter.setPen(QPen(color, 2, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin));
+        painter.drawLine(QPointF(-radius / 3, 0),
+                         QPointF(-radius / 5, radius / 3));
+        painter.drawLine(QPointF(-radius / 5, radius / 3),
+                         QPointF(radius / 4, -radius / 4));
     }
     QWidget::paintEvent(event);
 }
@@ -195,7 +176,7 @@ void ProgressButton::operationProcessing()
 {
 }
 
-const int RADIUS = 60;
+const int RADIUS = 30;
 WaterDrop::WaterDrop(QWidget *parent)
     : QWidget(parent)
     , m_waterDropAnimation(new QVariantAnimation(this))
@@ -210,20 +191,20 @@ WaterDrop::WaterDrop(QWidget *parent)
 }
 
 // 把鼠标点击的点转换为圆心点坐标
-void WaterDrop::move(const QPoint &point)
+void WaterDrop::move(const QPointF &point)
 {
-    QPoint translatePoint = point - QPoint(RADIUS, RADIUS);
-    QWidget::move(translatePoint);
+    QPointF translatePoint = point - QRectF(rect()).center();
+    QWidget::move(qRound(translatePoint.x()), qRound(translatePoint.y()));
 }
 
 void WaterDrop::show()
 {
     m_waterDropAnimation->setStartValue(0);
-    m_waterDropAnimation->setEndValue(RADIUS);
+    m_waterDropAnimation->setEndValue(RADIUS - 2);
     m_waterDropAnimation->setDuration(350);
 
     connect(m_waterDropAnimation, &QVariantAnimation::valueChanged, this, &WaterDrop::onRadiusChanged);
-    connect(m_waterDropAnimation, &QVariantAnimation::finished, this, &WaterDrop::close);
+    connect(m_waterDropAnimation, &QVariantAnimation::finished, this, &WaterDrop::deleteLater);
     m_waterDropAnimation->start(QVariantAnimation::DeleteWhenStopped);
     QWidget::show();
 }
@@ -232,10 +213,9 @@ void WaterDrop::paintEvent(QPaintEvent *event)
 {
     QPainter painter(this);
     painter.setRenderHint(QPainter::Antialiasing);
-    QPen pen(QBrush(QColor("#ffff80")), 5.0);
-    pen.setWidth(5);
+    QPen pen(QBrush(QColor("#ffff80")), 4.0);
     painter.setPen(pen);
-    painter.drawEllipse(event->rect().center(), m_animationRadius, m_animationRadius);
+    painter.drawEllipse(QRectF(rect()).center(), m_animationRadius, m_animationRadius);
 
     QWidget::paintEvent(event);
 }

src/widgets/common/progressbutton.h

@@ -52,7 +52,6 @@ private:
     QColor backColor;
     QColor color;
     QString svgPath;
-    int widthChangeValue{0};
     int progress{0};//处理百分比
 
     bool m_mouseMoved = false;
@@ -66,7 +65,7 @@ class WaterDrop : public QWidget
 public:
     explicit WaterDrop(QWidget *parent = nullptr);
     void show();
-    void move(const QPoint &point);
+    void move(const QPointF &point);
 
 protected:
     void paintEvent(QPaintEvent *event);

tool/apt-fast-conf/apt-fast.conf

@@ -1,169 +0,0 @@
-###################################################################
-# CONFIGURATION OPTIONS
-###################################################################
-# Every item has a default value besides MIRRORS (which is unset).
-
-# Use aptitude, apt-get, or apt?
-# Note that apt-get is used as a fallback for outputting the
-# package URI list for e.g. aptitude, which can't do this
-# Optionally add the FULLPATH to apt-get or apt-rpm or aptitude
-# e.g. /usr/bin/aptitude
-#
-# Default: apt-get
-#
-_APTMGR=apt-get
-
-if [ -x "$(command -v apt)" ]; then
-_APTMGR=apt
-fi
-
-
-if grep -Eqi "linuxmint" /etc/os-release;then
-_APTMGR=apt-get
-fi
-
-if [ -x "$(command -v oyo)" ]; then
-_APTMGR=/usr/bin/apt
-fi
-
-####
-#
-# UOS sources auth config
-#
-#
-if grep -Eqi "UnionTech" /etc/issue || grep -Eq "UnionTech" /etc/*-release;then
-AUTH_UOS_USER="uos-https://license.chinauos.com-apt"
-AUTH_UOS_PASSWD="`cat /etc/apt/auth.conf.d/uos.conf  | grep home-packages.chinauos.com`"
-AUTH_UOS_PASSWD=`echo ${AUTH_UOS_PASSWD#*password }`
-
-fi
-##### UOS自动读取账号密码以实现使用aptss来加速下载
-
-# Enable DOWNLOADBEFORE to suppress apt-fast confirmation dialog and download
-# packages directly.
-#
-# Default: dialog enabled
-#
-DOWNLOADBEFORE=true
-
-
-# Choose mirror list to speed up downloads from same archive. To select some
-# mirrors take a look at your distribution's archive mirror lists.
-# Debian: http://www.debian.org/mirror/list
-# Ubuntu: https://launchpad.net/ubuntu/+archivemirrors
-#
-# It is required to add mirrors in the sources.list to this array as well, so
-# apt-fast can destinguish between different distributions.
-#
-# Examples:
-#
-# Different distributions (as in operating systems):
-#
-# sources.list:
-# deb http://deb.debian.org/debian/ unstable main non-free contrib
-# deb http://de.archive.ubuntu.com/ubuntu/ bionic main universe
-#
-# apt-fast.conf:
-# MIRRORS=( 'http://deb.debian.org/debian','http://ftp.debian.org/debian,http://ftp2.de.debian.org/debian,http://ftp.de.debian.org/debian,ftp://ftp.uni-kl.de/debian'
-#           'http://archive.ubuntu.com/ubuntu,http://de.archive.ubuntu.com/ubuntu,http://ftp.halifax.rwth-aachen.de/ubuntu,http://ftp.uni-kl.de/pub/linux/ubuntu,http://mirror.informatik.uni-mannheim.de/pub/linux/distributions/ubuntu/' )
-#
-#
-# Single distribution:
-#
-# sources.list:
-# deb http://fr.archive.ubuntu.com/ubuntu/ bionic main
-# deb http://fr.archive.ubuntu.com/ubuntu/ artful main
-#
-# apt-fast.conf:
-# MIRRORS=( 'http://fr.archive.ubuntu.com/ubuntu,http://bouyguestelecom.ubuntu.lafibre.info/ubuntu,http://mirror.ovh.net/ubuntu,http://ubuntu-archive.mirrors.proxad.net/ubuntu' )
-#
-# Default: disabled
-#
-MIRRORS=( 'https://d.store.deepinos.org.cn/,https://zunyun01.store.deepinos.org.cn/,https://mirrors.sdu.edu.cn/spark-store-repository/,http://cdn.dl.uniartisan.com:9000/deepinos/,https://d1.store.deepinos.org.cn/,https://d2.store.deepinos.org.cn/,https://d3.store.deepinos.org.cn/,https://d4.store.deepinos.org.cn/,https://d5.store.deepinos.org.cn/' )
-
-
-# Maximum number of connections
-# You can use this value in _DOWNLOADER command. Escape with ${}: ${_MAXNUM}
-#
-# Default: 5
-#
-_MAXNUM=16
-
-
-# Maximum number of connections per server
-# Default: 10
-#
-_MAXCONPERSRV=1
-
-
-
-
-
-# Split size i.e. size of each piece
-# Possible Values: 1M-1024M
-#
-_MINSPLITSZ=1M
-
-
-# Piece selection algorithm to use
-# Available values are: default, inorder, geom
-# default: selects piece so that it reduces the number of establishing connection, reasonable for most cases
-# inorder: selects pieces in sequential order starting from first piece
-# geom: selects piece which has minimum index like inorder, but it exponentially increasingly keeps space from previously selected pieces
-#
-_PIECEALGO=default
-
-
-
-# Downloadmanager listfile
-# You can use this value in _DOWNLOADER command. Escape with ${}: ${DLLIST}
-#
-# Default: /tmp/apt-fast.list
-#
-DLLIST='/tmp/apt-fast.list'
-
-
-# Download command to use. Temporary download list is designed for aria2. But
-# you can choose another download command or download manager. It has to
-# support following input file syntax (\t is tab character):
-#
-# # Comment
-# MIRROR1\tMIRROR2\tMIRROR3...
-#  out=FILENAME1
-# MIRROR1\tMIRROR2\tMIRROR3...
-#  out=FILENAME2
-# ...
-#
-# Examples:
-# aria2c with a proxy (set username, proxy, ip and password!)
-# _DOWNLOADER='aria2c --no-conf -c -j ${_MAXNUM} -x ${_MAXCONPERSRV} -s ${_SPLITCON} --min-split-size=${_MINSPLITSZ} --stream-piece-selector=${_PIECEALGO} --http-proxy=http://username:password@proxy_ip:proxy_port -i ${DLLIST}'
-#
-# Default: _DOWNLOADER='aria2c --no-conf -c -j ${_MAXNUM} -x ${_MAXCONPERSRV} -s ${_SPLITCON} --min-split-size=${_MINSPLITSZ} --stream-piece-selector=${_PIECEALGO} -i ${DLLIST} --connect-timeout=600 --timeout=600 -m0'
-#
-_DOWNLOADER='aria2c --no-conf -c -j ${_MAXNUM} -x ${_MAXCONPERSRV}  --min-split-size=${_MINSPLITSZ}  --stream-piece-selector=${_PIECEALGO} -i ${DLLIST} --connect-timeout=600 --timeout=600 -m0 --http-user ${AUTH_UOS_USER} --http-passwd ${AUTH_UOS_PASSWD}'
-
-
-# Download temp folder for Downloadmanager
-# example /tmp/apt-fast. Standard is /var/cache/apt-fast
-#
-# Default: /var/cache/apt/apt-fast
-#
-DLDIR='/var/cache/apt/apt-fast'
-
-
-# APT archives cache directory
-#
-# Default /var/cache/apt/archives
-# (APT configuration items Dir::Cache and Dir::Cache::archives)
-#
-APTCACHE='/var/cache/apt/archives'
-
-
-# apt-fast colors
-# Colors are disabled when not using a terminal.
-#
-# Default colors are:
-#  cGreen='\e[0;32m'
-#  cRed='\e[0;31m'
-#  cBlue='\e[0;34m'
-#  endColor='\e[0m'

tool/apt-fast-conf/aptss-apt.conf

@@ -7,6 +7,8 @@ Dir::State::lists "/var/lib/aptss/lists/";
 APT::Get::Fix-Broken true;
 APT::Get::List-Cleanup="0";
 
+Acquire::GzipIndexes "false";
+
 #clear APT::Update::Post-Invoke-Success;
 
 #clear DPkg::Post-Invoke;

tool/apt-fast/ss-apt-fast

@@ -1,21 +1,25 @@
 #!/bin/bash
-#	
-# apt-fast v1.9
+#
+# apt-fast v1.10.0
 # Use this just like aptitude or apt-get for faster package downloading.
 #
 # Copyright: 2008-2012 Matt Parnell, http://www.mattparnell.com
-# Improvements, maintenance, revisions - 2012, 2017-2018 Dominique Lasserre
+# Improvements, maintenance, revisions - 2012, 2017-2019 Dominique Lasserre
 #
 # You may distribute this file under the terms of the GNU General
 # Public License as published by the Free Software Foundation; either
 # version 3 of the License, or (at your option) any later version.
 #
+
+shopt -s nullglob
 [ -n "$DEBUG" ] && set -xv
 
 # Print colored messages.
 # Usage: msg "message text" "message type" "optional: err"
 # Message types are 'normal', 'hint' or 'warning'. Warnings and messages with a
 # third argument are piped to stderr.
+
+THREADS=$(nproc 2>/dev/null || echo 4)
 msg(){
   msg_options=()
   case "$2" in
@@ -34,7 +38,7 @@ msg(){
 }
 
 # Search for known options and decide if root privileges are needed.
-root=1  # default value: we need root privileges
+root=$#
 option=
 for argument in "$@"; do
   case "$argument" in
@@ -52,7 +56,7 @@ for argument in "$@"; do
       option="source"
       root=0
       ;;
-    changelog)
+    *)
       root=0
       ;;
   esac
@@ -70,7 +74,6 @@ TMP__APTMGR="${_APTMGR-${TMP_RANDOM}}"
 TMP_APTCACHE="${APTCACHE-${TMP_RANDOM}}"
 TMP_DLDIR="${DLDIR-${TMP_RANDOM}}"
 TMP_DLLIST="${DLLIST-${TMP_RANDOM}}"
-TMP_LISTDIR="${LISTDIR-${TMP_RANDOM}}"
 TMP__MAXNUM="${MAXNUM-${TMP_RANDOM}}"
 TMP__MAXCONPERSRV="${MAXCONPERSRV-${TMP_RANDOM}}"
 TMP__SPLITCON="${SPLITCON-${TMP_RANDOM}}"
@@ -78,6 +81,7 @@ TMP__MINSPLITSZ=${MINSPLITSZ-${TMP_RANDOM}}
 TMP__PIECEALGO=${PIECEALGO-${TMP_RANDOM}}
 TMP_aptfast_prefix="${aptfast_prefix-${TMP_RANDOM}}"
 TMP_APT_FAST_TIMEOUT="${APT_FAST_TIMEOUT-${TMP_RANDOM}}"
+TMP_APT_FAST_APT_AUTH="${APT_FAST_APT_AUTH-${TMP_RANDOM}}"
 TMP_VERBOSE_OUTPUT="${VERBOSE_OUTPUT-${TMP_RANDOM}}"
 TMP_ftp_proxy="${ftp_proxy-${TMP_RANDOM}}"
 TMP_http_proxy="${http_proxy-${TMP_RANDOM}}"
@@ -85,7 +89,7 @@ TMP_https_proxy="${https_proxy-${TMP_RANDOM}}"
 
 # Check for proper privileges.
 # Call explicitly with environment variables to get them into root conext.
-if [ "$root" = 1 ] && [ "$UID" != 0 ]; then
+if [ "$root" -ne 0 ] && [ "$UID" != 0 ]; then
   exec sudo DEBUG="$DEBUG" \
             LCK_FILE="$TMP_LCK_FILE" \
             DOWNLOADBEFORE="$TMP_DOWNLOADBEFORE" \
@@ -93,7 +97,6 @@ if [ "$root" = 1 ] && [ "$UID" != 0 ]; then
             APTCACHE="$TMP_APTCACHE" \
             DLDIR="$TMP_DLDIR" \
             DLLIST="$TMP_DLLIST" \
-            LISTDIR="$TMP_LISTDIR" \
             _MAXNUM="$TMP__MAXNUM" \
             _MAXCONPERSRV="$TMP__MAXCONPERSRV" \
             _SPLITCON="$TMP__SPLITCON" \
@@ -101,6 +104,7 @@ if [ "$root" = 1 ] && [ "$UID" != 0 ]; then
             _PIECEALGO="$TMP__PIECEALGO" \
             aptfast_prefix="$TMP_aptfast_prefix" \
             APT_FAST_TIMEOUT="$TMP_APT_FAST_TIMEOUT" \
+            APT_FAST_APT_AUTH="$TMP_APT_FAST_APT_AUTH" \
             VERBOSE_OUTPUT="$TMP_VERBOSE_OUTPUT" \
             ftp_proxy="$TMP_ftp_proxy" \
             http_proxy="$TMP_http_proxy" \
@@ -108,34 +112,53 @@ if [ "$root" = 1 ] && [ "$UID" != 0 ]; then
             "$0" "$@"
 fi
 
-
 # Define lockfile.
 # Use /tmp as directory because everybody (not only root) has to have write
 # permissions.
 # We need lock for non-root commands too, because we only have one download
 # list file.
-LCK_FILE="/tmp/apt-fast"
+if [ "$IS_ACE_ENV" != "" ];then
+LCK_FILE="/tmp/apt-fast-in-container.lock"
+else
+LCK_FILE="/tmp/apt-fast.lock"
+fi
 LCK_FD=99
 
 # Set default package manager, APT cache, temporary download dir,
 # temporary download list file, and maximal parallel downloads
-_APTMGR=apt-get
+_APTMGR=apt-get	
 eval "$(apt-config shell APTCACHE Dir::Cache::archives/d)"
 # Check if APT config option Dir::Cache::archives::apt-fast-partial is set.
 eval "$(apt-config shell apt_fast_partial Dir::Cache::archives::apt-fast-partial/d)"
 if [ -z "$apt_fast_partial" ]; then
-  eval "$(apt-config -o Dir::Cache::archives::apt-fast-partial=apt-fast shell DLDIR Dir::Cache::archives::apt-fast-partial/d)"
+  DLDIR="$(realpath "${APTCACHE}/../apt-fast")"
 else
-  eval "$(apt-config shell DLDIR Dir::Cache::archives::apt-fast-partial/d)"
+  DLDIR="${apt_fast_partial}"
 fi
-# Currently not needed.
-eval "$(apt-config shell LISTDIR Dir::State::lists/d)"
+
+# Check for apt auth files
+eval "$(apt-config shell NETRC Dir::Etc::netrc/f)"
+eval "$(apt-config shell NETRCDIR Dir::Etc::netrcparts/d)"
+APTAUTHFILES=()
+if [ -f "$NETRC" ]; then
+    APTAUTHFILES=("$NETRC")
+fi
+APTAUTHFILES+=("$NETRCDIR"*)
+
+if [ "$IS_ACE_ENV" != "" ];then
+DLLIST="/tmp/apt-fast-in-container.list"
+else
 DLLIST="/tmp/apt-fast.list"
+fi
+
+
+
 _MAXNUM=5
 _MAXCONPERSRV=10
 _SPLITCON=8
 _MINSPLITSZ="1M"
 _PIECEALGO="default"
+MIRRORS=()
 
 # Prefix in front of apt-fast output:
 aptfast_prefix=
@@ -154,18 +177,30 @@ APT_FAST_TIMEOUT=60
 # Ask for download confirmation if unset
 DOWNLOADBEFORE=
 
+# Enable APT authentication support
+APT_FAST_APT_AUTH=1
+
 # Formatted package list in download confirmation if unset
 VERBOSE_OUTPUT=
 
 # Download command.
 _DOWNLOADER='aria2c --no-conf -c -j ${_MAXNUM} -x ${_MAXCONPERSRV} -s ${_SPLITCON} -i ${DLLIST} --min-split-size=${_MINSPLITSZ} --stream-piece-selector=${_PIECEALGO} --connect-timeout=60 --timeout=600 -m0'
 
-# Load config file.
-CONFFILE="/tmp/aptss-conf/apt-fast.conf"
-#### Spark Store apt-fast conf is in /tmp
-if [ -e "$CONFFILE" ]; then
-    source "$CONFFILE"
-fi
+# 定义默认的配置文件列表（按加载顺序排列）
+CONFIG_FILES=(
+    "/tmp/aptss-conf/apt-fast.conf"  # 原始配置文件位置
+    "/etc/aptss/apt-fast.conf"             # 系统级配置
+)
+
+
+# 按顺序加载所有配置文件
+for conf_file in "${CONFIG_FILES[@]}"; do
+    if [ -e "$conf_file" ]; then
+        source "$conf_file"
+    fi
+done
+
+
 
 # no proxy as default
 ftp_proxy=
@@ -180,7 +215,6 @@ https_proxy=
 [ "$TMP_APTCACHE" = "$TMP_RANDOM" ] || APTCACHE="$TMP_APTCACHE"
 [ "$TMP_DLDIR" = "$TMP_RANDOM" ] || DLDIR="$TMP_DLDIR"
 [ "$TMP_DLLIST" = "$TMP_RANDOM" ] || DLLIST="$TMP_DLLIST"
-[ "$TMP_LISTDIR" = "$TMP_RANDOM" ] || LISTDIR="$TMP_LISTDIR"
 [ "$TMP__MAXNUM" = "$TMP_RANDOM" ] || _MAXNUM="$TMP__MAXNUM"
 [ "$TMP__MAXCONPERSRV" = "$TMP_RANDOM" ] || _MAXCONPERSRV="$TMP__MAXCONPERSRV"
 [ "$TMP__SPLITCON" = "$TMP_RANDOM" ] || _SPLITCON="$TMP__SPLITCON"
@@ -188,6 +222,7 @@ https_proxy=
 [ "$TMP__PIECEALGO" = "$TMP_RANDOM" ] || _PIECEALGO="$TMP__PIECEALGO"
 [ "$TMP_aptfast_prefix" = "$TMP_RANDOM" ] || aptfast_prefix="$TMP_aptfast_prefix"
 [ "$TMP_APT_FAST_TIMEOUT" = "$TMP_RANDOM" ] || APT_FAST_TIMEOUT="$TMP_APT_FAST_TIMEOUT"
+[ "$TMP_APT_FAST_APT_AUTH" = "$TMP_RANDOM" ] || APT_FAST_APT_AUTH="$TMP_APT_FAST_APT_AUTH"
 [ "$TMP_VERBOSE_OUTPUT" = "$TMP_RANDOM" ] || VERBOSE_OUTPUT="$TMP_VERBOSE_OUTPUT"
 [ "$TMP_ftp_proxy" = "$TMP_RANDOM" ] || ftp_proxy="$TMP_ftp_proxy"
 [ "$TMP_http_proxy" = "$TMP_RANDOM" ] || http_proxy="$TMP_http_proxy"
@@ -223,17 +258,25 @@ _create_lock()
 {
     eval "exec $LCK_FD>\"$LCK_FILE.lock\""
 
-#    trap "cleanup_aptfast; exit_cleanup_state" EXIT
-#    This will hide the exit code
+    # 设置 trap 来清理资源
     trap "cleanup_aptfast" EXIT
     trap "cleanup_aptfast; exit 1" INT TERM
-	timer=0
-	until $(flock -xn $LCK_FD);do 
-	msg_already_running
-	sleep 1
-	let timer+=1
-	done
-	unset timer
+
+    timer=0
+    max_wait=180  # 最大等待时间为180秒（3分钟）
+
+    until $(flock -xn $LCK_FD); do
+        msg_already_running
+        sleep 1
+        let timer+=1
+
+        if [ $timer -ge $max_wait ]; then
+            echo "timeout"
+            exit 1
+        fi
+    done
+
+    unset timer
 }
 
 # unlock and remove the lock file
@@ -263,7 +306,8 @@ cleanup_dllist()
 
 cleanup_aptfast()
 {
-  [ "$CLEANUP_STATE" -eq 0 ] && CLEANUP_STATE=$?
+  local last_exit_code=$?
+  [ "$CLEANUP_STATE" -eq 0 ] && CLEANUP_STATE=$last_exit_code
   cleanup_dllist
   _remove_lock
 }
@@ -281,6 +325,7 @@ urldecode()
 }
 
 # Check if mirrors are available. And if so add all mirrors to download list.
+############ SPARK ADJUST: Now we ignore the first config for business request
 get_mirrors(){
   # Check all mirror lists.
   for mirrorstr in "${MIRRORS[@]}"; do
@@ -291,9 +336,9 @@ get_mirrors(){
     for mirror in "${mirrors[@]}"; do
       # Real expension.
       if [[ "$1" == "$mirror"* ]]; then
-        filepath=${1#${mirror}}
+        filepath="${1#"${mirror}"}"
         # Build list for aria download list.
-        list="${mirrors[*]}"
+        list="${mirrors[*]:1}"
         echo -e "${list// /${filepath}\\t}$filepath\n"
         return 0
       fi
@@ -303,74 +348,131 @@ get_mirrors(){
   echo "$1"
 }
 
+##########SPARK ADJUST: END
+
+AUTH_INFO_PARSED=()
+# Parse apt authentication files.
+# Undefined behavior on whitespaces in host, username or password.
+prepare_auth(){
+  if [ "$APT_FAST_APT_AUTH" -eq 0 ]; then
+    return
+  fi
+  for auth_file in "${APTAUTHFILES[@]}"; do
+    # auth files have netrc syntax, possible multiline entries starting with "machine"
+    auth_info="$(tr '\n' ' ' < "$auth_file" | sed 's/\(\<machine\>\)/\n\1/g' | sed '1d')"
+    while IFS= read -r auth; do
+      machine="$(echo "$auth" | sed 's/.*\<machine\>[ \t]\+\([^ \t]\+\).*/\1/')"
+      login="$(echo "$auth" | sed 's/.*\<login\>[ \t]\+\([^ \t]\+\).*/\1/')"
+      password="$(echo "$auth" | sed 's/.*\<password\>[ \t]\+\([^ \t]\+\).*/\1/')"
+      # if machine does not have protocol, try https://
+      if ! [[ "$machine" =~ ^.*:// ]]; then
+        machine="https://$machine"
+      fi
+      if [ -z "$machine" ] || [ -z "$login" ] || [ -z "$password" ]; then
+        msg "Could not parse apt authentication (skipping): $auth ($auth_file)" "warning"
+        continue
+      fi
+      # use space separated string to convert back to array later
+      AUTH_INFO_PARSED+=("$machine $login $password")
+    done <<< "$auth_info"
+  done
+  if [ "${#AUTH_INFO_PARSED[@]}" -eq 0 ]; then
+    # acts like auth disabled when no auth info is provided to improve performance
+    APT_FAST_APT_AUTH=0
+  fi
+}
+
+# Gets URI as parameter and tries to add basic http credentials. Will fail on
+# credentials that contain characters that need URL-encoding.
+get_auth(){
+  for auth_info in "${AUTH_INFO_PARSED[@]}"; do
+    # convert to array, don't escape variable here
+    auth_info_arr=($auth_info)
+    machine="${auth_info_arr[0]}"
+    # takes first match
+    if [[ "$1" == "$machine"* ]]; then
+      login="${auth_info_arr[1]}"
+      password="${auth_info_arr[2]}"
+      uri="$(echo "$1" | sed "s|^\([^:]\+://\)|\1$login:$password@|")"
+      echo "$uri"
+      return
+    fi
+  done
+  echo "$1"
+}
+
 # Globals to save package name, version, size and overall size.
 DOWNLOAD_DISPLAY=
 DOWNLOAD_SIZE=0
 
+# 获取包的URI
 # Get the package URLs.
 get_uris(){
-
   if [ ! -d "$(dirname "$DLLIST")" ]
   then
     if ! mkdir -p -- "$(dirname "$DLLIST")"
     then
       msg "Could not create download file directory." "warning"
-      msg "无法创建下载文件夹" "warning"
-      exit 1
+      msg "无法创建下载目录" "warning"
+      CLEANUP_STATE=1
+      exit
     fi
   elif [ -f "$DLLIST" ]; then
     if ! rm -f -- "$DLLIST" 2>/dev/null && ! touch -- "$DLLIST" 2>/dev/null
     then
-      msg "Unable to write to download file. Try restarting with root permissions or run 'aptss clean' first." "warning"
+      msg "Unable to write to download file. Try restarting with root permissions or run 'apt-fast clean' first." "warning"
       msg "无法下载文件。尝试使用root权限，或者运行 'aptss clean'" "warning"
-      exit 1
+      CLEANUP_STATE=1
+      exit
     fi
   fi
 
   # Add header to overwrite file.
   echo "# apt-fast mirror list: $(date)" > "$DLLIST"
-  #NOTE: aptitude doesn't have this functionality, so we use apt-get to get
-  #      package URIs.
-#  case "$_APTMGR" in
-#    apt|apt-get) uri_mgr=$_APTMGR;;
-#    *) uri_mgr=apt-get;;
-#  esac
-  # NOTE:apt可能出现变动，不建议在脚本中使用，因此在此统一改用apt-get
-uri_mgr=apt-get
+  # NOTE: "aptitude" doesn't have this functionality
+  # so we use "${_APTMGR}" to get package URI's
+  case "$(basename "${_APTMGR}")" in
+    'apt'|'apt-get') uri_mgr="${_APTMGR}";;
+    *) uri_mgr='apt-get';;
+  esac
   uris_full="$("$uri_mgr" "${APT_SCRIPT_WARNING[@]}" -y --print-uris "$@")"
-  uris_full_ret="$?"
-  if [ "$uris_full_ret" -ne 0 ]
+  CLEANUP_STATE="$?"
+  if [ "$CLEANUP_STATE" -ne 0 ]
   then
-    msg "Package manager quit with exit code.Here is the log" "warning"
+    msg "Package manager quit with exit code. Here is the log" "warning"
     msg "包管理器以错误代码退出.日志如下" "warning"
     msg "${uris_full}"
-    exit "$uris_full_ret"
+    exit "$CLEANUP_STATE"
   fi
-  while read -r pkg_uri_info
-  do
-    [ -z "$pkg_uri_info" ] && continue
-    ## --print-uris format is:
-    # 'fileurl' filename filesize checksum_hint:filechecksum
-    uri="$(echo "$pkg_uri_info" | cut -d' ' -f1 | tr -d "'")"
-    filename="$(echo "$pkg_uri_info" | cut -d' ' -f2)"
-    filesize="$(echo "$pkg_uri_info" | cut -d' ' -f3)"
-    checksum_string="$(echo "$pkg_uri_info" | cut -d' ' -f4)"
-    hash_algo="$(echo "$checksum_string" | cut -d':' -f1)"
-    checksum="$(echo "$checksum_string" | cut -d':' -f2)"
-
-    filename_decoded="$(urldecode "$filename")"
-    DOWNLOAD_DISPLAY="${DOWNLOAD_DISPLAY}$(echo "$filename_decoded" | cut -d'_' -f1)"
-    DOWNLOAD_DISPLAY="${DOWNLOAD_DISPLAY} $(echo "$filename_decoded" | cut -d'_' -f2)"
-    DOWNLOAD_DISPLAY="${DOWNLOAD_DISPLAY} $(echo "$filesize" | numfmt --to=iec-i --suffix=B)\n"
-    DOWNLOAD_SIZE=$((DOWNLOAD_SIZE + filesize))
-
-    ## whole uri comes encoded (urlencoded). Filename must NOT be decoded because
-    # plain aptitude do not decode it when download and install it. Therefore, we
-    # will have ugly named packages at /var/cache/apt/archives but is the standard
-    # behavior.
-    # But package version must be decoded, otherways package=version calls will
-    # not work.
+  prepare_auth
+  local tmpdir
+  tmpdir=$(mktemp -d) || {
+    msg "Failed to create tmp dir" "warning"
+    msg "无法创建临时目录" "warning"
+    exit 1
+  }
+  ## --print-uris format is:
+  # 'fileurl' filename filesize checksum_hint:filechecksum
+  # 修改：process_package函数增加第二个参数表示当前线程的临时输出文件
+  process_package() {
+    local pkg_uri_info="$1"
+    local thread_file="$2"
+    local display_line=""   # 初始化显示信息为空
+    IFS=' ' read -r uri filename filesize checksum_string _ <<<"$pkg_uri_info"
+    [ -z "$uri" ] && return
+    uri="${uri//"'"/}"
+    [ "$APT_FAST_APT_AUTH" -ne 0 ] && uri="$(get_auth "$uri")"
+    IFS=':' read -r hash_algo checksum _ <<<"$checksum_string"
 
+    if [[ "$filename" == *%* ]]; then
+      # decode url string
+      filename_decoded="$(printf '%b' "${filename//%/\\x}")"
+    else
+      filename_decoded="$filename"
+    fi
+    IFS='_' read -r pkg_name_decoded pkg_version_decoded _ <<<"$filename_decoded"
+    
+    display_line+="$pkg_name_decoded $pkg_version_decoded $filesize\n"
     if [ -n "$HASH_SUPPORTED" ]; then
       case "$hash_algo" in
         SHA512) [ -z "$SHA512_SUPPORTED" ] && hash_algo= || hash_algo=sha-512 ;;
@@ -380,40 +482,44 @@ uri_mgr=apt-get
         *) hash_algo=
       esac
 
-      # Using apt-cache show package=version to ensure recover single and
+
+       # Using apt-cache show package=version to ensure recover single and
       # correct package version.
       # Warning: assuming that package naming uses '_' as field separator.
-      # Therefore, this code expects package-name_version_arch.deb Otherways
+      # Therefore, this code expects package-name_version_arch.deb Otherwise
       # below code will fail resoundingly
       if [ -z "$hash_algo" ]; then
-        pkg_name="$(echo "$filename" | cut -d'_' -f1)"
-        pkg_version="$(echo "$filename" | cut -d'_' -f2)"
-        pkg_version="$(urldecode "$pkg_version")"
-        package_info="$(apt-cache show "$pkg_name=$pkg_version")"
+        IFS='_' read -r pkg_name _ <<<"$filename"
+        pkg_version="$pkg_version_decoded"
+        # Transform multi-line field output from apt-cache to single line and sort checksums, strongest first
+        package_info="$(apt-cache show "$pkg_name=$pkg_version" | sed ':r;$!{N;br};s/\n / /g' | sort -r)"
 
-        patch_checksum=
-        if [ -n "$SHA512_SUPPORTED" ]; then
-          patch_checksum="$(echo "$package_info" | grep SHA512 | head -n 1)"
-          [ -n "$patch_checksum" ] && hash_algo="sha-512"
-        fi
-        if [ -z "$patch_checksum" ] && [ -n "$SHA256_SUPPORTED" ]; then
-          patch_checksum="$(echo "$package_info" | grep SHA256 | head -n 1)"
-          [ -n "$patch_checksum" ] && hash_algo="sha-256"
-        fi
-        if [ -z "$patch_checksum" ] && [ -n "$SHA1_SUPPORTED" ]; then
-          patch_checksum="$(echo "$package_info" | grep SHA1 | head -n 1)"
-          [ -n "$patch_checksum" ] && hash_algo="sha-1"
-        fi
-        if [ -z "$patch_checksum" ] && [ -n "$MD5sum_SUPPORTED" ]; then
-          patch_checksum="$(echo "$package_info" | grep MD5sum | head -n 1)"
-          [ -n "$patch_checksum" ] && hash_algo="md5"
-        fi
+        while IFS=': ' read -r field checksum _
+        do
+          case "$field" in
+            SHA512)
+              [ -n "$SHA512_SUPPORTED" ] || continue
+              hash_algo="sha-512"
+              break ;;
+            SHA256)
+              [ -n "$SHA256_SUPPORTED" ] || continue
+              hash_algo="sha-256"
+              break ;;
+            SHA1)
+              [ -n "$SHA1_SUPPORTED" ] || continue
+              hash_algo="sha-1"
+              break ;;
+            MD5sum)
+              [ -n "$MD5sum_SUPPORTED" ] || continue
+              hash_algo="md5"
+              break ;;
+          esac
+        done <<<"$package_info"
 
-        if [ -n "$patch_checksum" ]; then
-          checksum="$(echo "$patch_checksum" | cut -d' ' -f2)"
-        else
+        if [ -z "$hash_algo" ]; then
+          checksum=
           msg "Couldn't get supported checksum for $pkg_name ($pkg_version)." "warning"
-	  msg "无法获得 $pkg_name ($pkg_version) 的受支持的散列验证值" "warning"
+          msg "无法获得 $pkg_name ($pkg_version) 版本受到支持的散列验证值" "warning"
           REMOVE_WORKING_MESSAGE=
         fi
       fi
@@ -421,21 +527,68 @@ uri_mgr=apt-get
       hash_algo=
     fi
 
+    # 原来利用文件锁写入，现在改为写入当前线程的临时文件
     {
       get_mirrors "$uri"
-      #echo " dir=$DLDIR"
-      if [ -n "$hash_algo" ]; then
-        echo " checksum=$hash_algo=$checksum"
-      fi
+      [ -n "$hash_algo" ] && echo " checksum=$hash_algo=$checksum"
       echo " out=$filename"
-    } >> "$DLLIST"
-  done <<<"$(echo "$uris_full" | grep -E "^'(http(s|)|(s|)ftp)://")"
+    } >> "$thread_file"
 
-  #cat "$DLLIST"
-  #LCK_RM
-  #exit
+    echo -e "$display_line" >> "$tmpdir/display"
+    echo "$filesize" >> "$tmpdir/sizes"
+  }
+
+  # 主并行处理逻辑
+  mapfile -t pkg_uri_list < <(echo "$uris_full" | grep -E "^'(http(s|)|(s|)ftp)://")
+  total_pkgs=${#pkg_uri_list[@]}
+  threads=${THREADS:-4}  # 默认4线程
+  per_thread=$(( (total_pkgs + threads - 1) / threads ))  # 向上取整
+
+  # 分配任务到不同线程，每个线程使用自己的临时文件
+  for ((i=0; i<threads; i++)); do
+    thread_file="${DLLIST}.thread.${i}"
+    > "$thread_file"  # 清空或创建临时文件
+    start=$((i * per_thread))
+    end=$((start + per_thread -1))
+    [ $end -ge $total_pkgs ] && end=$((total_pkgs -1))
+    
+    # 启动后台线程处理任务块
+    (
+      for ((j=start; j<=end; j++)); do
+        [ -z "${pkg_uri_list[j]}" ] && continue
+        process_package "${pkg_uri_list[j]}" "$thread_file"
+      done
+    ) &
+  done
+
+  # 等待所有后台任务完成
+  wait
+
+  # 合并所有线程的临时文件到最终的 $DLLIST 中（保留之前添加的 header）
+  for ((i=0; i<threads; i++)); do
+    thread_file="${DLLIST}.thread.${i}"
+    if [ -f "$thread_file" ]; then
+      cat "$thread_file" >> "$DLLIST"
+      rm -f "$thread_file"
+    fi
+  done
+
+  # 合并显示信息
+  if [ -f "$tmpdir/display" ]; then
+    DOWNLOAD_DISPLAY+="\n$(cat "$tmpdir/display")"
+  fi
+
+  # 计算总下载大小
+  if [ -f "$tmpdir/sizes" ]; then
+    DOWNLOAD_SIZE=$(awk '{sum+=$1} END{print sum}' "$tmpdir/sizes")
+  fi
+
+  # 清理临时目录
+  rm -rf "$tmpdir"
 }
 
+
+
 display_downloadfile(){
   if [ -n "$VERBOSE_OUTPUT" ]; then
     cat "$DLLIST"
@@ -443,18 +596,16 @@ display_downloadfile(){
     DISPLAY_SORT_OPTIONS=(-k 1,1)
     # Sort output after package download size (decreasing):
     #DISPLAY_SORT_OPTIONS=(-k 3,3 -hr)
-    while read -r line; do
-        [ -z "$line" ] && continue
-        pkg="$(echo "$line" | cut -d' ' -f1)"
-        ver="$(echo "$line" | cut -d' ' -f2)"
-        size="$(echo "$line" | cut -d' ' -f3)"
+    while IFS=' ' read -r pkg ver size _; do
+        [ -z "$pkg" ] && continue
         printf '%s%-40s %-20s %10s\n' "$aptfast_prefix" "$pkg" "$ver" "$size"
-    done <<<"$(echo -e "$DOWNLOAD_DISPLAY" | sort "${DISPLAY_SORT_OPTIONS[@]}")"
+    done <<<"$(echo -e "$DOWNLOAD_DISPLAY" | sort "${DISPLAY_SORT_OPTIONS[@]}" | numfmt --to=iec-i --suffix=B --field=3)"
   fi
   msg "Download size: $(echo "$DOWNLOAD_SIZE" | numfmt --to=iec-i --suffix=B)" "normal"
   msg "下载大小: $(echo "$DOWNLOAD_SIZE" | numfmt --to=iec-i --suffix=B)" "normal"
 }
 
+
 # Create and insert a PID number to lockfile.
 
 _create_lock
@@ -464,19 +615,21 @@ CMD="$(echo "$_DOWNLOADER" | sed 's/^\s*\([^ ]\+\).*$/\1/')"
 if [ ! "$(command -v "$CMD")" ]; then
   msg "Command not found: $CMD" "normal" "err"
   msg "You must configure $CONFFILE to use aria2c or another supported download manager" "normal" "err"
-  exit 1
+  CLEANUP_STATE=1
+  exit
 fi
 
 # Make sure package manager is available.
 if [ ! "$(command -v "$_APTMGR")" ]; then
   msg "\`$_APTMGR\` command not available." "warning"
   msg "You must configure $CONFFILE to use either apt-get or aptitude." "normal" "err"
-  exit 1
+  CLEANUP_STATE=1
+  exit
 fi
 
 # Disable script warning if apt is used.
 APT_SCRIPT_WARNING=()
-if [ "$_APTMGR" == "apt" ]; then
+if [ "$(basename "${_APTMGR}")" == 'apt' ]; then
     APT_SCRIPT_WARNING=(-o "Apt::Cmd::Disable-Script-Warning=true")
 fi
 
@@ -523,6 +676,8 @@ while true; do
       d)
         DOWNLOAD_ONLY=true
         ;;
+      *)
+        ;;
     esac
   done
   ((OPTIND++))
@@ -565,7 +720,7 @@ if [ "$option" == "install" ]; then
     msg "Do you want to download the packages? [Y/n] " "question"
 
     while ((!updsys)); do
-      read -r -sn1 -t "$APT_FAST_TIMEOUT" answer || { msg; msg "Timed out." "warning"; exit 1; }
+      read -r -sn1 -t "$APT_FAST_TIMEOUT" answer || { msg; msg "Timed out." "warning"; CLEANUP_STATE=1; exit; }
       case "$answer" in
         [JjYy])    result=1; updsys=1 ;;
         [Nn])      result=0; updsys=1 ;;
@@ -587,33 +742,46 @@ if [ "$option" == "install" ]; then
           mkdir -p -- "$DLDIR"
         fi
 
-        cd "$DLDIR" &>/dev/null || exit 1
+        cd "$DLDIR" &>/dev/null || { msg; msg "Not able to change into download directory." "warning"; CLEANUP_STATE=1; exit; }
 
         eval "${_DOWNLOADER}"  # execute downloadhelper command
         if [ "$(find "$DLDIR" -printf . | wc -c)" -gt 1 ]; then
+
+          # Delete incomplete/corrupted downloaded files, if any: Not recursive, as we don't expect any dirs to exist within $DLDIR.
+
+          # When Aria2c downloads a file and detects it is corrupted, its filename won't be renamed back to its actual name,
+          # preserving .aria2 file extension, which also indicates when a file hasn't been completely downloaded.
+          for x in *.aria2; do
+            rm -f "$x" "${x%.aria2}"
+          done
+
           # Move all packages to the apt install directory by force to ensure
           # already existing debs which may be incomplete are replaced
-          find . -type f -name "*.deb" -execdir mv -ft "$APTCACHE" {} \+
+          find . -type f \( -name '*.deb' -o -name '*.ddeb' \) -execdir mv -ft "$APTCACHE" {} \+
         fi
         cd - &>/dev/null || msg "Failed to change back directory" "warning"
       fi
     else
-      exit 1
+      CLEANUP_STATE=1
+      exit
     fi
   else
     [ -t 1 ] && tput el
   fi
 
-  if [ -z "$DOWNLOAD_ONLY" ] || [ "$_APTMGR" == "aptitude" ]; then
+  # different problem resolving for aptitude
+  if [ -z "$DOWNLOAD_ONLY" ] || [ "$(basename "${_APTMGR}")" == 'aptitude' ]; then
     "${_APTMGR}" "${APT_SCRIPT_WARNING[@]}" "$@"
   fi
 
 
 elif [ "$option" == "clean" ]; then
   "${_APTMGR}" "${APT_SCRIPT_WARNING[@]}" "$@" && {
-    find "$DLDIR" -maxdepth 1 -type f -delete
-    CLEANUP_STATE="$?"
-    [ -f "$DLLIST" ] && rm -f -- "$DLLIST"* || true
+    if [ -d "$DLDIR" ]; then
+      find "$DLDIR" -maxdepth 1 -type f -delete
+      CLEANUP_STATE="$?"
+      [ -f "$DLLIST" ] && rm -f -- "$DLLIST"* || true
+    fi
   }
 
 elif [ "$option" == "download" ]; then
@@ -631,7 +799,8 @@ elif [ "$option" == "download" ]; then
     eval "${_DOWNLOADER}"
   fi
 
-  if [ "$_APTMGR" == "aptitude" ]; then
+  # different problem resolving for aptitude
+  if [ "$(basename "${_APTMGR}")" == 'aptitude' ]; then
     "${_APTMGR}" "$@"
   fi
 
@@ -667,3 +836,4 @@ else
 fi
 
 # After error or all done remove our lockfile (done with EXIT trap)
+