!97 3.1.5-5 版本号确认

* 3155
* update debian/changelog.

.gitee/Dockerfile

@@ -1,2 +1,4 @@
-FROM python:3
+FROM shenmo7192/uos-21-dtk5.4:1.0
-RUN pip3 install requests 
+ADD . /root/workdir
+WORKDIR /root/workdir
+RUN dpkg-buildpackage

.gitignore

@@ -51,3 +51,4 @@ debian/*.debhelper*
 debian/files
 debian/*.substvars
 debian/spark-store
+

.workflow/dtk-build-commit-20220425.yml

@@ -0,0 +1,39 @@
+version: '1.0'
+name: dtk-build-commit-20220425
+displayName: dtk-build-commit
+triggers:
+  trigger: auto
+  pr:
+    branches:
+      prefix:
+        - ''
+stages:
+  - name: stage-4e566164
+    displayName: build
+    strategy: naturally
+    trigger: auto
+    executor: []
+    steps:
+      - step: execute@docker
+        name: execute_by_docker
+        displayName: 基于镜像的脚本执行
+        certificate: ''
+        image: docker.io/debian:buster-slim
+        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 ..."
+          - apt install git devscripts equivs curl -y >/dev/null 2>&1
+          - 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 -b -us -uc
+          - cd ..
+          - ls -all
+          - pwd
+        strategy: {}

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

@@ -0,0 +1,63 @@
+version: '1.0'
+name: dtk-build-release-tag-20220425
+displayName: dtk-build-release-tag
+triggers:
+  trigger: auto
+  push:
+    tags:
+      prefix:
+        - ''
+stages:
+  - name: stage-4e566164
+    displayName: build
+    strategy: naturally
+    trigger: auto
+    executor: []
+    steps:
+      - step: build@gcc
+        name: build_gcc
+        displayName: GCC 构建
+        gccVersion: '9.4'
+        commands:
+          - sed -i 's/archive.ubuntu.com/mirrors.ustc.edu.cn/g' /etc/apt/sources.list
+          - '# 换源'
+          - apt update
+          - echo "正在准备Debian 10环境..."
+          - apt install git -y >/dev/null 2>&1
+          - git clone https://gitlink.org.cn/shenmo7192/debian-10-container.git
+          - mv debian-10-container/Debian-10.tar.xz /mnt
+          - cd /mnt/
+          - tar -xf Debian-10.tar.xz
+          - cd Debian-10
+          - wget https://gitee.com/deepin-community-store/repo_auto_update_script/raw/master/spark-build.sh
+          - chmod +x spark-build.sh
+          - echo "进入Debian 10环境"
+          - chroot /mnt/Debian-10 /bin/bash /spark-build.sh
+          - cd /mnt/Debian-10/build-spark
+          - 'mkdir target '
+          - for f in $(find . -type f -name "*.deb")
+          - do
+          - '    mv $f target'
+          - done
+        artifacts:
+          - name: BUILD_ARTIFACT
+            path:
+              - /mnt/Debian-10/build-spark/target
+        caches: []
+        notify: []
+        strategy:
+          retry: '0'
+  - name: stage-29f3ffbb
+    displayName: 上传
+    strategy: naturally
+    trigger: auto
+    executor: []
+    steps:
+      - step: publish@general_artifacts
+        name: publish_general_artifacts
+        displayName: 上传制品
+        dependArtifact: BUILD_ARTIFACT
+        artifactName: output
+        notify: []
+        strategy:
+          retry: '0'

DOCS/code-analyze.md

@@ -0,0 +1,328 @@
+
+#### 说明
+
+当前服务器线路列表（项目中包含）：
+
+```
+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/spk-doc.md

@@ -0,0 +1,25 @@
+#### 调用参数(spk规则)
+
+参数只有一个Url，该url应当遵循这种格式：`spk://<任意合法字符>/web分类/包名`
+
+例如:
+
+[spk://abcdefg/games/store.spark-app.hmcl](spk://abcdefg/games/store.spark-app.hmcl)
+
+
+可选的web分类：
+
+| 分类名称 | web分类   　    |
+| -------- | -------------- |
+| 网络应用 | network        |
+| 社交沟通 | chat           |
+| 音乐欣赏 | music          |
+| 视频播放 | video          |
+| 图形图像 | graphics       |
+| 游戏娱乐 | games          |
+| 办公学习 | office         |
+| 阅读翻译 | reading        |
+| 编程开发 | development    |
+| 系统工具 | tools          |
+| 主题美化 | beautify       |
+| 其他应用 | others         |

README.md

@@ -1,388 +1,58 @@
-#  星火应用商店
+#  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)
-
+
-众所周知，国内的Linux应用比较少，wine应用难以获取，优质工具分散在民间各大论坛，无法形成合力，难以改善生态
+Spark Store aims to collect Linux apps for the convieniece of Linux new comers
-
+
-生态构建需要的不是某一方的单打独斗，而是人人行动起来，汇聚星火，产生燎原之势
+The collecting process needs everyone's help
-
+
-我们创建了这个应用商店，广泛收录大家需要的软件包，搜集优质小工具，主动适配wine应用，存放到储存库供大家获取
+We set up this APP Store and collect APPs/tools that everyone need widely. Also we pack Windows apps with wine. 
-
+
-我们支持：Deepin 20 ; Ubuntu 20.04 LTS ; UOS Home 20
+All packages will be shared in our repository for users to get freely. 
-
+
-希望看到这里的人也可以加入我们的队伍，开发或者投递应用都很欢迎，共同构建Linux应用生态
+Distrobution supported：Deepin 20 ; Ubuntu 22.04 LTS / Ubuntu 20.04 LTS(May stop support in the future） ; UniontechOS Home 21
-
+
-### [在这里投稿](https://upload.deepinos.org/index)
+
-
+
-web页面部分正在开发当中，详情请见[web仓库](https://gitee.com/deepin-community-store/DCSAPP_WEB)
+I hope people who see here can also join our team，development help or submit applications are welcomed
-
+
-
+If you want to submit an APP to share with others，Please [Click here](https://upload.deepinos.org/index)
-#### 说明
+
-
+
-当前服务器线路列表（项目中包含）：
+## 🙌 A simple start
-
+
-```
+If you simply want to install the Spark Store,just enter the  [Release] page, find the version you want and install.
-https://d.store.deepinos.org.cn/
+
-https://store.deepinos.org.cn/
+If you are using Debian11/Ubuntu 20.04, you will need extra dependency package. Available [here](https://code.gitlink.org.cn/shenmo7192/spark-store-dependencies/raw/branch/master/spark-store-dependencies-kylin.zip)
-```
+
-
+---
-#### 调用参数(spk规则)
+#### Compile and developement
-
+
-参数只有一个Url，该url应当遵循这种格式：`spk://<任意合法字符>/web分类/包名`
+
-
+For Deepin V20/UOS 21/ Debian 11
-例如:
+
-
+```shell
-[spk://abcdefg/games/store.spark-app.hmcl](spk://abcdefg/games/store.spark-app.hmcl)
+sudo apt install git qt5-default debhelper pkg-config qtchooser libqt5core5a libqt5gui5 libqt5widgets5 libqt5network5 libqt5concurrent5 libdtkcore-dev libdtkgui-dev  libdtkwidget-dev qttools5-private-dev libnotify-dev qtwebengine5-dev
-
+
-
+```
-可选的web分类：
+
-
+Ubuntu 22.04
-| 分类名称 | web分类   　    |
+```shell
-| -------- | -------------- |
+sudo apt install git qtbase5-dev debhelper pkg-config qtchooser libqt5core5a libqt5gui5 libqt5widgets5 libqt5network5 libqt5concurrent5 libdtkcore-dev libdtkgui-dev  libdtkwidget-dev qttools5-private-dev libnotify-dev qtwebengine5-dev
-| 网络应用 | network        |
+
-| 社交沟通 | chat           |
+```
-| 音乐欣赏 | music          |
+
-| 视频播放 | video          |
+Then
-| 图形图像 | graphics       |
+
-| 游戏娱乐 | games          |
+```shell
-| 办公学习 | office         |
+git clone https://gitee.com/deepin-community-store/spark-store.git
-| 阅读翻译 | reading        |
+cd spark-store
-| 编程开发 | development    |
+dpkg-buildpackage
-| 系统工具 | tools          |
+```
-| 主题美化 | beautify       |
+
-| 其他应用 | others         |
+
-
+
-
+## 🚀 Coorperation
-
+
-#### 如何编译
+We use Gitee as our code hosting platform. Please click here to contact us. 
-
+
-Deepin V20/UOS 系统下, 安装依赖
+https://gitee.com/deepin-community-store/spark-store
-
-```shell
-sudo apt install qt5-default libdtkcore-dev libdtkgui-dev libdtkwidget-dev qtwebengine5-dev libnotify-dev
-```
-
-```shell
-git clone https://gitee.com/deepin-community-store/spark-store.git
-cd spark-store
-mkdir build && cd build
-qmake ..
-make -j
-```
-
-./build 文件夹下的 spark-store 即为可执行文件
-
-P.S. 安装依赖后直接运行 build.sh 即可编译并打包
-
-# 星火应用商店文档
-
-# 目录结构
-几个目录结构
-```
-/
-/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);
-}
-```

README.zh.md

@@ -0,0 +1,50 @@
+#  星火应用商店
+[![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)
+
+众所周知，国内的Linux应用比较少，wine应用难以获取，优质工具分散在民间各大论坛，无法形成合力，难以改善生态
+
+生态构建需要的不是某一方的单打独斗，而是人人行动起来，汇聚星火，产生燎原之势
+
+我们创建了这个应用商店，广泛收录大家需要的软件包，搜集优质小工具，主动适配wine应用，存放到储存库供大家获取
+我们支持：Deepin 20 ; Ubuntu 22.04 LTS / Ubuntu 20.04 LTS(将会逐渐停止支持） ; UOS Home 21
+
+希望看到这里的人也可以加入我们的队伍，开发或者投递应用都很欢迎，共同构建Linux应用生态
+
+如果有想要提交的软件包，请 [在这里投稿](https://upload.deepinos.org/index)
+
+
+## 🙌 简单的开始
+
+如果想安装 `星火应用商店` ，请打开右侧的 [Release] 页面，找到最新版本，并选择适用于当前系统的安装包下载。
+
+如果你在使用 `Debian 11/Ubuntu 20.04`，你需要额外下载[依赖补充包](https://code.gitlink.org.cn/shenmo7192/spark-store-dependencies/raw/branch/master/spark-store-dependencies-kylin.zip)
+
+---
+#### 编译安装
+
+
+Deepin V20/UOS 21 系统下, 安装依赖
+
+```shell
+sudo apt install git qt5-default debhelper pkg-config qtchooser libqt5core5a libqt5gui5 libqt5widgets5 libqt5network5 libqt5concurrent5 libdtkcore-dev libdtkgui-dev  libdtkwidget-dev qttools5-private-dev libnotify-dev qtwebengine5-dev
+
+```
+
+Ubuntu 22.04 系统下, 安装依赖
+```shell
+sudo apt install git qtbase5-dev debhelper pkg-config qtchooser libqt5core5a libqt5gui5 libqt5widgets5 libqt5network5 libqt5concurrent5 libdtkcore-dev libdtkgui-dev  libdtkwidget-dev qttools5-private-dev libnotify-dev qtwebengine5-dev
+
+```
+
+然后
+```shell
+git clone https://gitee.com/deepin-community-store/spark-store.git
+cd spark-store
+dpkg-buildpackage
+```
+
+
+
+## 🚀 协作
+
+非常感谢有兴趣的开发者或爱好者参与 `星火应用商店` 项目，分享你的见解与思路。

assets/icons.qrc

@@ -34,7 +34,6 @@
         <file>icons/refresh-page.svg</file>
     </qresource>
     <qresource prefix="/">
-        <file>Logo-Spark.png</file>
         <file>tags/a2d.png</file>
         <file>tags/community.svg</file>
         <file>tags/deepin.svg</file>
@@ -51,6 +50,8 @@
         <file>tags/dwine5-small.png</file>
         <file>tags/dwine5.svg</file>
         <file>tags/dwine2-small.png</file>
+        <file>spark-store.png</file>
+        <file>spark-logo.svg</file>
     </qresource>
     <qresource prefix="/fonts">
         <file>fonts/hksnzt.ttf</file>

assets/spark-logo.svg

@@ -0,0 +1,253 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   sodipodi:docname="spark-logo.svg"
+   inkscape:version="1.1 (c4e8f9e, 2021-05-24)"
+   id="svg8"
+   version="1.1"
+   viewBox="0 0 180.00012 48.251057"
+   height="48.251057mm"
+   width="180.00012mm"
+   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
+       id="linearGradient1200"
+       inkscape:collect="always">
+      <stop
+         id="stop1196"
+         offset="0"
+         style="stop-color:#000000;stop-opacity:0.1299435" />
+      <stop
+         id="stop1198"
+         offset="1"
+         style="stop-color:#dadada;stop-opacity:0.81960785" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient1138">
+      <stop
+         style="stop-color:#99e7ea;stop-opacity:1"
+         offset="0"
+         id="stop1134" />
+      <stop
+         style="stop-color:#007ffc;stop-opacity:1"
+         offset="1"
+         id="stop1136" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient1128"
+       inkscape:collect="always">
+      <stop
+         id="stop1124"
+         offset="0"
+         style="stop-color:#99e7ea;stop-opacity:1" />
+      <stop
+         id="stop1126"
+         offset="1"
+         style="stop-color:#007ffc;stop-opacity:1" />
+    </linearGradient>
+    <inkscape:path-effect
+       only_selected="false"
+       apply_with_weight="true"
+       apply_no_weight="true"
+       helper_size="0"
+       steps="2"
+       weight="33.333333"
+       is_visible="true"
+       id="path-effect960"
+       effect="bspline"
+       lpeversion="0" />
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.98112945,0,3.7714702)"
+       r="90.135414"
+       fy="199.86011"
+       fx="100.35268"
+       cy="199.86011"
+       cx="100.35268"
+       id="radialGradient1130"
+       xlink:href="#linearGradient1128"
+       inkscape:collect="always" />
+    <radialGradient
+       r="90.135414"
+       fy="199.86011"
+       fx="100.35268"
+       cy="199.86011"
+       cx="100.35268"
+       gradientTransform="matrix(1,0,0,0.98112945,0,3.7714702)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient1132"
+       xlink:href="#linearGradient1138"
+       inkscape:collect="always" />
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.98112945,0,3.7714702)"
+       r="90.135414"
+       fy="199.86011"
+       fx="100.35268"
+       cy="199.86011"
+       cx="100.35268"
+       id="radialGradient1202"
+       xlink:href="#linearGradient1200"
+       inkscape:collect="always" />
+    <filter
+       id="filter1448"
+       inkscape:label="Drop Shadow"
+       style="color-interpolation-filters:sRGB">
+      <feFlood
+         id="feFlood1438"
+         result="flood"
+         flood-color="rgb(145,145,145)"
+         flood-opacity="0.372549" />
+      <feComposite
+         id="feComposite1440"
+         result="composite1"
+         operator="in"
+         in2="SourceGraphic"
+         in="flood" />
+      <feGaussianBlur
+         id="feGaussianBlur1442"
+         result="blur"
+         stdDeviation="5.2918"
+         in="composite1" />
+      <feOffset
+         id="feOffset1444"
+         result="offset"
+         dy="0"
+         dx="0" />
+      <feComposite
+         id="feComposite1446"
+         result="composite2"
+         operator="over"
+         in2="offset"
+         in="SourceGraphic" />
+    </filter>
+    <filter
+       id="filter2201"
+       inkscape:label="Drop Shadow"
+       style="color-interpolation-filters:sRGB">
+      <feFlood
+         id="feFlood2191"
+         result="flood"
+         flood-color="rgb(145,145,145)"
+         flood-opacity="0.372549" />
+      <feComposite
+         id="feComposite2193"
+         result="composite1"
+         operator="in"
+         in2="SourceGraphic"
+         in="flood" />
+      <feGaussianBlur
+         id="feGaussianBlur2195"
+         result="blur"
+         stdDeviation="3.76995"
+         in="composite1" />
+      <feOffset
+         id="feOffset2197"
+         result="offset"
+         dy="0"
+         dx="0" />
+      <feComposite
+         id="feComposite2199"
+         result="composite2"
+         operator="over"
+         in2="offset"
+         in="SourceGraphic" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     inkscape:document-rotation="0"
+     inkscape:window-maximized="1"
+     inkscape:window-y="0"
+     inkscape:window-x="0"
+     inkscape:window-height="946"
+     inkscape:window-width="1920"
+     showgrid="false"
+     inkscape:current-layer="layer2"
+     inkscape:document-units="mm"
+     inkscape:cy="332.14286"
+     inkscape:cx="520.71429"
+     inkscape:zoom="0.7"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     borderopacity="1.0"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base"
+     inkscape:pagecheckerboard="0" />
+  <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
+     transform="translate(-34.291348,-63.035531)"
+     id="layer1"
+     inkscape:groupmode="layer"
+     inkscape:label="Layer 1" />
+  <g
+     inkscape:label="Layer 2"
+     id="layer2"
+     inkscape:groupmode="layer"
+     transform="translate(-34.291348,33.964469)">
+    <path
+       inkscape:connector-curvature="0"
+       id="path1002"
+       d="m 50.895965,-25.80076 c 0,0 3.210258,-0.04536 6.509677,1.995776 3.299426,2.041135 5.216663,3.991553 5.840878,5.261592 0.624212,1.270041 2.67521,3.492613 2.630628,7.574884 -0.04461,4.0822665 -0.98091,6.8037874 -2.586039,9.0717077 -1.605128,2.26792732 -4.503272,3.9915518 -7.981044,4.0822737 -3.477778,0.090717 -5.707121,-2.17720666 -6.465096,-3.4472534 -0.757975,-1.270036 -1.070084,-3.9915518 -0.133761,-5.9419619 0.936325,-1.9504282 2.40769,-1.9504282 2.898147,-1.7689877 0.490455,0.181438 0.624213,0.4535811 0.891735,0.9525256 0.26752,0.4989447 0.44587,0.4082311 0.847161,0.1360795 0.401275,-0.2721541 0.535033,-0.5896654 0.445866,-0.9978916 -0.08917,-0.408231 -0.62422,-0.9071732 -1.070092,-1.0432502 -0.445865,-0.1360747 -1.070085,-0.5443017 -1.961822,-0.4082167 -0.891736,0.136065 -2.630623,0.5896548 -4.101988,2.585427 -1.471365,1.9957744 -1.29302,5.0801606 -0.401281,6.5316309 0.891737,1.45147531 2.586035,4.1729873 6.331332,5.1255217 3.745301,0.9525364 9.809105,-1.8597006 11.904684,-6.2141209 2.095577,-4.3544229 2.140168,-6.3955562 2.051001,-9.9788777 -0.08917,-3.583335 -3.254842,-8.935643 -6.777199,-10.886061 -3.522357,-1.950419 -6.152982,-3.084383 -8.872787,-2.630797 z"
+       style="fill:#ffc344;fill-opacity:1;stroke:none;stroke-width:0.0890379px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path1012"
+       d="m 52.759546,-7.6807986 c 0,0 -0.882776,-0.833911 -1.670967,0.6414663 -0.788192,1.4753675 -1.166523,2.790373 -0.378332,4.3940472 0.78819,1.6036647 2.427624,2.56586017 4.949854,2.53379165 2.522203,-0.0321084 4.382334,-0.64146726 5.485801,-2.46964635 1.103472,-1.8281836 1.954712,-3.1752577 2.049297,-3.8487984 0.09459,-0.6735444 0.599029,0.096216 0.441394,0.6735407 -0.15764,0.5773125 -0.126112,1.6998816 0.315273,1.4753653 0.441388,-0.2245063 0.788195,-0.5773163 0.851243,-0.4169509 0.06306,0.1603616 -0.50444,1.154644 -0.772422,1.6517766 -0.267993,0.4971326 -1.103472,1.699893 -1.592156,2.16494892 -0.488669,0.46506666 -1.166517,1.1225704 -1.970475,1.6036691 C 59.664103,1.2035109 58.418766,1.7647989 57.725156,1.893092 57.031546,2.0213857 55.644328,2.2940039 54.856131,2.2619316 54.067946,2.2298548 53.059055,2.0855246 51.939826,1.5242442 50.820592,0.96296626 49.606778,0.0969782 49.133864,-0.76900099 48.66095,-1.6349808 47.935815,-2.4207789 48.093452,-4.6017617 c 0.15764,-2.1809854 0.86701,-3.3035574 1.40298,-3.8167243 0.53597,-0.5131766 1.32416,-0.7376922 1.844369,-0.6254295 0.520205,0.1122529 0.851246,0.4169555 0.977357,0.6414613 0.126107,0.224512 0.331042,0.6414675 0.441388,0.7216556 z"
+       style="fill:#f06767;fill-opacity:1;stroke:none;stroke-width:0.0890379px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path1014"
+       d="m 60.767575,3.8655962 c 0,0 3.783317,-2.2130621 5.548864,-5.7090499 1.765551,-3.4959942 2.522214,-5.7411261 2.30152,-9.1729813 -0.220695,-3.431843 -0.756663,-1.731959 -0.157641,-3.207334 0.599026,-1.475377 -0.378328,-4.394049 0.03152,-4.586488 0.409861,-0.19244 1.292637,1.282934 1.544859,2.469649 0.252214,1.186712 1.355684,4.843067 0.472911,9.4937107 -0.882773,4.6506303 -2.963589,6.51088559 -4.350812,7.76175223 C 64.77157,2.1657114 61.618812,4.3467019 61.145898,4.314627 60.67298,4.2825186 60.609928,4.2825186 60.76756,3.8655962 Z"
+       style="fill:#3f62eb;fill-opacity:1;stroke:none;stroke-width:0.0890379px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path1016"
+       d="m 53.957602,-2.8698091 c 0,0 2.017773,0.4490302 3.562621,-0.5131634 1.544859,-0.9622063 2.742913,-2.5337986 2.932073,-3.1431917 0.189165,-0.6093954 0.220697,0.5452465 0.441386,-0.032045 0.220692,-0.5773293 1.10347,-1.7319649 0.662081,-4.4261318 -0.441389,-2.694157 -0.472916,-2.822457 -1.292627,-4.265758 -0.819727,-1.443301 -2.774446,-3.431845 -3.972493,-4.073313 -1.198047,-0.641466 -2.86901,-1.603666 -5.170538,-1.53952 -2.301517,0.06415 -1.544853,-0.09622 -3.751788,0.288661 -2.206938,0.384879 -4.193179,1.4433 -4.855258,2.02062 -0.66208,0.577321 -2.427629,2.148917 -3.058183,3.014896 -0.630554,0.865981 -2.364573,2.822454 -3.278875,5.5486918 -0.914302,2.7262327 -1.292635,3.0148925 -1.35569,4.8109998 -0.06306,1.7961094 0.157637,2.2772018 -0.220692,2.4375779 -0.378332,0.1603616 -0.315277,-1.3470823 -0.283751,-2.4055093 0.03153,-1.0584128 0.03153,-3.8167249 1.418745,-6.8957642 1.387216,-3.079043 3.846373,-5.644912 5.23359,-6.575039 1.387216,-0.930126 2.995127,-2.180987 5.485811,-2.790382 2.490685,-0.609392 4.981368,-0.513172 6.526228,-0.224513 1.544859,0.288661 3.94096,1.282935 5.23359,2.277208 1.292636,0.994275 2.711385,2.213062 3.78332,4.20161 1.07194,1.988545 1.355684,4.522341 1.324159,5.5807587 -0.03152,1.0584266 -0.567498,3.4960027 -1.387216,4.6827127 -0.819721,1.186715 -1.923185,2.597942 -3.05818,3.1111149 -1.135,0.5131697 -2.522222,0.6735396 -3.657204,0.1603641 C 54.08371,-2.132102 54.146768,-2.3245385 53.957602,-2.869785 Z"
+       style="fill:#fce102;fill-opacity:1;stroke:none;stroke-width:0.0890379px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path1018"
+       d="m 53.957602,-2.8698091 c 0,0 1.597697,0.4513829 2.946439,-0.1609516 1.348754,-0.6123403 1.850358,-1.2020043 2.173613,-1.5535277 0.323251,-0.3515343 0.936324,-1.0092338 1.103526,-1.3154017 0.167198,-0.3061663 0.345542,-0.4876031 0.345542,-0.6009978 0,-0.1133983 -0.312104,-0.3855536 -0.01112,-1.043249 0.300955,-0.6576966 0.568485,-2.1658733 0.434721,-2.8462471 -0.133762,-0.680377 -0.445868,-4.456482 -3.121079,-6.973885 -2.675203,-2.517401 -5.328127,-2.81223 -5.328127,-2.81223 0,0 4.235756,1.338077 6.219869,5.397669 1.984117,4.059596 1.337601,6.66771 0.06688,8.2552586 -1.270724,1.5875487 -3.076491,1.7689868 -3.566953,1.3607558 -0.490444,-0.4082292 -1.501077,1.8641068 -1.26328,2.2928065 z"
+       style="fill:#5ed938;fill-opacity:1;stroke:none;stroke-width:0.0890379px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path1020"
+       d="m 48.800383,-17.432105 c 0,0 -2.853557,-0.02267 -5.01602,1.406112 -2.16246,1.428797 -3.210252,2.585441 -3.812175,3.492612 -0.601919,0.907174 -1.293016,2.154531 -1.203842,2.131854 0.08917,-0.0227 2.60833,-3.53797 4.57015,-4.445139 1.961822,-0.907173 3.923641,-2.177213 6.621146,-1.247366 2.697505,0.929857 3.968232,2.222571 4.547859,1.905065 0.579629,-0.31751 0.691101,-0.70306 0.356697,-1.133966 -0.334399,-0.430906 -2.697508,-2.540081 -6.063815,-2.109172 z"
+       style="fill:#8fdbe9;fill-opacity:1;stroke:none;stroke-width:0.0890379px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path1022"
+       d="m 44.530829,0.69033794 c 0.189165,0.0962163 1.607908,2.56586906 2.742905,2.98282056 1.134994,0.4169541 1.891657,0.4490201 2.017767,0.6414685 0.126111,0.192439 0.09459,1.1546409 1.103469,1.5716019 1.008886,0.4169522 5.738036,1.7319552 7.09372,1.8602476 1.355695,0.1282956 0.2207,0.9301201 1.040416,1.2187811 0.819723,0.2886654 4.319291,0.4490282 5.170539,0.096218 0.851247,-0.3528 0.851247,0.3207371 -0.630553,0.8980604 -1.481799,0.577316 -5.391228,1.956476 -7.944967,1.635743 C 52.570379,11.274546 49.543723,10.729296 47.84123,9.5105098 46.138737,8.2917237 45.413601,7.7464765 46.044154,7.6502577 c 0.630553,-0.096225 2.30152,1.6998841 3.026654,1.8923257 0.725137,0.1924358 1.324162,0.1924358 0.882773,-0.2565932 C 49.512197,8.8369677 46.64318,6.8484212 46.359433,6.9446376 46.075682,7.0408596 45.476656,7.1050004 44.972214,6.4314646 44.467772,5.7579276 41.819449,2.0374171 41.977086,0.04887194 42.134727,-1.9396732 42.63917,-1.4265066 43.238195,-0.6888129 c 0.599024,0.73768484 1.292634,1.37915084 1.292634,1.37915084 z"
+       style="fill:#fd7aff;fill-opacity:1;stroke:none;stroke-width:0.0890379px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-weight:normal;font-size:1.28957px;line-height:1.25;font-family:sans-serif;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.0322394"
+       x="80.617455"
+       y="4.5832744"
+       id="text24207"><tspan
+         sodipodi:role="line"
+         id="tspan24205"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:49.4338px;font-family:Yukarimobile;-inkscape-font-specification:'Yukarimobile, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;fill:#1d2129;fill-opacity:1;stroke-width:0.0322394"
+         x="80.617455"
+         y="4.5832744">spark</tspan></text>
+  </g>
+</svg>

debian/changelog

@@ -1,3 +1,172 @@
+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

debian/control

@@ -11,9 +11,9 @@ Build-Depends:
  libqt5widgets5,
  libqt5network5,
  libqt5concurrent5,
- libdtkcore-dev,
+ libdtkcore-dev(>=5.2),
- libdtkgui-dev,
+ libdtkgui-dev(>=5.2),
- libdtkwidget-dev,
+ libdtkwidget-dev(>=5.2),
  qttools5-private-dev,
  libnotify-dev,
  qtwebengine5-dev
@@ -32,6 +32,11 @@ Depends:${shlibs:Depends}, ${misc:Depends},
  libdtkcore5,
  libdtkgui5,
  libdtkwidget5,
- libnotify4
+ libnotify4,
+ curl,
+ dde-qt5integration,
+ bubblewrap,
+ aria2
 Description: Spark Store
  A community powered app store, based on DTK.
+Recommends: apt-fast

debian/rules

@@ -17,11 +17,12 @@ override_dh_auto_clean:
 
 override_dh_auto_configure:
 	mkdir -p $(CURDIR)/build
-
+	
 	dh_auto_configure MAKEFLAGS=-j$(JOBS) -- spark-store-project.pro \
 	-spec linux-g++ CONFIG+=qtquickcompiler \
 	-o $(CURDIR)/build/
 
+
 override_dh_auto_build:
 	make -C $(CURDIR)/build -j$(JOBS)
 
@@ -29,6 +30,7 @@ override_dh_auto_install:
 	make -C $(CURDIR)/build 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:

debian/source/format

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

debian/spark-store.postinst

@@ -2,6 +2,12 @@
 
 case "$1" in
 	configure)
+
+        # config for aptss
+        mkdir -p /etc/aptss/sources.list.d
+        ln -s -f /etc/apt/sources.list /etc/aptss/sources.list
+        
+
 		# Check if /usr/local/bin existed
 		mkdir -p /usr/local/bin
 
@@ -11,14 +17,29 @@ case "$1" in
 		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/spark-dstore-patch /usr/local/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
+
+
 
 		# Download and install key
-		wget -O /tmp/spark-store-install/spark-store.asc https://d.store.deepinos.org.cn/dcs-repo.gpg-key.asc 
+		mkdir -p /tmp/spark-store-install/
-		gpg --dearmor /tmp/spark-store-install/spark-store.asc 
+		cp -f /opt/durapps/spark-store/bin/spark-store.asc  /tmp/spark-store-install/spark-store.asc
+		gpg --dearmor /tmp/spark-store-install/spark-store.asc
 		cp -f /tmp/spark-store-install/spark-store.asc.gpg /etc/apt/trusted.gpg.d/spark-store.gpg
 
+
+
         	# Run apt update to avoid users being fucked up by the non-exist dependency problem
-        	apt update
+
+		aptss ssupdate
+
+
+		# Start upgrade detect service
+		systemctl enable spark-update-notifier
+		service spark-update-notifier start
+		
 
 		# Update certain caches
 		update-icon-caches /usr/share/icons/hicolor || true
@@ -31,6 +52,8 @@ case "$1" in
 
 		# Remove temp dir
 		rm -rf /tmp/spark-store-install
+
+
 	;;
 
 	triggered)

debian/spark-store.preinst

@@ -0,0 +1,27 @@
+#!/bin/bash
+#检测网络链接畅通
+function network-check()
+{
+    #超时时间
+    local timeout=5
+
+    #目标网站
+    local target=www.baidu.com
+
+    #获取响应状态码
+    local ret_code=`curl -I -s --connect-timeout ${timeout} ${target} -w %{http_code} | tail -n1`
+
+    if [ "x$ret_code" = "x200" ]; then
+        echo "Network Checked successful ! Continue..."
+	 echo "网络通畅，继续安装"
+    else
+        #网络不畅通
+	echo "Network failed ! Cancel the installation"
+	echo "网络不畅，终止安装"
+	exit -1
+    fi
+
+}
+
+
+network-check

debian/spark-store.prerm

@@ -6,6 +6,28 @@ rm /usr/local/bin/ssinstall
 rm /usr/local/bin/spark-dstore-patch
 rm /usr/local/bin/ussinstall
 rm /usr/local/bin/ussremove
+rm /usr/local/bin/ss-apt-fast
+rm /usr/bin/aptss
+
+rm -rf /etc/aptss/
+
+# Remove residual symbol links to stop upgrade detect if exist
+if [ -e /etc/xdg/autostart/spark-update-notifier.desktop ];then
+rm /etc/xdg/autostart/spark-update-notifier.desktop
+fi
+
+# Shutdown services 
+service spark-update-notifier stop
+
+# Stop update detect service
+systemctl disable spark-update-notifier
+
+
+
+# Clean the auto install polkit file if exist
+if [ -f "/usr/share/polkit-1/actions/store.spark-app.ssinstall.policy" ] ; then
+	rm /usr/share/polkit-1/actions/store.spark-app.ssinstall.policy
+fi
 
 # Remove gpg key file
 if [ -f "/etc/apt/trusted.gpg.d/spark-store.gpg" ] ; then
@@ -13,3 +35,4 @@ if [ -f "/etc/apt/trusted.gpg.d/spark-store.gpg" ] ; then
 fi
 
 apt-key del '9D9A A859 F750 24B1 A1EC  E16E 0E41 D354 A29A 440C'
+

pkg/etc/apt/preferences.d/sparkstore

@@ -1,3 +0,0 @@
-Package: *
-Pin: origin *.deepinos.org.cn
-Pin-Priority: 400

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

@@ -0,0 +1,14 @@
+[Unit]
+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 
+ExecStart=/opt/durapps/spark-store/bin/update-upgrade/ss-update-notifier.sh
+Restart=on-failure
+RestartSec=10
+
+[Install]
+WantedBy=multi-user.target

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

@@ -0,0 +1,228 @@
+# Debian apt(8) completion                             -*- shell-script -*-
+
+_aptss()
+{
+    local sourcesdir="/etc/apt/sources.list.d"
+    local cur prev words cword
+    _init_completion || return
+
+    local GENERIC_APT_GET_OPTIONS='
+        -d --download-only
+        -y --assume-yes
+        --assume-no
+        -u --show-upgraded
+        -m --ignore-missing
+        -t --target-release
+        --download
+        --fix-missing
+        --ignore-hold
+        --upgrade
+        --only-upgrade
+        --allow-change-held-packages
+        --allow-remove-essential
+        --allow-downgrades
+        --print-uris
+        --trivial-only
+        --remove
+        --arch-only
+        --allow-unauthenticated
+        --allow-insecure-repositories
+        --install-recommends
+        --install-suggests
+        --no-install-recommends
+        --no-install-suggests
+        --fix-policy
+    '
+
+    # see if the user selected a command already
+    local 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")
+
+    local command i
+    for (( i=0; i < ${#words[@]}-1; i++ )); do
+        if [[ ${COMMANDS[@]} =~ ${words[i]} ]]; then
+            command=${words[i]}
+            break
+        fi
+    done
+
+    # Complete a -t<SPACE><TAB>
+    case $prev in
+        -t|--target-release)
+            COMPREPLY=( $( compgen -W "$( apt-cache policy -o Dir::Cache="/etc/aptss/" | egrep -o 'a=[^,]*|n=[^,]*' | cut -f2- -d= | sort -u)" -- "$cur" ) )
+            return 0
+            ;;
+    esac
+
+    # supported options per command
+    if [[ "$cur" == -* ]]; then
+        case $command in
+            install|remove|purge|upgrade|dist-upgrade|full-upgrade|autoremove)
+                COMPREPLY=( $( compgen -W '--show-progress
+                  --fix-broken --purge --verbose-versions --auto-remove
+                  -s --simulate --dry-run
+                  --download
+                  --fix-missing
+                  --fix-policy
+                  --ignore-hold
+                  --force-yes
+                  --trivial-only
+                  --reinstall --solver
+                  -t --target-release'"$GENERIC_APT_GET_OPTIONS" -- "$cur" ) )
+                return 0
+                ;;
+            update)
+                COMPREPLY=( $( compgen -W '--list-cleanup
+                  --print-uris
+                  --allow-insecure-repositories
+                  ' -- "$cur" ) )
+                return 0
+                ;;
+            list)
+                COMPREPLY=( $( compgen -W '--installed --upgradable 
+                  --manual-installed
+                  -v --verbose
+                  -a --all-versions
+                  -t --target-release
+                  ' -- "$cur" ) )
+                return 0
+                ;;
+            show)
+                COMPREPLY=( $( compgen -W '-a --all-versions
+                  ' -- "$cur" ) )
+                return 0
+                ;;
+            depends|rdepends)
+                COMPREPLY=( $( compgen -W '-i
+                    --important
+                    --installed
+                    --pre-depends
+                    --depends
+                    --recommends
+                    --suggests
+                    --replaces
+                    --breaks
+                    --conflicts
+                    --enhances
+                    --recurse
+                    --implicit' -- "$cur" ) )
+                return 0
+                ;;
+            search)
+                COMPREPLY=( $( compgen -W '
+                    -n --names-only
+                    -f --full' -- "$cur" ) )
+                return 0
+                ;;
+            showsrc)
+                COMPREPLY=( $( compgen -W '
+                    --only-source' -- "$cur" ) )
+                return 0
+                ;;
+            source)
+                COMPREPLY=( $( compgen -W '
+                    -s --simulate --dry-run
+                    -b --compile --build
+                    -P --build-profiles
+                    --diff-only --debian-only
+                    --tar-only
+                    --dsc-only
+                    -t --target-release
+                    '"$GENERIC_APT_GET_OPTIONS" -- "$cur" ) )
+                return 0
+                ;;
+            build-dep)
+                COMPREPLY=( $( compgen -W '
+                    -a --host-architecture
+                    -s --simulate --dry-run
+                    -P --build-profiles
+                    -t --target-release
+                    --purge --solver
+                    '"$GENERIC_APT_GET_OPTIONS" -- "$cur" ) )
+                return 0
+                ;;
+            moo)
+                COMPREPLY=( $( compgen -W '
+                    --color
+                    ' -- "$cur" ) )
+                return 0
+                ;;
+            clean|autoclean)
+                COMPREPLY=( $( compgen -W '
+                    -s --simulate --dry-run
+                    ' -- "$cur" ) )
+                return 0
+                ;;
+        esac
+    fi
+
+    # specific command arguments
+    if [[ -n $command ]]; then
+        case $command in
+            remove|purge|autoremove)
+                if [[ -f /etc/debian_version ]]; then
+                    # Debian system
+                    COMPREPLY=( $( \
+                        _xfunc dpkg _comp_dpkg_installed_packages $cur ) )
+                else
+                    # assume RPM based
+                    _xfunc rpm _rpm_installed_packages
+                fi
+                return 0
+                ;;
+            show|list|download|changelog|depends|rdepends)
+                    COMPREPLY=( $(  apt-cache --no-generate pkgnames "$cur" -o Dir::Cache="/etc/aptss/"  \
+                    2> /dev/null ) )
+                return 0
+                ;;
+            install)
+                COMPREPLY=( $(  apt-cache --no-generate pkgnames "$cur" -o Dir::Cache="/etc/aptss/"  \
+                    2> /dev/null ) )
+                if [[ "$cur" == ./* || "$cur" == /* ]]; then
+                    _filedir "deb"
+                fi
+                return 0
+                ;;
+            source|build-dep|showsrc|policy)
+                COMPREPLY=( $(  apt-cache --no-generate pkgnames "$cur" -o Dir::Cache="/etc/aptss/"  \
+                    2> /dev/null ) $(  apt-cache dumpavail -o Dir::Cache="/etc/aptss/"  | \
+                    command grep "^Source: $cur" | sort -u | cut -f2 -d" " ) )
+                return 0
+                ;;
+            edit-sources)
+                COMPREPLY=( $( compgen -W '$( command ls $sourcesdir )' \
+                    -- "$cur" ) )
+                return 0
+                ;;
+            moo)
+                COMPREPLY=( $( compgen -W 'moo' \
+                    -- "$cur" ) )
+                return 0
+                ;;
+        esac
+    fi
+
+    # no command yet, show what commands we have
+    if [ "$command" = "" ]; then
+        COMPREPLY=( $( compgen -W '${COMMANDS[@]}' -- "$cur" ) )
+    fi
+
+    return 0
+} &&
+complete -F _aptss aptss
+
+# ex: ts=4 sw=4 et filetype=sh

spark-store-project.pro

@@ -4,8 +4,10 @@ TEMPLATE = subdirs
 CONFIG += ordered
 
 SUBDIRS += \
+    src/spark-dstore-patch \
     third-party/QtNetworkService \
     src/spark-store.pro
+
     
 spark-store.depends = third-party/QtNetworkService
 
@@ -19,15 +21,26 @@ tool.path = /opt/durapps/$${TARGET}/bin
 qm.files += translations/*.qm
 qm.path = /usr/share/spark-store/translations
 
-preferences.files += pkg/etc/apt/preferences.d/sparkstore
+#preferences.files += pkg/etc/apt/preferences.d/sparkstore
-preferences.path = /etc/apt/preferences.d
+#preferences.path = /etc/apt/preferences.d
 
-sourceslist.files += pkg/etc/apt/sources.list.d/sparkstore.list
+#sourceslist.files += pkg/etc/apt/sources.list.d/sparkstore.list
-sourceslist.path = /etc/apt/sources.list.d
+#sourceslist.path = /etc/apt/sources.list.d
+
+bash_completion.files += pkg/usr/share/bash-completion/completions/aptss
+bash_completion.path = /usr/share/bash-completion/completions
 
 desktop.files += pkg/usr/share/applications/spark-store.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.ssinstall.policy
+polkit-1.path = /usr/share/polkit-1/actions/
+
+
+
 icon.files += pkg/usr/share/icons/hicolor/scalable/apps/spark-store.svg
 icon.path = /usr/share/icons/hicolor/scalable/apps
 
@@ -39,6 +52,9 @@ INSTALLS += \
     qm \
     desktop \
     icon \
-    sourceslist \
     preferences \
-    tmp
+    tmp \
+    service \
+    bash_completion
+#	polkit-1 
+#   暂时不添加

src/downloadlist.cpp

@@ -45,18 +45,18 @@ downloadlist::downloadlist(QWidget *parent) :
         menu_install->addAction(action_dpkg);
     }
 
-    QFile deepin("/usr/bin/deepin-deb-installer");
+//    QFile deepin("/usr/bin/deepin-deb-installer");
-    deepin.open(QIODevice::ReadOnly);
+//    deepin.open(QIODevice::ReadOnly);
-    if(deepin.isOpen())
+//    if(deepin.isOpen())
-    {
+//    {
-        menu_install->addAction(action_deepin);
+//        menu_install->addAction(action_deepin);
-    }
+//    }
-    QFile gdebi("/usr/bin/gdebi");
+//    QFile gdebi("/usr/bin/gdebi");
-    gdebi.open(QIODevice::ReadOnly);
+//    gdebi.open(QIODevice::ReadOnly);
-    if(gdebi.isOpen())
+//    if(gdebi.isOpen())
-    {
+//    {
-        menu_install->addAction(action_gdebi);
+//        menu_install->addAction(action_gdebi);
-    }
+//    }
     
 }
 
@@ -71,7 +71,7 @@ void downloadlist::setValue(qint64 value)
     ui->label_2->setText(QString::number(double(value) / 100) + "% (" + speed + ")");
     if(ui->label_2->text().left(4) == "100%")
     {
-        ui->label_2->setText(tr("Downloaded, waiting to install"));
+        ui->label_2->setText(tr("Downloaded. Open APP Upgrade and Install Settings to enable password-free installation"));
     }
 }
 
@@ -92,19 +92,6 @@ QString downloadlist::getName()
 
 void downloadlist::readyInstall()
 {
-    if(ui->progressBar->value() != ui->progressBar->maximum() && !close)
-    {
-        ui->progressBar->hide();
-        ui->pushButton_install->show();
-        ui->pushButton_2->hide();
-        Widget::sendNotification(tr("Failed to download %1").arg(ui->label->text()), 5000,
-                                 "/tmp/spark-store/icon_" + QString::number(num).toUtf8() + ".png");
-        ui->label_2->setText(tr("Download Failed，Check Your Connection"));
-        ui->pushButton_install->setEnabled(false);
-
-        return;
-    }
-
     if(!close)
     {
         ui->progressBar->hide();
@@ -232,6 +219,7 @@ void downloadlist::on_pushButton_3_clicked()
 {
     textbrowser->setLineWidth(0);
     textbrowser->setText(out);
+    textbrowser->setMinimumHeight(500);
 
     output_w->setMinimumHeight(600);
     output_w->setAttribute(Qt::WA_TranslucentBackground);

src/downloadworker.cpp

@@ -1,93 +1,9 @@
 #include "downloadworker.h"
-
 #include <QEventLoop>
-#include <QNetworkAccessManager>
+#include <QProcess>
-#include <QNetworkRequest>
-#include <QNetworkReply>
-#include <QThread>
 #include <QRegularExpression>
-#include <QFileInfo>
 #include <QDir>
-
+#include <QtConcurrent>
-DownloadWorker::DownloadWorker(QObject *parent)
-{
-    Q_UNUSED(parent)
-}
-
-void DownloadWorker::setIdentifier(int identifier)
-{
-    this->identifier = identifier;
-}
-
-void DownloadWorker::setParamter(const QString &url, QPair<qint64, qint64> range, QFile *file)
-{
-    this->url = url;
-    this->startPos = range.first;
-    this->endPos = range.second;
-    this->file = file;
-}
-
-qint64 DownloadWorker::getReceivedPos()
-{
-    return receivedPos;
-}
-
-void DownloadWorker::doWork()
-{
-    mgr = new QNetworkAccessManager(this);
-    QNetworkRequest request;
-    request.setUrl(url);
-    request.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true);
-    request.setRawHeader("Range", QString("bytes=%1-%2").arg(startPos).arg(endPos).toLocal8Bit());
-    reply = mgr->get(request);
-    qDebug() << "开始下载数据：" << QString(" %1~%2 -> writePos Start %3").arg(startPos).arg(endPos).arg(receivedPos);
-
-    connect(reply, static_cast<void(QNetworkReply::*)(QNetworkReply::NetworkError) > (&QNetworkReply::error),
-            [this](QNetworkReply::NetworkError error)
-    {
-        if(error != QNetworkReply::NoError)
-        {
-            qDebug() << "出错了：" << reply->errorString();
-        }
-    });
-    connect(reply, &QNetworkReply::finished, mgr, &QNetworkAccessManager::deleteLater);
-    connect(reply, &QNetworkReply::readyRead, this, &DownloadWorker::dataReady);
-    connect(reply, &QNetworkReply::finished, this, &DownloadWorker::slotFinish);
-    connect(reply, &QNetworkReply::downloadProgress, this, &DownloadWorker::handleProcess);
-    // connect(reply, &QNetworkReply::finished, reply, &QNetworkReply::deleteLater);
-    connect(reply, &QNetworkReply::finished, this, &DownloadWorker::doStop);
-}
-
-void DownloadWorker::doStop()
-{
-    if (reply) {
-        reply->disconnect();
-        reply->aboutToClose();
-        reply->deleteLater();
-        reply = nullptr;
-    }
-}
-
-void DownloadWorker::dataReady()
-{
-    QByteArray data = reply->readAll();
-    file->seek(startPos + receivedPos);
-    file->write(data);
-    receivedPos += data.size();
-}
-
-void DownloadWorker::slotFinish()
-{
-    file->flush();
-    qDebug() << "数据块下载完毕：" << QString(" %1~%2 -> writePos Start %3").arg(startPos).arg(endPos).arg(receivedPos);
-    emit workFinished();
-}
-
-void DownloadWorker::handleProcess(qint64, qint64)
-{
-    emit this->downloadProcess();
-}
-
 
 DownloadController::DownloadController(QObject *parent)
 {
@@ -97,23 +13,6 @@ DownloadController::DownloadController(QObject *parent)
     domains.clear();
     domains.append("d.store.deepinos.org.cn");
 
-    QFile serverList(QDir::homePath().toUtf8() + "/.config/spark-store/server.list");
-    if(serverList.open(QFile::ReadOnly))
-    {
-        QStringList list = QString(serverList.readAll()).trimmed().split("\n");
-        qDebug() << list << list.size();
-
-        for (int i = 0; i < list.size(); i++) {
-            if (list.at(i).contains("镜像源 Download only") && i + 1 < list.size()) {
-                for (int j = i + 1; j < list.size(); j++) {
-                    domains.append(list.at(j));
-                }
-                break;
-            }
-        }
-    }
-    qDebug() << domains.size();
-
     /*
     domains = {
         "d1.store.deepinos.org.cn",
@@ -126,28 +25,53 @@ DownloadController::DownloadController(QObject *parent)
     this->threadNum = domains.size();
 }
 
-DownloadController::~DownloadController()
-{
-    if(workers.size() > 0)
-    {
-        for(int i = 0; i < workers.size(); i++)
-        {
-            workers.at(i)->doStop();
-            workers.at(i)->disconnect();
-            workers.at(i)->deleteLater();
-        }
-        workers.clear();
-    }
-}
-
 void DownloadController::setFilename(QString filename)
 {
     this->filename = filename;
 }
 
-void DownloadController::setThreadNum(int threadNum)
+
+bool checkMeatlink(QString metaUrl)
 {
-    this->threadNum = threadNum;
+    QFile metaStatus("/tmp/spark-store/metaStatus.txt");
+    if (metaStatus.exists())
+    {
+        metaStatus.remove();
+    }
+    system("curl -I -s --connect-timeout 5 " + metaUrl.toUtf8() + " -w  %{http_code}  |tail -n1 > /tmp/spark-store/metaStatus.txt");
+    if (metaStatus.open(QFile::ReadOnly) && QString(metaStatus.readAll()).toUtf8() == "200")
+    {
+        metaStatus.remove();
+        return true;
+    }
+    return false;
+}
+
+void gennerateDomain(QVector<QString> &domains)
+{
+    QFile serverList(QDir::homePath().toUtf8() + "/.config/spark-store/server.list");
+    if (serverList.open(QFile::ReadOnly))
+    {
+        QStringList list = QString(serverList.readAll()).trimmed().split("\n");
+        qDebug() << list << list.size();
+        domains.clear();
+
+        for (int i = 0; i < list.size(); i++)
+        {
+            if (list.at(i).contains("镜像源 Download only") && i + 1 < list.size())
+            {
+                for (int j = i + 1; j < list.size(); j++)
+                {
+                    domains.append(list.at(j));
+                }
+                break;
+            }
+        }
+        if (domains.size() == 0)
+        {
+            domains.append("d.store.deepinos.org.cn");
+        }
+    }
 }
 
 /**
@@ -155,65 +79,130 @@ void DownloadController::setThreadNum(int threadNum)
  */
 void DownloadController::startDownload(const QString &url)
 {
-    finish = 0;
+    // 获取下载任务信息
-
-    // 下载任务等分，计算每个线程的下载数据
     fileSize = getFileSize(url);
-    if(fileSize == 0)
+    if (fileSize == 0)
     {
         emit errorOccur("文件大小获取失败");
-        return; 
-    }
-
-    qint64 segmentSize = fileSize / threadNum;
-    ranges.resize(threadNum);
-    QVector<qint64> receivedBytes;
-    receivedBytes.resize(threadNum);
-    for(int i = 0; i < threadNum; i++)
-    {
-        ranges[i].first = i * segmentSize;
-        ranges[i].second = i * segmentSize + segmentSize - 1;
-        receivedBytes[i] = 0;
-    }
-    ranges[threadNum - 1].second = fileSize; // 余数部分加入最后一个
-
-    // 打开文件
-    QDir tmpdir("/tmp/spark-store");
-    file = new QFile;
-    file->setFileName(tmpdir.absoluteFilePath(filename));
-
-    if(file->exists())
-    {
-        file->remove();
-    }
-
-    if(!file->open(QIODevice::WriteOnly))
-    {
-        delete file;
-        file = nullptr;
-        emit errorOccur(file->errorString());
         return;
     }
 
-    file->resize(fileSize);
+    QtConcurrent::run([=]()
+                      {
+        QString metaUrl = url + ".metalink";
+        qDebug() << "metalink" << metaUrl;
+        bool useMetalink = false;
+        if (checkMeatlink(metaUrl)){
+            useMetalink = true;
+            qDebug() << "useMetalink:" << useMetalink;
+        }else{
+            gennerateDomain(domains);
+            // qDebug() << domains << domains.size();
+        }
 
-    // 创建下载线程
+        QString aria2Command = "-d";
-    workers.clear();
+        QString aria2Urls = "";
-    for(int i = 0; i < ranges.size(); i++)
+        QString aria2Verbose = "--summary-interval=1";
-    {
+        QString aria2Threads = "--split=2";  // 仅使用最快的两个镜像源
-        qDebug() << QString("第%1个下载请求：%2-%3").arg(i).arg(ranges.at(i).first).arg(ranges.at(i).second);
+        QString aria2NoConfig = "--no-conf";
-        auto worker = new DownloadWorker(this);
+        QString aria2NoSeeds = "--seed-time=0";
-        auto range = ranges.at(i);
+        QStringList command;
-        QString chunkUrl = replaceDomain(url, domains.at(i));
+        QString downloadDir = "/tmp/spark-store/";
-        worker->setIdentifier(i);
+        QString aira2URLSelector = "--uri-selector=adaptive";
-        worker->setParamter(chunkUrl, range, file);
+        QString aria2StreamPiece = "--stream-piece-selector=default";
-        workers.append(worker);
+        QString aria2ConnectionPerServer = "--max-connection-per-server=4";
 
-        connect(worker, &DownloadWorker::downloadProcess, this, &DownloadController::handleProcess);
+        if (useMetalink){
-        connect(worker, &DownloadWorker::workFinished, this, &DownloadController::chunkDownloadFinish);
+            command.append(metaUrl.toUtf8());
+        }
+        else{
+            for (int i = 0; i < domains.size(); i++)
+            {
+                command.append(replaceDomain(url, domains.at(i)).toUtf8());
+            }
+        }
 
-        worker->doWork();
+
-    }
+        qint64 downloadSizeRecord = 0;
+        QString speedInfo = "";
+        QString percentInfo = "";
+        command.append(aria2Command.toUtf8());
+        command.append(downloadDir.toUtf8());
+        command.append(aria2Verbose.toUtf8());
+        command.append(aria2NoConfig.toUtf8());
+        command.append(aria2Threads.toUtf8());
+        command.append(aira2URLSelector.toUtf8());
+        command.append(aria2StreamPiece.toUtf8());
+        command.append(aria2ConnectionPerServer.toUtf8());
+        if (useMetalink){
+            command.append(aria2NoSeeds.toUtf8());
+        }
+        qDebug() << command;
+        auto cmd = new QProcess();
+        cmd->setProcessChannelMode(QProcess::MergedChannels);
+        cmd->setProgram("aria2c");
+        cmd->setArguments(command);
+        cmd->start();
+        cmd->waitForStarted(); //等待启动完成
+
+        QObject::connect(cmd, &QProcess::readyReadStandardOutput,
+        [&]()
+        {
+            //通过读取输出计算下载速度
+            QString message = cmd->readAllStandardOutput().data();
+            // qDebug() << message;
+            message = message.replace(" ", "");
+            QStringList list;
+            qint64 downloadSize = 0;
+            int downloadSizePlace1 = message.indexOf("(");
+            int downloadSizePlace2 = message.indexOf(")");
+            int speedPlace1 = message.indexOf("DL:");
+            int speedPlace2 = message.indexOf("ETA");
+            if (downloadSizePlace1 != -1 && downloadSizePlace2 != -1)
+            {
+                percentInfo = message.mid(downloadSizePlace1 + 1, downloadSizePlace2 - downloadSizePlace1 - 1).replace("%", "");
+                if (percentInfo != "s")
+                {
+                    int percentInfoNumber = percentInfo.toUInt();
+
+                    downloadSize = percentInfoNumber * fileSize / 100;
+                }
+            }
+            if (speedPlace1 != -1 && speedPlace2 != -1 && speedPlace2 - speedPlace1 <= 15)
+            {
+                speedInfo = message.mid(speedPlace1 + 3, speedPlace2 - speedPlace1 - 3);
+                speedInfo += "/s";
+            }
+            // qDebug() << percentInfo << speedInfo;
+            if (downloadSize >= downloadSizeRecord)
+            {
+                downloadSizeRecord = downloadSize;
+            }
+            if (percentInfo == "OK")
+            {
+                finished = true;
+                emit downloadProcess("", fileSize, fileSize);
+                qDebug() << "finished:" << finished;
+            }
+            else
+            {
+                emit downloadProcess(speedInfo, downloadSizeRecord, fileSize);
+            }
+        });
+        QObject::connect(cmd, &QProcess::readyReadStandardError,
+        [&]()
+        {
+            emit errorOccur(cmd->readAllStandardError().data());
+            return;
+        });
+
+        auto pidNumber = cmd->processId();
+        this->pidNumber = pidNumber;
+        while (cmd->waitForFinished(-1))
+        {
+            continue;
+        }
+        emit downloadFinished(); });
 }
 
 /**
@@ -221,78 +210,23 @@ void DownloadController::startDownload(const QString &url)
  */
 void DownloadController::stopDownload()
 {
-    for(int i = 0; i < workers.size(); i++)
+    // 实现下载进程退出
-    {
+    QString killCmd = QString("kill -9 %1").arg(pidNumber);
-        workers.at(i)->doStop();
+    system(killCmd.toUtf8());
-        workers.at(i)->disconnect();
+    qDebug() << "kill aria2!";
-        workers.at(i)->deleteLater();
-    }
-    workers.clear();
-    qDebug() << "文件下载路径：" << QFileInfo(file->fileName()).absoluteFilePath();
-
-    file->flush();
-    file->close();
-    delete file;
-    file = nullptr;
 }
 
-
+qint64 DownloadController::getFileSize(const QString &url)
-void DownloadController::handleProcess()
 {
-    qint64 bytesReceived = 0;
+    // 已经无需使用 qtnetwork 再获取 filesize，完全交给 aria2 来计算进度。 为保证兼容性，故保留此函数。
-    for(int i = 0; i < workers.size(); i++)
+    qint64 fileSize = 10000;
-    {
-        bytesReceived += workers.at(i)->getReceivedPos();
-    }
-    qDebug() << QString("下载进度 %1-%2").arg(bytesReceived).arg(fileSize);
-    emit downloadProcess(bytesReceived, fileSize);
-}
-
-void DownloadController::chunkDownloadFinish()
-{
-    finish++;
-    qDebug() << QString("已下载了%1块，共%2块！！！").arg(finish).arg(threadNum);
-    if(finish == threadNum)
-    {
-        stopDownload();
-        emit downloadFinished();
-    }
-}
-
-qint64 DownloadController::getFileSize(const QString& url)
-{
-    QEventLoop event;
-    QNetworkAccessManager requestManager;
-    QNetworkRequest request;
-    request.setUrl(QUrl(url));
-    request.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true);
-    QNetworkReply *reply = requestManager.head(request);
-    connect(reply, static_cast<void(QNetworkReply::*)(QNetworkReply::NetworkError) > (&QNetworkReply::error),
-            [this, reply](QNetworkReply::NetworkError error)
-    {
-        if(error != QNetworkReply::NoError)
-        {
-            emit errorOccur(reply->errorString());
-        }
-    });
-    connect(reply, &QNetworkReply::finished, &event, &QEventLoop::quit);
-    event.exec();
-
-    qint64 fileSize = 0;
-    if(reply->rawHeader("Accept-Ranges") == QByteArrayLiteral("bytes")
-            && reply->hasRawHeader(QString("Content-Length").toLocal8Bit()))
-    {
-        fileSize = reply->header(QNetworkRequest::ContentLengthHeader).toUInt();
-    }
-    qDebug() << "文件大小为：" << fileSize;
-    reply->deleteLater();
     return fileSize;
 }
 
-QString DownloadController::replaceDomain(const QString& url, const QString domain)
+QString DownloadController::replaceDomain(const QString &url, const QString domain)
 {
     QRegularExpression regex(R"((?:[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?\.)+[a-z0-9][a-z0-9-]{0,61}[a-z0-9])");
-    if(regex.match(url).hasMatch())
+    if (regex.match(url).hasMatch())
     {
         return QString(url).replace(regex.match(url).captured(), domain);
     }

src/downloadworker.h

@@ -6,52 +6,14 @@
 #include <QFile>
 #include <QNetworkReply>
 
-class DownloadWorker : public QObject
-{
-    Q_OBJECT
-
-public:
-    explicit DownloadWorker(QObject *parent = nullptr);
-
-    void setIdentifier(int identifier);
-    void setParamter(const QString &url, QPair<qint64, qint64> range, QFile *flle);
-    qint64 getReceivedPos();
-
-public slots:
-    void doWork();
-    void doStop();
-    void dataReady();
-    void slotFinish();
-    void handleProcess(qint64, qint64);
-
-private:
-    int identifier;
-    QString url;
-    qint64 startPos;
-    qint64 endPos;
-    qint64 receivedPos = 0;
-    QNetworkReply *reply;
-    QNetworkAccessManager *mgr;
-    QFile *file;
-
-signals:
-    void resultReady(int identifier, QByteArray data);
-    void testSignals();
-    void workFinished();
-    void downloadProcess();
-
-};
-
 class DownloadController : public QObject
 {
     Q_OBJECT
 
 public:
     explicit DownloadController(QObject *parent = nullptr);
-    ~DownloadController();
 
     void setFilename(QString filename);
-    void setThreadNum(int threadNum);
     void startDownload(const QString &url);
     void stopDownload();
     qint64 getFileSize(const QString& url);
@@ -59,21 +21,19 @@ public:
 
 private:
     int threadNum;
+    int pidNumber;
     QString filename;
     qint64 fileSize;
     QVector<QPair<qint64, qint64>> ranges;
     QFile *file;
-    QList<DownloadWorker*> workers;
+    bool finished = false;
-    int finish = 0;
     QVector<QString> domains;
 
-public slots:
+
-    void handleProcess();
-    void chunkDownloadFinish();
 
 signals:
     void errorOccur(const QString& msg);
-    void downloadProcess(qint64, qint64);
+    void downloadProcess(QString, qint64, qint64);
     void downloadFinished();
 
 };

src/main.cpp

@@ -1,7 +1,8 @@
 #include <DApplication>
 #include <DApplicationSettings>
 #include <DWidgetUtil>      // Dtk::Widget::moveToCenter(&w); 要调用它，就得引用 DWidgetUtil
-
+#include <DAboutDialog>
+#include <QVector>
 #include <QScreen>
 
 #include "widget.h"
@@ -9,40 +10,48 @@
 DWIDGET_USE_NAMESPACE
 int main(int argc, char *argv[])
 {
-    DApplication::loadDXcbPlugin();  // 让 bar 处在标题栏中
+    DApplication::loadDXcbPlugin();  // 已废弃，但是对于非deepin桌面可以正常使用标题栏
     DApplication::setAttribute(Qt::AA_EnableHighDpiScaling);    // 开启 Hidpi 支持
-    DApplication a(argc, argv);
+    // 程序内强制添加"-platformtheme deepin"参数喂给Qt让Qt正确使用Deepin主题修复各种奇怪样式问题
+    QVector<char*> fakeArgs(argc + 2);
+    fakeArgs[0] = argv[0];
+    fakeArgs[1] = "-platformtheme";
+    fakeArgs[2] = "deepin";
+    for(int i = 1; i < argc; i++) fakeArgs[i + 2] = argv[i];
+    int fakeArgc = argc + 2; // 为啥DApplication的argc要用引用啊？
+    DApplication a(fakeArgc, fakeArgs.data());
+
 
     a.setAttribute(Qt::AA_UseHighDpiPixmaps);
     a.loadTranslator();     // 载入翻译
 
-    /* Customized DAboutDialog (Can't work on other distro like Ubuntu...)
+    //Customized DAboutDialog 
-     *
+     
-     * DAboutDialog dialog;
+     DAboutDialog dialog;
-     * a.setAboutDialog(&dialog);
+      a.setAboutDialog(&dialog);
-     * dialog.setLicense(QObject::tr("We publish this program under GPL V3"));
+      dialog.setLicense(QObject::tr("We publish this program under GPL V3"));
-     * dialog.setVersion(DApplication::buildVersion("Version 2.0.2.5"));
+      dialog.setVersion(DApplication::buildVersion("Version 3.1.5-5"));
-     * dialog.setProductIcon(QIcon::fromTheme("spark-store"));  // 设置Logo
+      dialog.setProductIcon(QIcon::fromTheme("spark-store"));  // 设置Logo
-     * dialog.setProductName(QLabel::tr("Spark Store"));
+      dialog.setProductName(QLabel::tr("Spark Store"));
-     * dialog.setDescription(
+      dialog.setDescription(
-     *             QObject::tr(
+                  QObject::tr(
-     *                 "<span style=' font-size:10pt;font-weight:60;'>An appstore powered by deepin community</span><br/>"
+                      "<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/>"
+                      "<a href='https://www.spark-app.store/'>https://www.spark-app.store</a><br/>"
-     *                 "<span style=' font-size:12pt;'>Spark developers</span>"
+                      "<span style=' font-size:12pt;'>Spark developers</span>"
-     *                 )
+                      )
-     *             );
+                  );
-     * dialog.setProductName(QLabel::tr("Spark Store"));
+      dialog.setProductName(QLabel::tr("Spark Store"));
-     * dialog.setCompanyLogo(QPixmap(":/Logo-Spark.png"));
+      dialog.setCompanyLogo(QPixmap(":/spark-store.png"));
-     * dialog.setWebsiteName(QObject::tr("The Spark Project"));
+      dialog.setWebsiteName(QObject::tr("The Spark Project"));
-     * dialog.setWebsiteLink("https://gitee.com/deepin-community-store");
+      dialog.setWebsiteLink("https://gitee.com/deepin-community-store");
-     */
+     
 
     a.setProductName(QLabel::tr("Spark Store"));
     a.setProductIcon(QIcon::fromTheme("spark-store"));  //设置Logo
     a.setOrganizationName("spark-union");
     a.setOrganizationDomain("https://www.deepinos.org/");
     a.setApplicationName("Spark Store");    //不需要翻译，否则 ~/.local/share/ 下文件夹名称也被翻译为中文
-    a.setApplicationVersion(DApplication::buildVersion("3.0.3-9"));
+    a.setApplicationVersion(DApplication::buildVersion("3.1.5-5"));
     a.setApplicationAcknowledgementPage("https://gitee.com/deepin-community-store/spark-store");
     a.setApplicationDescription(
                 QObject::tr(

src/spark-dstore-patch/spark-dstore-patch.pro

@@ -0,0 +1,9 @@
+TARGET = spark-dstore-patch
+TEMPLATE += app
+QT +=  widgets
+SOURCES += spark-dstore-tool.cpp
+
+# Default rules for deployment.
+qnx: target.path = /tmp/spark-store/bin
+else: unix:!android: target.path = /opt/durapps/spark-store/bin
+!isEmpty(target.path): INSTALLS += target

src/spark-dstore-patch/spark-dstore-tool.cpp

@@ -0,0 +1,195 @@
+#include <QCoreApplication>
+#include <QDir>
+#include <QJsonObject>
+#include <QJsonDocument>
+#include <QDebug>
+#include <QDirIterator>
+#include <QProcess>
+
+#include <unistd.h>
+
+QList<QJsonObject> enumAppInfoList()
+{
+    QList<QJsonObject> appInfoList;
+    QDir apps("/opt/apps");
+    auto list = apps.entryList(QDir::Dirs | QDir::NoDotAndDotDot);
+    for (auto &appID : list) {
+        auto infoPath = apps.absoluteFilePath(appID + "/info");
+        QFile infoFile(infoPath);
+        if (!infoFile.open(QIODevice::ReadOnly)) {
+            continue;
+        }
+        auto doc = QJsonDocument::fromJson(infoFile.readAll());
+        appInfoList.push_back(doc.object());
+    }
+    return appInfoList;
+}
+//这段是去找appid和info，没看懂用来干啥的，在此之后info文件也没再用过
+//可能以后版本的实现会用到，等官方加功能再说
+void linkDir(const QString &source, const QString &target)
+{
+    auto ensureTargetDir = [](const QString &targetFile) {
+        QFileInfo t(targetFile);
+        QDir tDir(t.dir());
+        tDir.mkpath(".");
+    };
+
+    QDir sourceDir(source);
+    QDir targetDir(target);
+    QDirIterator iter(source, QDir::Files | QDir::NoDotAndDotDot, QDirIterator::Subdirectories);
+    while (iter.hasNext()) {
+        auto sourceFile = iter.next();
+        auto targetFile = targetDir.absoluteFilePath(sourceDir.relativeFilePath(sourceFile));
+
+        QFileInfo tfi(targetFile);
+        //        if (tfi.isSymLink() && (tfi.canonicalFilePath() == sourceFile)) {
+	//这里官方应该是写错了，否则会每触发一次就把所有软链接都删了重新创建一次
+        if (tfi.isSymLink() && (tfi.symLinkTarget() == sourceFile)) {
+            continue;
+        } else {
+            QFile::remove(targetFile);
+        }
+
+        ensureTargetDir(targetFile);
+        auto ret = symlink(sourceFile.toStdString().c_str(), targetFile.toStdString().c_str());
+        if (0 != ret) {
+            qDebug() << "link failed" << sourceFile << "=>" << targetFile << ret;
+        }
+    }
+}
+
+//reset Dynamic library rpath
+void setRpath(const QString &file, const QString &path)
+{
+    if (!QFileInfo::exists(path))
+        return;
+    QProcess p;
+    auto cmd = "patchelf " + file + " --set-rpath " + path;
+    p.start("bash", QStringList {"-c", cmd});
+    p.waitForFinished();
+}
+
+QString getGlic()
+{
+    //get arch & glibc
+    QProcess p;
+    auto cmd = "gcc -dumpmachine";
+    p.start("bash", QStringList {"-c", cmd});
+    p.waitForFinished();
+    return p.readAll();
+}
+
+void linkApp(const QJsonObject &app)
+{
+    auto appID = app.value("appid").toString();
+    auto appEntriesDir = QDir("/opt/apps/" + appID + "/entries");
+    auto appLibsDir = QDir("/opt/apps/" + appID + "/files/lib");
+    auto autoStartDir = QDir(appEntriesDir.absoluteFilePath("autostart"));
+
+    bool autoStart = app.value("permissions").toObject().value("autostart").toBool();
+    if (autoStart) {
+        linkDir(appEntriesDir.absoluteFilePath("autostart"), "/etc/xdg/autostart");
+    }
+
+    // link application
+    auto sysShareDir = QDir("/usr/share");
+    linkDir(appEntriesDir.absoluteFilePath("applications"), sysShareDir.absoluteFilePath("applications"));
+    linkDir(appEntriesDir.absoluteFilePath("icons"), sysShareDir.absoluteFilePath("icons"));
+    linkDir(appEntriesDir.absoluteFilePath("mime"), sysShareDir.absoluteFilePath("mime"));
+    linkDir(appEntriesDir.absoluteFilePath("glib-2.0"), sysShareDir.absoluteFilePath("glib-2.0"));
+    linkDir(appEntriesDir.absoluteFilePath("services"), sysShareDir.absoluteFilePath("dbus-1/services"));
+    linkDir(appEntriesDir.absoluteFilePath("GConf"), sysShareDir.absoluteFilePath("GConf"));
+    linkDir(appEntriesDir.absoluteFilePath("help"), sysShareDir.absoluteFilePath("help"));
+    linkDir(appEntriesDir.absoluteFilePath("locale"), sysShareDir.absoluteFilePath("locale"));
+    linkDir(appEntriesDir.absoluteFilePath("fcitx"), sysShareDir.absoluteFilePath("fcitx"));
+    linkDir(appEntriesDir.absoluteFilePath("polkit"), sysShareDir.absoluteFilePath("polkit-1"));
+    linkDir(appEntriesDir.absoluteFilePath("fonts/conf"), "/etc/fonts/conf.d");
+    linkDir(appEntriesDir.absoluteFilePath("fonts/files"), sysShareDir.absoluteFilePath("fonts"));
+
+
+//原来会导致Gtk相关应用翻译缺失，补足了
+
+
+    auto pluginDir = QDir(appEntriesDir.absoluteFilePath("plugins"));
+    if (pluginDir.exists()) {
+        QString arch = getGlic();
+        //        if (pluginDir.exists()) {
+        //            QDirIterator iter(pluginDir.absolutePath(), QDir::Files | QDir::NoDotAndDotDot, QDirIterator::Subdirectories);
+        //            while (iter.hasNext()) {
+        //                auto sourceFile = iter.next();
+        //                setRpath(sourceFile, appLibsDir.absolutePath()); //set rpath
+        //            }
+        //        }
+
+        linkDir(appEntriesDir.absoluteFilePath("plugins/fcitx"), "/usr/lib/" + arch + "/fcitx");
+        linkDir(appEntriesDir.absoluteFilePath("plugins/browser"), "/usr/lib/mozilla/plugins");
+    }
+}
+
+void cleanLink()
+{
+    auto cleanDirBrokenLink = [](const QString &dir) {
+        QProcess p;
+        auto cmd = "find " + dir + " -xtype l -delete";
+        p.start("bash", QStringList {"-c", cmd});
+        p.waitForFinished();
+    };
+
+    QString arch = getGlic();
+    auto sysShareDir = QDir("/usr/share");
+    cleanDirBrokenLink(sysShareDir.absoluteFilePath("applications"));
+    cleanDirBrokenLink(sysShareDir.absoluteFilePath("icons"));
+    cleanDirBrokenLink(sysShareDir.absoluteFilePath("mime/packages"));
+    cleanDirBrokenLink(sysShareDir.absoluteFilePath("glib-2.0"));
+    cleanDirBrokenLink(sysShareDir.absoluteFilePath("dbus-1/services"));
+    cleanDirBrokenLink("/etc/xdg/autostart");
+    cleanDirBrokenLink(sysShareDir.absoluteFilePath("fcitx"));
+    cleanDirBrokenLink(sysShareDir.absoluteFilePath("help"));
+    cleanDirBrokenLink(sysShareDir.absoluteFilePath("locale"));
+    cleanDirBrokenLink("/usr/lib/" + arch + "/fcitx");
+    cleanDirBrokenLink("/usr/lib/mozilla/plugins");
+    cleanDirBrokenLink(sysShareDir.absoluteFilePath("polkit-1/actions"));
+    cleanDirBrokenLink(sysShareDir.absoluteFilePath("fonts"));
+    cleanDirBrokenLink("/etc/fonts/conf.d");
+}
+
+void update()
+{
+    QProcess p;
+    auto cmd = "glib-compile-schemas /usr/share/glib-2.0/schemas/";
+    p.start("bash", QStringList {"-c", cmd});
+    p.waitForFinished();
+
+    cmd = "update-icon-caches /usr/share/icons/*";
+    p.start("bash", QStringList {"-c", cmd});
+    p.waitForFinished();
+
+    cmd = "update-desktop-database -q";
+    p.start("bash", QStringList {"-c", cmd});
+    p.waitForFinished();
+
+    cmd = "update-mime-database -V /usr/share/mime";
+    p.start("bash", QStringList {"-c", cmd});
+    p.waitForFinished();
+
+    
+}
+
+
+
+int main(int argc, char **argv)
+{
+    QCoreApplication app(argc, argv);
+
+    cleanLink();
+
+    for (auto &a : enumAppInfoList()) {
+        linkApp(a);
+    }
+    qInfo()<<"Spark dstore patch (c) The Spark Project 2022-Now. Modified from deepin-app-store-tool";
+
+    // trigger
+    update();
+
+    return 0;
+}

src/spark-store.pro

@@ -29,7 +29,7 @@ CONFIG += c++11 link_pkgconfig
 PKGCONFIG += dtkcore dtkgui dtkwidget libnotify
 
 # 禁止输出 qWarning / qDebug 信息
-CONFIG(release, debug|release): DEFINES += QT_NO_WARNING_OUTPUT QT_NO_DEBUG_OUTPUT
+#CONFIG(release, debug|release): DEFINES += QT_NO_WARNING_OUTPUT QT_NO_DEBUG_OUTPUT
 
 SOURCES += \
     appitem.cpp \

src/widget.cpp

@@ -46,7 +46,7 @@ Widget::Widget(DBlurEffectWidget *parent) :
     manager = new QNetworkAccessManager(this);  // 下载管理
 
     httpClient = new AeaQt::HttpClient;
-    downloadController = new DownloadController(this);  // 并发下载
+    
 
     connect(ui->menu_main, &QPushButton::clicked, this, [=](){Widget::chooseLeftMenu(0);});
     connect(ui->menu_network, &QPushButton::clicked, this, [=](){Widget::chooseLeftMenu(1);});
@@ -108,10 +108,9 @@ Widget::Widget(DBlurEffectWidget *parent) :
     download_speed.start();
     connect(&download_speed,&QTimer::timeout,[=]()
     {
-        if(isdownload)
+        if(isdownload && theSpeed == "")
         {
             size1 = download_size;
-            QString theSpeed;
             double bspeed;
             bspeed = size1 - size2;
             if(bspeed < 1024)
@@ -129,10 +128,12 @@ Widget::Widget(DBlurEffectWidget *parent) :
             else
             {
                 theSpeed = QString::number(0.01 * int(100 * (bspeed / (1024 * 1024 * 1024)))) + "GB/s";
-            }
+            }          
-            download_list[nowDownload - 1].setSpeed(theSpeed);
             size2 = download_size;
         }
+        if(isdownload){
+        download_list[nowDownload - 1].setSpeed(theSpeed);
+        }
     });
 
     notify_init(tr("Spark\\ Store").toLocal8Bit());
@@ -192,14 +193,18 @@ void Widget::initUI()
     // 添加菜单项
     QAction *actionSubmission = new QAction(tr("Submit App"), this);
     QAction *setting = new QAction(tr("Settings"));
+    QAction *upgrade = new QAction(tr("APP Upgrade and Install Settings"));
 
     QMenu *menu = new QMenu;
     menu->addAction(setting);
+    menu->addAction(upgrade);
     menu->addAction(actionSubmission);
+
     titlebar->setMenu(menu);
 
     connect(actionSubmission, &QAction::triggered, this, [=]{QDesktopServices::openUrl(QUrl("https://upload.deepinos.org/"));});
     connect(setting, &QAction::triggered, this, &Widget::opensetting);
+    connect(upgrade, &QAction::triggered, this, [=]{QProcess::startDetached("x-terminal-emulator -e /opt/durapps/spark-store/bin/update-upgrade/ss-update-controler.sh");});
 
     // 载入自定义字体
     int loadedFontID = QFontDatabase::addApplicationFont(":/fonts/fonts/hksnzt.ttf");
@@ -663,6 +668,7 @@ void Widget::startRequest(QUrl url, QString fileName)
     isdownload = true;
     download_list[allDownload - 1].free = false;
 
+    downloadController = new DownloadController(this);  // 并发下载，在点击下载按钮的时候才会初始化
     connect(downloadController, &DownloadController::downloadProcess, this, &Widget::updateDataReadProgress);
     connect(downloadController, &DownloadController::downloadFinished, this, &Widget::httpFinished);
     connect(downloadController, &DownloadController::errorOccur, this, [=](QString msg){this->sendNotification(msg);});
@@ -783,15 +789,15 @@ void Widget::httpReadyRead()
     }
 }
 
-void Widget::updateDataReadProgress(qint64 bytesRead, qint64 totalBytes)
+void Widget::updateDataReadProgress(QString speedInfo, qint64 bytesRead, qint64 totalBytes)
 {
     if(totalBytes <= 0)
     {
         return;
     }
-
+    theSpeed = speedInfo;
     download_list[nowDownload - 1].setMax(10000);   // 最大值
-    download_list[nowDownload - 1].setValue((bytesRead * 10000) / totalBytes);  // 当前值
+    download_list[nowDownload - 1].setValue(int(bytesRead * 100 / totalBytes) * 100);  // 当前值
     download_size = bytesRead;
     if(download_list[nowDownload - 1].close)
     {
@@ -950,7 +956,9 @@ void Widget::httpFinished() // 完成下载
     download_list[nowDownload - 1].free = true;
     if(nowDownload < allDownload)
     {
+
         // 如果有排队则下载下一个
+        qDebug() << "切换下一个下载...";
         nowDownload += 1;
         while(download_list[nowDownload - 1].close)
         {
@@ -1034,7 +1042,7 @@ void Widget::on_pushButton_updateServer_clicked()
         ui->comboBox_server->clear();
 
         QFile::remove(QDir::homePath().toUtf8() + "/.config/spark-store/server.list");
-        system("curl -o " + QDir::homePath().toUtf8() + "/.config/spark-store/server.list https://d.store.deepinos.org.cn/store/server.list");
+        system("curl -o " + QDir::homePath().toUtf8() + "/.config/spark-store/server.list https://d.store.deepinos.org.cn/store/server-and-mirror.list");
         std::fstream server;
         server.open(QDir::homePath().toUtf8() + "/.config/spark-store/server.list", std::ios::in);
         std::string lineTmp;
@@ -1320,7 +1328,7 @@ void Widget::on_webEngineView_urlChanged(const QUrl &arg1)
         ui->label_appname->clear();
         ui->pushButton_download->setEnabled(false);
         ui->stackedWidget->setCurrentIndex(2);
-        qDebug() << "https://demo-one-vert.vercel.app/" + type_name + "/" + pname;
+        qDebug() << "https://d.store.deepinos.org.cn/" + type_name + "/" + pname;
         qDebug() << "链接地址：" << arg1;
 
         /*

src/widget.h

@@ -69,7 +69,7 @@ private slots:
 
     void httpFinished();
     void httpReadyRead();
-    void updateDataReadProgress(qint64,qint64);
+    void updateDataReadProgress(QString, qint64, qint64);
 
     // SpkAppInfoLoaderThread的槽函数
     void sltAppinfoResetUi();
@@ -147,6 +147,7 @@ private:
     QFuture<void> load;
     QFutureWatcher<void> watchScreenshotLoad;
     QTimer download_speed;
+    QString theSpeed;
     QString type_name;
     QColor main_color;
     int foot;

src/widget.ui

@@ -766,10 +766,10 @@
                     </size>
                    </property>
                    <property name="toolTip">
-                    <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Capable to Ubuntu 20.04&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                    <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 20.04&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                    <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>

src/workerthreads.cpp

@@ -29,7 +29,7 @@ void SpkAppInfoLoaderThread::run()
 
         QString deburl = serverUrl;
         deburl = deburl.left(urladdress.length() - 1);
-        urladdress = "https://img.jerrywang.top/";  // 使用图片专用服务器请保留这行，删除后将使用源服务器
+        urladdress = "https://d.store.deepinos.org.cn/";  // 使用图片专用服务器请保留这行，删除后将使用源服务器
         urladdress = urladdress.left(urladdress.length() - 1);
 
         for(int i = 3; i < downloadurl.size(); i++)

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

@@ -0,0 +1,147 @@
+###################################################################
+# 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
+
+
+# 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://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/,http://cdn.dl.uniartisan.com:9000/deepinos/' )
+
+
+# Maximum number of connections
+# You can use this value in _DOWNLOADER command. Escape with ${}: ${_MAXNUM}
+#
+# Default: 5
+#
+_MAXNUM=5
+
+
+# Maximum number of connections per server
+# Default: 10
+#
+_MAXCONPERSRV=10
+
+
+# Download file using given number of connections
+# If more than N URIs are given, first N URIs are used and remaining URIs are used for backup.
+# If less than N URIs are given, those URIs are used more than once so that N connections total are made simultaneously.
+#
+_SPLITCON=8
+
+
+# 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} -s ${_SPLITCON} --min-split-size=${_MINSPLITSZ} --stream-piece-selector=${_PIECEALGO} -i ${DLLIST} --connect-timeout=600 --timeout=600 -m0'
+
+
+# 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/aptss

@@ -0,0 +1,73 @@
+#/bin/bash
+
+
+
+
+
+if  [ "$1" = "install" ] || [ "$1" = "upgrade" ] || [ "$1" = "full-upgrade" ] || [ "$1" = "download" ] ; then
+
+if [ ! -e "/tmp/aptss-conf/apt-fast.conf" ];then
+###刷新apt-fast配置
+mkdir -p /tmp/aptss-conf/
+echo "从服务器获取配置和镜像列表..."
+echo "Getting server and mirror lists..."
+echo
+curl --progress-bar -o /tmp/aptss-conf/apt-fast.conf "https://gitee.com/deepin-community-store/repo_auto_update_script/raw/master/mirror-list-for-apt-fast/apt-fast.conf"
+chmod -R 755 /tmp/aptss-conf
+
+fi
+
+DEPEND=`which  apt-fast`
+if [ "$DEPEND" = "" ] ; then 
+echo "未安装依赖：apt-fast 开始安装"
+sudo aptss ssupdate && sudo bwrap --dev-bind / / --bind '/opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list' /etc/apt/sources.list.d/sparkstore.list apt install apt-fast -y
+fi
+
+###执行
+bwrap --dev-bind / / \
+                   --bind '/tmp/aptss-conf/apt-fast.conf' /etc/apt-fast.conf \
+                   --bind '/opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list' /etc/apt/sources.list.d/sparkstore.list \
+                apt-fast "$@" --allow-downgrades 
+
+
+elif [ "$1" = "ssupdate" ];then
+
+mkdir -p /tmp/aptss-conf/
+echo "从服务器获取配置和镜像列表..."
+echo "Getting server and mirror lists..."
+echo
+curl --progress-bar -o /tmp/aptss-conf/apt-fast.conf "https://gitee.com/deepin-community-store/repo_auto_update_script/raw/master/mirror-list-for-apt-fast/apt-fast.conf"
+chmod -R 755 /tmp/aptss-conf    
+
+sudo curl --progress-bar -o /opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list "https://gitee.com/deepin-community-store/repo_auto_update_script/raw/master/mirror-list-for-apt-fast/sources.list.d/sparkstore.list"
+### 额外一份拿来给aptss自动补全用
+sudo bwrap --dev-bind / / --bind '/opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list' /etc/apt/sources.list.d/sparkstore.list apt update -o Dir::Etc::sourcelist="sources.list.d/sparkstore.list"  -o Dir::Etc::sourceparts="-" -o APT::Get::List-Cleanup="0"
+sudo bwrap --dev-bind / / --bind '/opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list' /etc/apt/sources.list.d/sparkstore.list apt update -o Dir::Etc::sourcelist="sources.list.d/sparkstore.list"  -o Dir::Etc::sourceparts="-" -o Dir::Cache="/etc/aptss/" -o APT::Get::List-Cleanup="0"
+#只更新星火源
+
+elif [ "$1" = "update" ];then
+sudo curl --progress-bar -o /opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list "https://gitee.com/deepin-community-store/repo_auto_update_script/raw/master/mirror-list-for-apt-fast/sources.list.d/sparkstore.list"
+
+
+mkdir -p /tmp/aptss-conf/
+echo "从服务器获取配置和镜像列表..."
+echo "Getting server and mirror lists..."
+echo
+curl --progress-bar -o /tmp/aptss-conf/apt-fast.conf "https://gitee.com/deepin-community-store/repo_auto_update_script/raw/master/mirror-list-for-apt-fast/apt-fast.conf"
+chmod -R 755 /tmp/aptss-conf    
+### 额外一份拿来给aptss自动补全用
+bwrap --dev-bind / / \
+		   --bind '/opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list' /etc/apt/sources.list.d/sparkstore.list \
+                apt "$@" -o APT::Get::List-Cleanup="0" 
+
+bwrap --dev-bind / / \
+		   --bind '/opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list' /etc/apt/sources.list.d/sparkstore.list \
+                apt "$@" -o APT::Get::List-Cleanup="0"  -o Dir::Cache="/etc/aptss/" 
+
+else
+	bwrap --dev-bind / / \
+		   --bind '/opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list' /etc/apt/sources.list.d/sparkstore.list \
+                apt "$@"
+fi
+
+

tool/auto-install-policy/store.spark-app.ssinstall.policy

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE policyconfig PUBLIC "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/PolicyKit/1/policyconfig.dtd">
+<policyconfig>
+    <vendor>Spark Store</vendor>
+    <icon_name>x-package-repository</icon_name>
+    <action id="org.maicss.dnf">
+        <description>运行ssinstall需要权限</description>
+        <message>要使用ssinstall需要权限</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">/usr/local/bin/ssinstall</annotate>
+        <annotate key="org.freedesktop.policykit.exec.allow_gui">true</annotate>
+    </action>
+</policyconfig>

tool/password-check/ss-certificate-passwd

@@ -0,0 +1,17 @@
+#!/bin/bash
+uname=`whoami`
+	echo "Now input the password of $uname"
+	read upass
+	passcheck=`echo "$upass" | sudo -S echo "i love amber forever"`
+	passcheck=`echo "$upass" | sudo -S echo "i love amber forever"`
+	reset
+	###UOS魔改的sudo返回了验证成功干扰判断，会变成验证成功i love amber forever
+	### 听我说谢谢你，因为有你，温暖了四季
+	###fuck♂you 就不能改的不那么坑爹吗？？？还是我用来捕捉的方法太笨了。。。
+	if [ "$passcheck" != "i love amber forever" ];then
+	echo "114514首"
+	exit 1	
+	else
+	reset 
+	echo "go go Baron Bunny"	
+	fi

tool/spark-store.asc

@@ -0,0 +1,41 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQGNBF7sGtgBDADKux63RQqGjbilEBErDjbGH+/sya9VjNBZdge1G/kK+8SEU7x9
+QFkSoprS7MN9qEtLhdN4+jqKDwwwlB0kjOK/L3BTsSjeP1fonY+Foprnc5sBBNDq
+2g4SQr1joafJq/d/E1GzCFCtUeo1/g8siEB9O2A8LFAqKB0ti6cXFQBc7QrRKNqb
+mUQYYkva5TeyYXwg8dV/jlQ1HkRftHO+mDOlxhSZxjH8o/3cHpVB/Ef7LUbUfzTL
+jT4Lxu5k6jFYeNI9EmIl36Nfz6o4T+iG19PQjv0d9aZe+4ceFeRQNPPqeubGJO9Z
+STNhHBFisgr/NdCKDVimR9wR7NSDceO+NswgMZzzo2xIFCsTB+JrMpTkDEBF1eFC
+F2RHwi6T4vJmFdt1rHhBfufgHrGNekZytgZw6tL9WDvDCiCKKZSGetfuBfaNYy63
+QNVszRVT5IOf6Rg2vtBIWM/iiAI6E9RsNhElRQj/cQLriIzuwHfgdHx8gPsRSgVx
+ZgizW0/2u4ZkrHUAEQEAAbQiRENTdG9yZSA8amlmZW5nc2hlbm1vQG91dGxvb2su
+Y29tPokBzgQTAQoAOAIbAwULCQgHAgYVCgkICwIEFgIDAQIeAQIXgBYhBJ2aqFn3
+UCSxoezhbg5B01SimkQMBQJirsYKAAoJEA5B01SimkQMCx0L/2OvTYmOr4y4wC7i
+oC/uCZpWt9eCMEkC1kB2a9xjPX2GbxTnzvrdkiqHDD8uR2gfO7NkHyoGies+zeCT
+LcHH1Li+8KnGy3wye1KWgGTpxS3OV1gHawXi2w6OVhoQvod0y3cbGAOtOWpnbg1n
+SiJdDy3cjC+BNYSNPuF3qoY6YEdIfE9SaXANxe/57TUbN0TaiQFYdRd7GyyevjtC
+KNW8R06QKQ/zNqJSaoMHVVtDICXDCR4yvzmqXJppfMJKwHW9sPLC2c1xVx3pmyXc
+yFzIPOyeu3CDvdbXlh1gfoMTnUfWQyB7oIZxmCfFJGdodZwoxA+pkAcyhx87JYpE
+L4gy3SERvAog+/dD47gCb5alGYvyk9t7PQAAvwY8yr/6gf7f1U7DzxuT386LefW7
+6p5ET/R7xcuNLwRH0ZOp/eQECj72A7KXhQ5IL47Rfdh7VzCkf0MGKBFEIET9OV0G
+zv1q/z281pt08wHPGM3CetPWUFWUD9/H/UvBUSmpoSLgBsMhdbkBjQRe7BrYAQwA
+mAKDNHieo2P1WGNBMi4pPuhhgv8JyBzk8yrSOU+8s1ZTI4mI82iBEy5zAnAx3W1k
+unXVlDyq1/LfzL2Nt8Apr5aQdyEqSu4zN/6JBETB0LIkdrwdwBciAHzAKPfJWCR8
+t+Ox76I2MNeVsVQFAjGeb/7QR1Ge6Sx/sgSG7NTWYD6PmQtqmH0xKJsfXYfgayRG
+RF1rfu6CV0b2rPFfXOwB+3qQ8YInrPlI/9dswZiVElGGmbQTo3fGqk3T5iShqSnZ
+wCYDj2ODDknoPrfE1uUkF7CoYEkGrPbrUMwFK/SHvvG6cUz0EFUENPg7nECPmHGm
+GPWByBx/Yo0Jg68JavIeX7q9mnnlTP/3sp1JFLAQpR8q4S9lFOv6uYKJNUxQeBF+
+lBUkiafHzeHxJNP3ymDkrRRi640TubEZfVGjp5cskLY+U6KIpAXK/kCp42uPY7ob
+cuc3vAZ+5EcYCOY+LI80urQ5a+iMqo2ZTxL7C0BAX79QLgTDmH/FW4ejkSbrXH8v
+ABEBAAGJAbYEGAEKACACGwwWIQSdmqhZ91AksaHs4W4OQdNUoppEDAUCYq7GEwAK
+CRAOQdNUoppEDOm8C/9w3/Qtd14531O+ZsrQkfQ+ByIvGFKrnz4BIqD/99lR7UXj
+3Z2/bN7IGbwNUrBpgFqzlWAzpX9tiGhnwDphwSVeYNsvwepKmtmMAaPkP+ujR95E
+62UKpdVVrHH/VOCT4ZsSddwEVOLeI9LltO6RmPr54e3bpBXv6bijGnjhgRyJU2Jg
+DVE+UOU3m26fTQZZf3G9W55TBNdtpA1gggppJ7SgbwmuWcFjeF1gaEOeW2P5jaYe
++Nx4Xpc4uf341elTfym8NQ/CfEfgAn3zs0ZOmnCX3JlmFh7gPW8fOSIDTC0NkJtU
+6LlguuprKhAUCSPKDlod7f7SmiwMsqvaAH+6Hi402tFnIwA1zjQk4BoCsUAVXVQx
+l2LC2UD3zBZw9WO6Y/YDgzM6Q2TlI9l1IjmkMHBWHalZ2afA7Uutv4JeNm0joT1D
+O5TmDYkkjjfu/+t+QnmBt5KgN2+HwF83ceJOqbPETvEviG5Wh+RXIT5kSgqgRPuV
+44jA/CTiR2VibEJ22D0=
+=mGFM
+-----END PGP PUBLIC KEY BLOCK-----

tool/ssinstall

@@ -1,3 +1,99 @@
-#!/bin/sh
+#!/bin/bash
+#将来可能可以换成apt-metalink来直接用种子/链接下载
 
-dpkg -i $1 || apt install -yf || dpkg -P $1
+echo "Spark Store Install script.星火商店安装脚本"
+
+#################检测文件是否存在
+if [ $# -eq 0 ];then
+echo "没有接收到参数，退出"
+echo "用法：$0 deb路径"
+exit
+fi
+
+if [ ! -f "$1" ]
+then
+	echo "文件不存在"
+	exit 1
+fi
+#################root校验+要密码
+if [ "$(id -u)" != "0" ]
+then
+    echo "ssinstall需要在root下运行";
+	uname=`whoami`
+	echo "Now input the password of $uname"
+	read -e upass
+	################检查密码对不对
+    echo "$upass" | sudo -S echo "i love amber forever"
+	passcheck=`echo "$upass" | sudo -S echo "i love amber forever"`
+	if [ "$passcheck" != "i love amber forever" ];then
+	echo "-----------------------------------------------------"
+	echo "E:密码错误,退出脚本！"
+	exit 1		
+	fi
+fi
+
+
+
+
+
+
+
+##################apt-fast/metalink测试
+DEPEND="这里一定会安装所以放弃处理"
+isuos=`cat /etc/os-release | grep UnionTech`
+
+
+##############判断是否是root运行，如果是，则正常走；如果不是，则代输密码
+if [ "$(id -u)" != "0" ];then
+#############################无root权限时
+
+IS_INSTALLED=`which apt-fast`
+if [ "$IS_INSTALLED" = "" ] ; then 
+echo "未安装依赖：apt-fast 开始安装"
+echo "$upass" | sudo -S aptss ssupdate && echo "$upass" | sudo -S bwrap --dev-bind / / --bind '/opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list' /etc/apt/sources.list.d/sparkstore.list apt install apt-fast -y 
+
+fi
+
+if [ "$DEPEND" != "" ]  && [ "$isuos" != "" ]; then
+echo "UOS中系统依赖无法使用第三方下载工具，放弃使用apt-fast"
+echo ----------------------------------------------------------------------------------
+echo "$upass" | sudo -S dpkg -i $1 || sudo aptss ssupdate && sudo bwrap --dev-bind / / --bind '/opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list' /etc/apt/sources.list.d/sparkstore.list apt install -yf
+
+
+fi
+
+if  [ "$DEPEND" != "" ]  && [ "$isuos" = "" ]; then
+echo "检测到apt-fast，使用aptss进行多线程下载加速"
+echo ----------------------------------------------------------------------------------
+echo "$upass" | sudo -S dpkg -i $1 || sudo aptss ssupdate && sudo aptss install -yf 
+fi
+
+
+
+
+
+else
+###########################有root权限时
+
+IS_INSTALLED=`which apt-fast`
+if [ "$IS_INSTALLED" = "" ] ; then 
+echo "未安装依赖：apt-fast 开始安装"
+aptss ssupdate && bwrap --dev-bind / / --bind '/opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list' /etc/apt/sources.list.d/sparkstore.list apt install apt-fast -y 
+fi
+
+if [ "$DEPEND" != "" ]  && [ "$isuos" != "" ]; then
+echo "UOS中系统依赖无法使用第三方下载工具，放弃使用apt-fast"
+echo ----------------------------------------------------------------------------------
+dpkg -i $1 || aptss ssupdate && sudo bwrap --dev-bind / / --bind '/opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list' /etc/apt/sources.list.d/sparkstore.list apt install -yf
+fi
+
+if  [ "$DEPEND" != "" ]  && [ "$isuos" = "" ]; then
+echo "检测到apt-fast，使用aptss进行多线程下载加速"
+echo ----------------------------------------------------------------------------------
+dpkg -i $1 || aptss ssupdate && aptss install -yf 
+fi
+
+
+
+
+fi

tool/update-upgrade/ss-do-upgrade.sh

@@ -0,0 +1,52 @@
+#!/bin/bash
+
+echo "以上可升级，是否升级？[y/n]"
+read yes_or_no
+if [ "$yes_or_no" = "y" ];then ###这是确定是否同意
+
+echo "获取更新列表..."
+PKG_LIST="$(bwrap --dev-bind / / --bind '/opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list' /etc/apt/sources.list.d/sparkstore.list apt list --upgradable -o Dir::Etc::sourcelist="sources.list.d/sparkstore.list"     -o Dir::Etc::sourceparts="-" -o APT::Get::List-Cleanup="0" | awk 'BEGIN {FS="/"} {print $1}' | awk NR\>1)"
+
+
+isuos=`cat /etc/os-release | grep UnionTech`
+if [ "$isuos" != "" ]; then ###这是确定是否为UOS 如果是
+echo "UOS中系统依赖无法使用第三方下载工具，使用apt-fast下载本体"
+
+  cd /var/cache/apt/archives
+  for PKG_NAME in $PKG_LIST;
+  do
+    echo "$PKG_NAME 正在下载..."
+  sudo aptss download "$PKG_NAME" -y >/dev/null 2>&1;
+  done
+   
+  echo "----开始安装"
+  for PKG_NAME in $PKG_LIST;
+  do
+    echo "$PKG_NAME 正在更新..."
+    if sudo bwrap --dev-bind / / --bind '/opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list' /etc/apt/sources.list.d/sparkstore.list apt install "$PKG_NAME" -y   >/dev/null 2>&1;
+    then
+      echo "$PKG_NAME 已更新"
+    else
+      echo "WARNING: $PKG_NAME 无法更新"
+    fi
+  done
+
+
+
+else ###这是确定是否为UOS,如果不是
+
+  for PKG_NAME in $PKG_LIST;
+  do
+    echo "$PKG_NAME 正在更新..."
+    if sudo aptss install "$PKG_NAME" -y >/dev/null 2>&1;
+    then
+      echo "$PKG_NAME 已更新"
+    else
+      echo "WARNING: $PKG_NAME 无法更新"
+    fi
+  done
+
+
+fi ###这是确定是否为UOS
+
+fi  ###这是确定是否同意

tool/update-upgrade/ss-update-controler.sh

@@ -0,0 +1,114 @@
+#!/bin/bash
+
+reset
+
+endloop=0
+
+#####################检测是否启动过了更新检测工具
+while [ $endloop -eq 0 ] ;do
+
+if [  -f /etc/xdg/autostart/spark-update-notifier.desktop ];then 
+text_update_open="关闭"
+#已经开启了就显示关闭
+else
+text_update_open="开启"
+fi
+
+if [  -f /usr/share/polkit-1/actions/store.spark-app.ssinstall.policy ];then 
+text_auto_install_open="关闭"
+#已经开启了就显示关闭
+else
+text_auto_install_open="开启"
+fi
+
+
+echo "欢迎使用星火更新和安装设置工具"
+echo "请在以下操作中选择一个进行~"
+echo "输入0 查看自动更新相关功能使用前须知（重要）"
+echo "输入1 $text_update_open星火更新检测工具(如果开启则会在系统启动后自动检测更新。如有更新则会弹出通知)"
+echo "输入2 查看可更新软件包列表并决定是否更新"
+echo "输入3 $text_auto_install_open点击安装免输入密码功能"
+echo "输入4 退出脚本"
+echo
+read -e option
+
+case $option in 
+	0)
+	reset
+	echo "此须知适用于自动更新功能"
+	echo "此脚本可以检测星火源中是否有比当前系统更高版本的软件包，由您决定是否安装；在安装更新过程中请不要直接点击关闭本页面，以免发生错误"
+	echo "此脚本使用apt update/apt list --upgrade/apt upgrade来更新软件源、列出更新列表和操作更新"
+	echo
+	echo "该脚本不对其使用效果有任何明示或暗示的担保，在使用前请您确保您清楚地知道您在干什么。您应当清楚，星火商店的软件包并不是适配所有发行版的；尽管绝大多数的软件更新是无害的，您仍然应该仔细检查显示出来的更新内容，以确保不会对您	的依赖环境造成破坏，尤其是那些看起来和系统依赖相关的软件包。在查看过更新列表之后，确认更新之前，您仍有一次取消更新的机会。"
+	echo "本脚本的开发者不对使用该脚本可能造成的后果负责"
+	echo 
+	echo 
+	echo
+	echo "请按回车继续..."
+#"只有回车可以用啊！""啊？"“你说的任意都行啊”“唔。。。戳到我的盲区了”
+	read
+	reset
+	;;
+	1)
+	echo "执行以下操作需要授权..."
+	if [  -e /etc/systemd/system/multi-user.target.wants/spark-update-notifier.service ];then 
+	echo "---检测到已经启动了自动更新检测，执行关闭"
+	sudo systemctl disable spark-update-notifier
+	sleep 3
+	reset
+	else
+	echo "---未检测到自动更新检测，执行启动"
+	sudo systemctl enable spark-update-notifier
+	sudo service spark-update-notifier start
+	sleep 3
+	reset
+	fi
+	;;
+
+	2)
+	echo "执行以下操作需要授权..."
+	sudo aptss ssupdate
+    /opt/durapps/spark-store/bin/update-upgrade/ss-upgrade-list.sh
+	/opt/durapps/spark-store/bin/update-upgrade/ss-do-upgrade.sh
+	echo "---请按回车返回"
+	read
+	reset
+	;;
+	3)
+	if [ -f /usr/share/polkit-1/actions/store.spark-app.ssinstall.policy ];then 
+	echo "---检测到已经启动了免输入密码，执行关闭"
+	sudo rm /usr/share/polkit-1/actions/store.spark-app.ssinstall.policy
+	sleep 3
+	reset
+	else
+
+cat << EOF
+请注意：这个功能尚未开发完成，一旦开启，则运行pkexec ssinstall时不再需要授权
+仅对星火内置安装器生效
+理论上会存在一定的安全风险~
+如果接受，请输入1，否则输入2
+EOF
+read is_accept_polkiy
+
+if [ "$is_accept_polkiy" = "1" ];then
+	echo "执行以下操作需要授权..."
+	sudo ln -s /opt/durapps/spark-store/bin/auto-install-policy/store.spark-app.ssinstall.policy /usr/share/polkit-1/actions/store.spark-app.ssinstall.policy
+	echo "---已启动"
+	sleep 3
+	reset
+	else
+	echo "---未同意，返回"
+	sleep 3
+	reset
+fi
+fi
+	;;
+	4)
+	exit 0
+	;;
+	*) 
+	echo "---无法识别的输入！请重新输入"
+	reset
+esac
+
+done

tool/update-upgrade/ss-update-notifier.sh

@@ -0,0 +1,70 @@
+#!/bin/bash
+set -e
+LANG=en.US
+
+function notify-send() {
+    #Detect the name of the display in use
+    local display=":$(ls /tmp/.X11-unix/* | sed 's#/tmp/.X11-unix/X##' | head -n 1)"
+
+    #Detect the user using such display
+    local user=$(who | grep '('$display')' | awk '{print $1}' | head -n 1)
+
+    #Detect the id of the user
+    local uid=$(id -u $user)
+
+    sudo -u $user DISPLAY=$display DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/$uid/bus notify-send "$@"
+}
+
+#检测网络链接畅通
+function network()
+{
+    #超时时间
+    local timeout=5
+
+    #目标网站
+    local target=www.baidu.com
+
+    #获取响应状态码
+    local ret_code=`curl -I -s --connect-timeout ${timeout} ${target} -w %{http_code} | tail -n1`
+
+    if [ "x$ret_code" = "x200" ]; then
+        #网络畅通
+        return 0
+    else
+        #网络不畅通
+        return 1
+    fi
+
+    return 0
+}
+
+network
+if [ $? -eq 1 ];then
+	echo "Network fail. Stop to avoid bother dpkg"
+	exit -1
+fi
+
+#The code above is modified from https://blog.csdn.net/yaxuan88521/article/details/120516298
+
+curl --progress-bar -o /opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list "https://gitee.com/deepin-community-store/repo_auto_update_script/raw/master/mirror-list-for-apt-fast/sources.list.d/sparkstore.list"
+# 每日更新星火源文件
+
+updatetext=`aptss ssupdate`
+
+
+mkdir -p /tmp/spark-store-updatenum/
+
+
+isupdate=`echo ${updatetext: -5}`
+if [ "$isupdate" = "date." ];then
+exit 0 
+fi
+
+
+update_app_number=`echo ${updatetext%package*} #从右向左截取第一个 src 后的字符串`
+update_app_number=`echo ${update_app_number##*information...}`
+
+
+notify-send -i spark-store "星火更新提醒" "星火商店仓库中有$update_app_number个软件包可以更新啦！请到星火商店的菜单处理"
+
+

tool/update-upgrade/ss-upgrade-list.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+set -e
+
+
+echo "---可更新的应用有："
+bwrap --dev-bind / / --bind '/opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list' /etc/apt/sources.list.d/sparkstore.list apt list --upgradable -o Dir::Etc::sourcelist="sources.list.d/sparkstore.list"     -o Dir::Etc::sourceparts="-"   -o APT::Get::List-Cleanup="0" 

tool/ussinstall

@@ -1,91 +0,0 @@
-#!/bin/bash
-
-reset
-
-echo Copyright (c) 2019-2021 The Spark Project
-
-if [ -x "/usr/bin/deepin-deb-installer" ] ; then 
-	echo "深度软件包安装器已安装，开始检测证书"
-else
-	echo "未安装深度软件包安装器，拒绝执行"
-	echo "UOS需要深度软件包安装器来认证签名"
-	echo "如果你用的是UOS，你能卸载这玩意说明你已经开了开发者模式......悄悄告诉你，放屁是不用脱裤子的！"
-	echo "如果你用的不是统信系发行版......所以你为什么要打开这个脚本？"
-	exit 1
-fi
-
-if [ -f "/usr/share/ca-certificates/deepin/private/priv.crt" ] ; then 
-	echo "检测到已经生成过证书，直接跳过询问"
-else
-	until [ -f "/usr/bin/cert-tool" ] ; do
-	#强制未安装证书工具的不通过
-		echo "该工具的原理是利用UOS的自签名安装包免开发者的特性，需要您的UOS ID账号和密码，请在使用工具前确保在应用商店中已安装过“证书工具”这个应用"
-		echo "如果没有安装，则无法使用。请确认安装后再进行下一步操作"
-		sleep 3
-		echo "如果你确认已经安装了该应用，请按回车"
-		read renyijian
-
-		#检测是否在说谎签名文件
-		if [ -f "/usr/bin/cert-tool" ] ; then
-			echo "成功检测到cert-tool存在，开始检测证书\n"
-		else
-			echo "没有检测到该应用，请您再次确认“证书工具”已经安装！"
-			sleep 3
-			clear
-		fi
-	done
-
-	until [ -f "/usr/share/ca-certificates/deepin/private/priv.crt" ] ; do 
-		echo "没有检测到证书，准备调用证书工具生成证书，请输入您的UOS账号/密码。本脚本不会上传任何信息"
-		echo "请在此行输入您的UOS账号用户名/电话号/邮箱"
-		read account
-		echo "请在此行输入您的UOS账号密码"
-		read passwd
-		echo "即将安装证书，请在弹出的窗口安装"
-		cert-tool -username="$account" -password="$passwd"
-	done
-	echo "检测到已经生成过证书，准备签名"
-fi
-#这个if是判断是否已经有证书
-
-unset account
-unset passwd
-unset renyijian
-
-debpath=""
-cd /tmp
-
-until [ -f "$debpath" ] ; do
-	if [ ! $1 ] ; then 
-		echo "没有检测到参数，以交互式安装运行"
-		echo "请输入deb文件的绝对路径或直接拖入deb文件(仅限支持的文件管理器，比如深度文管），结束后回车"
-		echo "生成的签名过的deb将保存在/tmp/signed_deb"
-		read debpath
-	else
-		echo "参数存在，直接开始签名\n生成的签名过的deb保存在/tmp/signed_deb"
-		debpath="$1"
-		echo "读取到的deb路径为：$debpath"
-	fi
-	debpath=`echo "$debpath" | sed $'s/\'//g'`
-	echo "去除可能的单引号后得到：$debpath"
-
-	if [ -f $debpath ] ; then
-		echo "文件有效，开始签名"
-		echo "------------以下为签名工具输出------------"
-		deepin-elf-sign-deb "$debpath"
-		echo "------------签名工具输出已结束------------"
-		echo "签名结束，启动深度软件包管理器"
-	else
-		echo "路径出错,请确认你输入了正确的路径！"
-		sleep 3
-		clear
-	fi
-done
-
-file_name=$(basename "$debpath")
-
-echo "--------以下为深度软件包安装器输出--------"
-deepin-deb-installer "/tmp/signed_deb/$file_name"
-echo "--------深度软件包安装器输出已结束--------"
-echo "删除临时文件"
-rm /tmp/signed_deb/$file_name

tool/ussremove

@@ -1,142 +0,0 @@
-#!/bin/bash
-
-reset
-
-echo Copyright (c) 2019-2021 The Spark Project
-
-if [ -x "/usr/bin/deepin-deb-installer" ] ; then 
-	echo "深度软件包安装器已安装，开始检测证书"
-else
-	echo "未安装深度软件包安装器，拒绝执行"
-	echo "UOS需要深度软件包安装器来认证签名"
-	echo "如果你用的是UOS，你能卸载这玩意说明你已经开了开发者模式......悄悄告诉你，放屁是不用脱裤子的！"
-	echo "如果你用的不是统信系发行版......所以你为什么要打开这个脚本？"
-	exit 1
-fi
-
-if [ -f "/usr/share/ca-certificates/deepin/private/priv.crt" ] ; then 
-	echo "检测到已经生成过证书，直接跳过询问"
-else
-	until [ -f "/usr/bin/cert-tool" ] ; do
-	#强制未安装证书工具的不通过
-		echo "该工具的原理是利用UOS的自签名安装包免开发者的特性，需要您的UOS ID账号和密码，请在使用工具前确保在应用商店中已安装过“证书工具”这个应用"
-		echo "如果没有安装，则无法使用。请确认安装后再进行下一步操作"
-		echo "如果你确认已经安装了该应用，请按回车"
-		read renyijian
-
-		#检测是否在说谎签名文件
-		if [ -f "/usr/bin/cert-tool" ] ; then
-			echo "成功检测到cert-tool存在，开始检测证书\n"
-		else
-			echo "没有检测到该应用，请您再次确认“证书工具”已经安装！"
-			sleep 3
-			clear
-		fi
-	done
-
-	until [ -f "/usr/share/ca-certificates/deepin/private/priv.crt" ] ; do 
-		echo "没有检测到证书，准备调用证书工具生成证书，请输入您的UOS账号/密码。本脚本不会上传任何信息"
-		echo "请在此行输入您的UOS账号用户名/电话号/邮箱"
-		read account
-		echo "请在此行输入您的UOS账号密码"
-		read passwd
-		echo "即将安装证书，请在弹出的窗口安装"
-		cert-tool -username="$account" -password="$passwd"
-	done
-	echo "检测到已经生成过证书，准备签名"
-fi
-#这个if是判断是否已经有证书
-
-unset account
-unset passwd
-unset renyijian
-
-mkdir -p /tmp/spark-store-appremover
-cd /tmp/spark-store-appremover
-#工作目录应当为 /tmp/spark-store-appremover
-
-while [ ! $pkgname ] ; do
-	if [ ! $1 ] ; then 
-		echo "没有检测到包名，以交互式模式运行"
-		echo "请输入你要卸载的软件包名，输入结束后回车"
-		read pkgname
-	else
-		echo "检测到包名，跳过获取"
-		pkgname="$1"
-		echo "读取到的包名为：$pkgname"
-	fi
-
-	if [ ! $pkgname ] ; then
-		echo "没有检测到包名，请重新输入！"
-		sleep 3
-		clear
-	else 
-		echo "包名读取成功，进入下一步"
-	fi
-done
-
-#while [ ! $version ] ; do
-#	if [ ! $2 ] ; then 
-#    		echo "没有检测到版本号，以交互式模式运行"
-#    		echo "请输入你要卸载的软件包版本号，输入结束后回车"
-#    		read version
-#	else
-#    		echo "检测到包名，跳过获取"
-#    		version="$2"
-#    		echo "读取到的版本号为：$version"
-#	fi
-#
-#	if [ ! $version ] ; then
-#		echo "没有检测到版本号，请重新输入！"
-#		sleep 3
-#		clear
-#	else
-#		echo "版本号读取成功，进入下一步"
-#	fi
-#done
-
-#发现版本号不一定一致也可以卸载
-version="1.0"
-echo "开始生成deb包"
-echo "输出的control文件为"
-echo ""
-echo "Package: $pkgname"
-echo "Version: $version"
-echo "Depends: "
-echo "Maintainer: spark-store"
-echo "Description: 这是一个假软件包，请点击卸载"
-echo "Architecture: $(arch)"
-echo "-----------------------开始生成-----------------------"
-workdir=$(pwd)
-echo "工作目录为$workdir"
-mkdir DEBIAN
-cd DEBIAN
-touch control
-echo "Package: $pkgname" >> ./control 
-echo "Version: $version" >> ./control 
-echo "Depends: "  >> ./control 
-echo "Maintainer: spark-store" >> ./control 
-echo "Description: 这是一个假软件包，请点击卸载" >> ./control 
-echo "Architecture: $(arch)" >> ./control
-
-echo "-----------------------开始打包-----------------------"
-cd ..
-workdir=$(pwd)
-echo "回退到工作目录，当前目录位于$workdir"
-fakeroot dpkg -b . ./uninstall.deb
-echo "-----------------------打包结束-----------------------"
-
-cd /tmp
-
-echo "-----------------------开始签名-----------------------"
-deepin-elf-sign-deb "/tmp/spark-store-appremover/uninstall.deb"
-echo "-----------------------签名结束-----------------------"
-echo "-----------------启动深度软件包管理器-------------------"
-
-deepin-deb-installer "/tmp/signed_deb/uninstall.deb"
-
-file_name=$(basename "/tmp/signed_deb/uninstall.deb")
-echo "---------------以上为深度软件包管理器输出----------------"
-echo "删除临时包"
-rm  "/tmp/signed_deb/$file_name"
-rm -r /tmp/spark-store-appremover

translations/spark-store_en.ts

@@ -12,7 +12,9 @@
 <context>
     <name>QLabel</name>
     <message>
-        <location filename="../src/main.cpp" line="40"/>
+        <location filename="../src/main.cpp" line="35"/>
+        <location filename="../src/main.cpp" line="43"/>
+        <location filename="../src/main.cpp" line="49"/>
         <source>Spark Store</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20,7 +22,22 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../src/main.cpp" line="48"/>
+        <location filename="../src/main.cpp" line="32"/>
+        <source>We publish this program under GPL V3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/main.cpp" line="37"/>
+        <source>&lt;span style=&apos; font-size:10pt;font-weight:60;&apos;&gt;An appstore powered by  community&lt;/span&gt;&lt;br/&gt;&lt;a href=&apos;https://www.spark-app.store/&apos;&gt;https://www.spark-app.store&lt;/a&gt;&lt;br/&gt;&lt;span style=&apos; font-size:12pt;&apos;&gt;Spark developers&lt;/span&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/main.cpp" line="45"/>
+        <source>The Spark Project</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/main.cpp" line="57"/>
         <source>&lt;span style=&apos;font-size:10pt;font-weight:60;&apos;&gt;An appstore powered by deepin community&lt;/span&gt;&lt;br/&gt;&lt;a href=&apos;https://www.spark-app.store/&apos;&gt;https://www.spark-app.store&lt;/a&gt;&lt;br/&gt;&lt;span style=&apos;font-size:12pt;&apos;&gt;Spark developers&lt;/span&gt;&lt;br/&gt;&lt;br/&gt;Published under GPL V3</source>
         <translation type="unfinished"></translation>
     </message>
@@ -127,8 +144,8 @@
     </message>
     <message>
         <location filename="../src/widget.ui" line="547"/>
-        <location filename="../src/widget.cpp" line="902"/>
+        <location filename="../src/widget.cpp" line="906"/>
-        <location filename="../src/widget.cpp" line="1171"/>
+        <location filename="../src/widget.cpp" line="1175"/>
         <source>Install</source>
         <translation type="unfinished"></translation>
     </message>
@@ -153,12 +170,6 @@
         <source>&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;</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../src/widget.ui" line="769"/>
-        <location filename="../src/widget.ui" line="772"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Capable to Ubuntu 20.04&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../src/widget.ui" line="775"/>
         <source>&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;</source>
@@ -279,6 +290,12 @@
         <source>Network</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../src/widget.ui" line="769"/>
+        <location filename="../src/widget.ui" line="772"/>
+        <source>&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;</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../src/widget.ui" line="845"/>
         <location filename="../src/widget.ui" line="848"/>
@@ -431,72 +448,77 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="340"/>
+        <location filename="../src/widget.cpp" line="195"/>
+        <source>APP Upgrade and Install Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/widget.cpp" line="344"/>
         <source>Not Exist</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/widget.cpp" line="138"/>
-        <location filename="../src/widget.cpp" line="402"/>
+        <location filename="../src/widget.cpp" line="406"/>
-        <location filename="../src/widget.cpp" line="407"/>
+        <location filename="../src/widget.cpp" line="411"/>
-        <location filename="../src/widget.cpp" line="417"/>
+        <location filename="../src/widget.cpp" line="421"/>
-        <location filename="../src/widget.cpp" line="422"/>
+        <location filename="../src/widget.cpp" line="426"/>
         <source>Spark\ Store</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="652"/>
+        <location filename="../src/widget.cpp" line="656"/>
-        <location filename="../src/widget.cpp" line="891"/>
+        <location filename="../src/widget.cpp" line="895"/>
         <source>Reinstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="618"/>
+        <location filename="../src/widget.cpp" line="622"/>
         <source>Failed to get the name to the file to be downloaded.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="896"/>
+        <location filename="../src/widget.cpp" line="900"/>
         <source>Upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="1079"/>
+        <location filename="../src/widget.cpp" line="1083"/>
         <source>Updating, please wait...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="1140"/>
+        <location filename="../src/widget.cpp" line="1144"/>
         <source>Apt has reported an error. Please use apt update in terminal to locate the problem.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="1147"/>
+        <location filename="../src/widget.cpp" line="1151"/>
         <source>Unknown error!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="1175"/>
+        <location filename="../src/widget.cpp" line="1179"/>
         <source>Uninstall succeeded</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="702"/>
+        <location filename="../src/widget.cpp" line="706"/>
         <source>Relative apps Not Found!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="711"/>
+        <location filename="../src/widget.cpp" line="715"/>
         <source>Request Error: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="1197"/>
+        <location filename="../src/widget.cpp" line="1201"/>
         <source>Temporary cache was cleaned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="1279"/>
+        <location filename="../src/widget.cpp" line="1283"/>
         <source>The URL has been copied to the clipboard</source>
         <translation type="unfinished"></translation>
     </message>
@@ -559,52 +581,52 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/downloadlist.cpp" line="69"/>
+        <location filename="../src/downloadlist.cpp" line="74"/>
-        <source>Downloaded, waiting to install</source>
+        <source>Downloaded. Open APP Upgrade and Install Settings to enable password-free installation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/downloadlist.cpp" line="95"/>
+        <location filename="../src/downloadlist.cpp" line="100"/>
         <source>Failed to download %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/downloadlist.cpp" line="97"/>
+        <location filename="../src/downloadlist.cpp" line="102"/>
         <source>Download Failed，Check Your Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/downloadlist.cpp" line="109"/>
+        <location filename="../src/downloadlist.cpp" line="114"/>
         <source>Finished downloading %1, awaiting to install</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/downloadlist.cpp" line="142"/>
+        <location filename="../src/downloadlist.cpp" line="147"/>
         <source>Installing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/downloadlist.cpp" line="185"/>
+        <location filename="../src/downloadlist.cpp" line="190"/>
         <source>Finish</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/downloadlist.cpp" line="191"/>
+        <location filename="../src/downloadlist.cpp" line="196"/>
         <source>Retry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/downloadlist.cpp" line="192"/>
+        <location filename="../src/downloadlist.cpp" line="197"/>
         <source>Error happened in dpkg progress , you can try it again</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/downloadlist.cpp" line="198"/>
+        <location filename="../src/downloadlist.cpp" line="203"/>
         <source>dpkg progress had been aborted，you can retry installation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/downloadlist.cpp" line="220"/>
+        <location filename="../src/downloadlist.cpp" line="225"/>
         <source>Download canceled</source>
         <translation type="unfinished"></translation>
     </message>

translations/spark-store_fr.ts

@@ -23,7 +23,9 @@ Spark Store est publié sous licence GPL V3
 Nous sommes nés pour le changement.</translation>
     </message>
     <message>
-        <location filename="../src/main.cpp" line="40"/>
+        <location filename="../src/main.cpp" line="35"/>
+        <location filename="../src/main.cpp" line="43"/>
+        <location filename="../src/main.cpp" line="49"/>
         <source>Spark Store</source>
         <translation type="unfinished"></translation>
     </message>
@@ -31,7 +33,22 @@ Nous sommes nés pour le changement.</translation>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../src/main.cpp" line="48"/>
+        <location filename="../src/main.cpp" line="32"/>
+        <source>We publish this program under GPL V3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/main.cpp" line="37"/>
+        <source>&lt;span style=&apos; font-size:10pt;font-weight:60;&apos;&gt;An appstore powered by  community&lt;/span&gt;&lt;br/&gt;&lt;a href=&apos;https://www.spark-app.store/&apos;&gt;https://www.spark-app.store&lt;/a&gt;&lt;br/&gt;&lt;span style=&apos; font-size:12pt;&apos;&gt;Spark developers&lt;/span&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/main.cpp" line="45"/>
+        <source>The Spark Project</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/main.cpp" line="57"/>
         <source>&lt;span style=&apos;font-size:10pt;font-weight:60;&apos;&gt;An appstore powered by deepin community&lt;/span&gt;&lt;br/&gt;&lt;a href=&apos;https://www.spark-app.store/&apos;&gt;https://www.spark-app.store&lt;/a&gt;&lt;br/&gt;&lt;span style=&apos;font-size:12pt;&apos;&gt;Spark developers&lt;/span&gt;&lt;br/&gt;&lt;br/&gt;Published under GPL V3</source>
         <translation type="unfinished"></translation>
     </message>
@@ -188,8 +205,8 @@ Nous sommes nés pour le changement.</translation>
     </message>
     <message>
         <location filename="../src/widget.ui" line="547"/>
-        <location filename="../src/widget.cpp" line="902"/>
+        <location filename="../src/widget.cpp" line="906"/>
-        <location filename="../src/widget.cpp" line="1171"/>
+        <location filename="../src/widget.cpp" line="1175"/>
         <source>Install</source>
         <translation type="unfinished"></translation>
     </message>
@@ -232,7 +249,7 @@ Nous sommes nés pour le changement.</translation>
     <message>
         <location filename="../src/widget.ui" line="769"/>
         <location filename="../src/widget.ui" line="772"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Capable to Ubuntu 20.04&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <source>&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;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -585,10 +602,10 @@ Nous sommes nés pour le changement.</translation>
     </message>
     <message>
         <location filename="../src/widget.cpp" line="138"/>
-        <location filename="../src/widget.cpp" line="402"/>
+        <location filename="../src/widget.cpp" line="406"/>
-        <location filename="../src/widget.cpp" line="407"/>
+        <location filename="../src/widget.cpp" line="411"/>
-        <location filename="../src/widget.cpp" line="417"/>
+        <location filename="../src/widget.cpp" line="421"/>
-        <location filename="../src/widget.cpp" line="422"/>
+        <location filename="../src/widget.cpp" line="426"/>
         <source>Spark\ Store</source>
         <translation type="unfinished"></translation>
     </message>
@@ -613,63 +630,68 @@ Nous sommes nés pour le changement.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="340"/>
+        <location filename="../src/widget.cpp" line="195"/>
+        <source>APP Upgrade and Install Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/widget.cpp" line="344"/>
         <source>Not Exist</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="652"/>
+        <location filename="../src/widget.cpp" line="656"/>
-        <location filename="../src/widget.cpp" line="891"/>
+        <location filename="../src/widget.cpp" line="895"/>
         <source>Reinstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="618"/>
+        <location filename="../src/widget.cpp" line="622"/>
         <source>Failed to get the name to the file to be downloaded.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="702"/>
+        <location filename="../src/widget.cpp" line="706"/>
         <source>Relative apps Not Found!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="711"/>
+        <location filename="../src/widget.cpp" line="715"/>
         <source>Request Error: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="896"/>
+        <location filename="../src/widget.cpp" line="900"/>
         <source>Upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="1079"/>
+        <location filename="../src/widget.cpp" line="1083"/>
         <source>Updating, please wait...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="1140"/>
+        <location filename="../src/widget.cpp" line="1144"/>
         <source>Apt has reported an error. Please use apt update in terminal to locate the problem.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="1147"/>
+        <location filename="../src/widget.cpp" line="1151"/>
         <source>Unknown error!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="1175"/>
+        <location filename="../src/widget.cpp" line="1179"/>
         <source>Uninstall succeeded</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="1197"/>
+        <location filename="../src/widget.cpp" line="1201"/>
         <source>Temporary cache was cleaned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="1279"/>
+        <location filename="../src/widget.cpp" line="1283"/>
         <source>The URL has been copied to the clipboard</source>
         <translation type="unfinished"></translation>
     </message>
@@ -753,52 +775,52 @@ Nous sommes nés pour le changement.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/downloadlist.cpp" line="69"/>
+        <location filename="../src/downloadlist.cpp" line="74"/>
-        <source>Downloaded, waiting to install</source>
+        <source>Downloaded. Open APP Upgrade and Install Settings to enable password-free installation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/downloadlist.cpp" line="95"/>
+        <location filename="../src/downloadlist.cpp" line="100"/>
         <source>Failed to download %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/downloadlist.cpp" line="97"/>
+        <location filename="../src/downloadlist.cpp" line="102"/>
         <source>Download Failed，Check Your Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/downloadlist.cpp" line="109"/>
+        <location filename="../src/downloadlist.cpp" line="114"/>
         <source>Finished downloading %1, awaiting to install</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/downloadlist.cpp" line="142"/>
+        <location filename="../src/downloadlist.cpp" line="147"/>
         <source>Installing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/downloadlist.cpp" line="185"/>
+        <location filename="../src/downloadlist.cpp" line="190"/>
         <source>Finish</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/downloadlist.cpp" line="191"/>
+        <location filename="../src/downloadlist.cpp" line="196"/>
         <source>Retry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/downloadlist.cpp" line="192"/>
+        <location filename="../src/downloadlist.cpp" line="197"/>
         <source>Error happened in dpkg progress , you can try it again</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/downloadlist.cpp" line="198"/>
+        <location filename="../src/downloadlist.cpp" line="203"/>
         <source>dpkg progress had been aborted，you can retry installation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/downloadlist.cpp" line="220"/>
+        <location filename="../src/downloadlist.cpp" line="225"/>
         <source>Download canceled</source>
         <translation type="unfinished"></translation>
     </message>

translations/spark-store_zh_CN.ts

@@ -12,7 +12,9 @@
 <context>
     <name>QLabel</name>
     <message>
-        <location filename="../src/main.cpp" line="40"/>
+        <location filename="../src/main.cpp" line="35"/>
+        <location filename="../src/main.cpp" line="43"/>
+        <location filename="../src/main.cpp" line="49"/>
         <source>Spark Store</source>
         <translation>Spark 应用商店</translation>
     </message>
@@ -20,8 +22,14 @@
 <context>
     <name>QObject</name>
     <message>
+        <location filename="../src/main.cpp" line="32"/>
         <source>We publish this program under GPL V3</source>
-        <translation type="vanished">本程序按GPL V3开源</translation>
+        <translation>本程序按GPL V3开源</translation>
+    </message>
+    <message>
+        <location filename="../src/main.cpp" line="37"/>
+        <source>&lt;span style=&apos; font-size:10pt;font-weight:60;&apos;&gt;An appstore powered by  community&lt;/span&gt;&lt;br/&gt;&lt;a href=&apos;https://www.spark-app.store/&apos;&gt;https://www.spark-app.store&lt;/a&gt;&lt;br/&gt;&lt;span style=&apos; font-size:12pt;&apos;&gt;Spark developers&lt;/span&gt;</source>
+        <translation type="unfinished">&lt;span style=&apos; font-size:10pt;font-weight:60;&apos;&gt;一款社区维护的应用商店&lt;/span&gt;&lt;br/&gt;&lt;a href=&apos;https://www.spark-app.store/&apos;&gt;https://www.spark-app.store&lt;/a&gt;&lt;br/&gt;&lt;span style=&apos; font-size:12pt;&apos;&gt;星火计划开发者&lt;/span&gt;</translation>
     </message>
     <message>
         <source>Version 2.0+2</source>
@@ -32,15 +40,16 @@
         <translation type="vanished">&lt;span style=&apos; font-size:10pt;font-weight:60;&apos;&gt;deepin 社区驱动的一款第三方应用商店&lt;/span&gt;&lt;br/&gt;&lt;a href=&apos;https://www.spark-app.store/&apos;&gt;https://www.spark-app.store&lt;/a&gt;&lt;br/&gt;&lt;span style=&apos; font-size:12pt;&apos;&gt;Spark developers&lt;/span&gt;</translation>
     </message>
     <message>
+        <location filename="../src/main.cpp" line="45"/>
         <source>The Spark Project</source>
-        <translation type="vanished">星火项目组</translation>
+        <translation type="unfinished">星火计划 The Spark Project</translation>
     </message>
     <message>
         <source>&lt;span style=&apos; font-size:10pt;font-weight:60;&apos;&gt;An appstore powered by deepin community&lt;/span&gt;&lt;br/&gt;&lt;a href=&apos;https://www.spark-app.store/&apos;&gt;https://www.spark-app.store&lt;/a&gt;&lt;br/&gt;&lt;span style=&apos; font-size:12pt;&apos;&gt;Spark developers&lt;/span&gt;&lt;br/&gt;We publish this program under GPL V3</source>
         <translation type="vanished">&lt;span style=&apos; font-size:10pt;font-weight:60;&apos;&gt;一款由 深度社区 出品的应用商店&lt;/span&gt;&lt;br/&gt;&quot;&quot;&lt;a href=&apos;https://www.spark-app.store/&apos;&gt;https://www.spark-app.store&lt;/a&gt;&lt;br/&gt;&quot;&quot;&lt;span style=&apos; font-size:12pt;&apos;&gt;星火开发者联盟&lt;/span&gt;&lt;br/&gt;本程序遵循 GPL V3 协议发布</translation>
     </message>
     <message>
-        <location filename="../src/main.cpp" line="48"/>
+        <location filename="../src/main.cpp" line="57"/>
         <source>&lt;span style=&apos;font-size:10pt;font-weight:60;&apos;&gt;An appstore powered by deepin community&lt;/span&gt;&lt;br/&gt;&lt;a href=&apos;https://www.spark-app.store/&apos;&gt;https://www.spark-app.store&lt;/a&gt;&lt;br/&gt;&lt;span style=&apos;font-size:12pt;&apos;&gt;Spark developers&lt;/span&gt;&lt;br/&gt;&lt;br/&gt;Published under GPL V3</source>
         <translation>&lt;span style=&apos;font-size:10pt;font-weight:60;&apos;&gt;由 Deepin 社区出品的应用商店&lt;/span&gt;&lt;br/&gt;&lt;a href=&apos;https://www.spark-app.store/&apos;&gt;https://www.spark-app.store&lt;/a&gt;&lt;br/&gt;&lt;span style=&apos;font-size:12pt;&apos;&gt;星火商店开发组&lt;/span&gt;&lt;br/&gt;&lt;br/&gt;遵循 GPL V3 协议发布</translation>
     </message>
@@ -190,8 +199,8 @@
     </message>
     <message>
         <location filename="../src/widget.ui" line="547"/>
-        <location filename="../src/widget.cpp" line="902"/>
+        <location filename="../src/widget.cpp" line="906"/>
-        <location filename="../src/widget.cpp" line="1171"/>
+        <location filename="../src/widget.cpp" line="1175"/>
         <source>Install</source>
         <translation>安装</translation>
     </message>
@@ -239,8 +248,8 @@
     <message>
         <location filename="../src/widget.ui" line="769"/>
         <location filename="../src/widget.ui" line="772"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Capable to Ubuntu 20.04&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <source>&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;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;支持Ubuntu 20.04&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;支持Ubuntu 22.04&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location filename="../src/widget.ui" line="788"/>
@@ -495,16 +504,21 @@
         <translation>设置</translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="340"/>
+        <location filename="../src/widget.cpp" line="195"/>
+        <source>APP Upgrade and Install Settings</source>
+        <translation>应用更新和安装设置</translation>
+    </message>
+    <message>
+        <location filename="../src/widget.cpp" line="344"/>
         <source>Not Exist</source>
         <translation>不存在</translation>
     </message>
     <message>
         <location filename="../src/widget.cpp" line="138"/>
-        <location filename="../src/widget.cpp" line="402"/>
+        <location filename="../src/widget.cpp" line="406"/>
-        <location filename="../src/widget.cpp" line="407"/>
+        <location filename="../src/widget.cpp" line="411"/>
-        <location filename="../src/widget.cpp" line="417"/>
+        <location filename="../src/widget.cpp" line="421"/>
-        <location filename="../src/widget.cpp" line="422"/>
+        <location filename="../src/widget.cpp" line="426"/>
         <source>Spark\ Store</source>
         <translation>星火应用商店</translation>
     </message>
@@ -541,8 +555,8 @@
         <translation type="vanished">大小： </translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="652"/>
+        <location filename="../src/widget.cpp" line="656"/>
-        <location filename="../src/widget.cpp" line="891"/>
+        <location filename="../src/widget.cpp" line="895"/>
         <source>Reinstall</source>
         <translation>重新安装</translation>
     </message>
@@ -551,17 +565,17 @@
         <translation type="vanished">加载应用程序图标失败。</translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="618"/>
+        <location filename="../src/widget.cpp" line="622"/>
         <source>Failed to get the name to the file to be downloaded.</source>
         <translation>获取安装包文件名失败。</translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="702"/>
+        <location filename="../src/widget.cpp" line="706"/>
         <source>Relative apps Not Found!</source>
         <translation>相关应用未找到！</translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="711"/>
+        <location filename="../src/widget.cpp" line="715"/>
         <source>Request Error: %1</source>
         <translation>请求错误：%1</translation>
     </message>
@@ -570,22 +584,22 @@
         <translation type="vanished">目前仅支持商店专用链接的打开，搜索功能正在开发，请期待以后的版本！</translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="896"/>
+        <location filename="../src/widget.cpp" line="900"/>
         <source>Upgrade</source>
         <translation>升级</translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="1079"/>
+        <location filename="../src/widget.cpp" line="1083"/>
         <source>Updating, please wait...</source>
         <translation>正在更新，请稍候……</translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="1140"/>
+        <location filename="../src/widget.cpp" line="1144"/>
         <source>Apt has reported an error. Please use apt update in terminal to locate the problem.</source>
         <translation>更新中发生错误，请在终端使用apt update来查看错误原因。</translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="1147"/>
+        <location filename="../src/widget.cpp" line="1151"/>
         <source>Unknown error!</source>
         <translation>未知错误！</translation>
     </message>
@@ -637,17 +651,17 @@ Click yes to continue.</source>
         <translation type="vanished">服务器未知错误</translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="1175"/>
+        <location filename="../src/widget.cpp" line="1179"/>
         <source>Uninstall succeeded</source>
         <translation>卸载成功</translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="1197"/>
+        <location filename="../src/widget.cpp" line="1201"/>
         <source>Temporary cache was cleaned</source>
         <translation>缓存目录已清空</translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="1279"/>
+        <location filename="../src/widget.cpp" line="1283"/>
         <source>The URL has been copied to the clipboard</source>
         <translation>链接已复制到剪贴板</translation>
     </message>
@@ -714,27 +728,26 @@ Click yes to continue.</source>
         <translation>深度软件包安装器</translation>
     </message>
     <message>
-        <location filename="../src/downloadlist.cpp" line="69"/>
         <source>Downloaded, waiting to install</source>
-        <translation>已完成，等待安装</translation>
+        <translation type="vanished">已完成，等待安装</translation>
     </message>
     <message>
-        <location filename="../src/downloadlist.cpp" line="95"/>
+        <location filename="../src/downloadlist.cpp" line="100"/>
         <source>Failed to download %1</source>
         <translation>下载 %1 失败</translation>
     </message>
     <message>
-        <location filename="../src/downloadlist.cpp" line="97"/>
+        <location filename="../src/downloadlist.cpp" line="102"/>
         <source>Download Failed，Check Your Connection</source>
         <translation>下载失败，请检查网络连接</translation>
     </message>
     <message>
-        <location filename="../src/downloadlist.cpp" line="109"/>
+        <location filename="../src/downloadlist.cpp" line="114"/>
         <source>Finished downloading %1, awaiting to install</source>
         <translation>%1 下载完成，等待安装</translation>
     </message>
     <message>
-        <location filename="../src/downloadlist.cpp" line="142"/>
+        <location filename="../src/downloadlist.cpp" line="147"/>
         <source>Installing</source>
         <translation>正在安装</translation>
     </message>
@@ -743,27 +756,32 @@ Click yes to continue.</source>
         <translation type="obsolete">正在安装</translation>
     </message>
     <message>
-        <location filename="../src/downloadlist.cpp" line="185"/>
+        <location filename="../src/downloadlist.cpp" line="74"/>
+        <source>Downloaded. Open APP Upgrade and Install Settings to enable password-free installation</source>
+        <translation type="unfinished">下载完成 可进入应用更新和安装设置来启动免密码安装</translation>
+    </message>
+    <message>
+        <location filename="../src/downloadlist.cpp" line="190"/>
         <source>Finish</source>
         <translation>完成</translation>
     </message>
     <message>
-        <location filename="../src/downloadlist.cpp" line="191"/>
+        <location filename="../src/downloadlist.cpp" line="196"/>
         <source>Retry</source>
         <translation>重试</translation>
     </message>
     <message>
-        <location filename="../src/downloadlist.cpp" line="192"/>
+        <location filename="../src/downloadlist.cpp" line="197"/>
         <source>Error happened in dpkg progress , you can try it again</source>
         <translation>dpkg出现错误，可重新安装</translation>
     </message>
     <message>
-        <location filename="../src/downloadlist.cpp" line="198"/>
+        <location filename="../src/downloadlist.cpp" line="203"/>
         <source>dpkg progress had been aborted，you can retry installation</source>
         <translation>安装被中止，可重新安装</translation>
     </message>
     <message>
-        <location filename="../src/downloadlist.cpp" line="220"/>
+        <location filename="../src/downloadlist.cpp" line="225"/>
         <source>Download canceled</source>
         <translation>下载已取消</translation>
     </message>