!119 323版本 降低dtk版本

Merge pull request !119 from shenmo/dev

.gitee/Dockerfile

@@ -1,2 +1,4 @@
-FROM python:3
-RUN pip3 install requests
+FROM shenmo7192/uos-21-dtk5.4:1.0
+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,57 @@
+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@nodejs
+        name: build_dtk
+        displayName: DTK构建
+        nodeVersion: 14.16.0
+        commands:
+          - git clone https://gitlink.org.cn/shenmo7192/debian-10-container.git
+          - mv debian-10-container/Debian-10.tar.xz /mnt
+          - rm -rf debian-10-container
+          - WORK_DIR=`pwd`
+          - 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
+          - mkdir  build-spark
+          - cp -r $WORK_DIR build-spark/spark-store
+          - echo "进入Debian 10环境"
+          - chroot /mnt/Debian-10 /bin/bash /spark-build.sh
+          - cd /mnt/Debian-10/build-spark
+        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'

.workflow/master-pipeline.yml

@@ -1,35 +0,0 @@
-version: '1.0'
-name: dtk-build-commit-20220425
-displayName: dtk-build-commit
-triggers:
-  trigger: manual
-  push:
-    branches:
-      prefix:
-        - master
-    tags:
-      prefix:
-        - ''
-stages:
-  - name: stage-4e566164
-    displayName: build
-    strategy: naturally
-    trigger: auto
-    executor: []
-    steps:
-      - step: execute@docker
-        name: execute_by_docker
-        displayName: 基于镜像的脚本执行
-        certificate: d3a72e50-a6b5-013a-3031-5e77c3ac149e
-        image: hub.docker.com/r/shenmo7192/uos-21-dtk5.4
-        command:
-          - git clone https://gitee.com/deepin-community-store/spark-store
-          - mkdir debs
-          - cd spark-store
-          - dpkg-buildpackage
-          - mv *.deb ../debs
-          - cd ../debs
-          - curl -s --url "smtp://smtp.163.com" --mail-from "sparkstorefeedback@163.com" --mail-rcpt "shenmo@spark-app.store" --upload-file ./*.deb --user "sparkstorefeedback@163.com:YWYGLQNOPLWNNJJY"
-permissions:
-  - role: admin
-    members: []

Jenkinsfile

@@ -4,11 +4,12 @@ pipeline {
     stage('build') {
       agent {
         docker {
-          image 'sparkstore/qt-build-image:5.11-1'
+          image 'jerry979/dtke:5.11.1'
         }
+
       }
       steps {
-        sh 'mkdir build && cd build && qmake .. && make && cd ..'
+        sh 'mkdir build && cd build && qmake .. && make '
         archiveArtifacts(artifacts: 'build/src/spark-store', allowEmptyArchive: true, defaultExcludes: true)
       }
     }
@@ -18,13 +19,15 @@ pipeline {
         dockerfile {
           filename '.gitee/Dockerfile'
         }
+
       }
       environment {
         gitee_token = credentials('1')
       }
       steps {
-        sh 'python3 .gitee/callback.py'
+        sh "python3 .gitee/callback.py"
       }
     }
+
   }
-}
+}

README.md

@@ -1,41 +1,58 @@
-#  星火应用商店
-[![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] 页面，找到最新版本，并选择适用于当前系统的安装包下载。
-
----
-#### 编译安装
-
-
-Deepin V20/UOS 21/ Ubuntu 22.04 系统下, 安装依赖
-
-```shell
-sudo apt install 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
-```
-
-
-
-## 🚀 协作
-
-非常感谢有兴趣的开发者或爱好者参与 `星火应用商店` 项目，分享你的见解与思路。
+#  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)
+
+Spark Store aims to collect Linux apps for the convieniece of Linux new comers
+
+The collecting process needs everyone's help
+
+We set up this APP Store and collect APPs/tools that everyone need widely. Also we pack Windows apps with wine. 
+
+All packages will be shared in our repository for users to get freely. 
+
+Distrobution supported：Deepin 20 ; Ubuntu 22.04 LTS / Ubuntu 20.04 LTS(May stop support in the future） ; UniontechOS Home 21
+
+
+
+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.
+
+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)
+
+---
+#### Compile and developement
+
+
+For Deepin V20/UOS 21/ Debian 11
+
+```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
+
+```
+
+Then
+
+```shell
+git clone https://gitee.com/deepin-community-store/spark-store.git
+cd spark-store
+dpkg-buildpackage
+```
+
+
+
+## 🚀 Coorperation
+
+We use Gitee as our code hosting platform. Please click here to contact us. 
+
+https://gitee.com/deepin-community-store/spark-store

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,7 +1,171 @@
-spark-store (3.0.3-14) stable; urgency=medium
+spark-store (3.2.3) stable; urgency=medium
 
-  * Add pkexec policy: ssinstall
-  * Modify ssinistall script: Now will refuse run when no args are given or not run as root.
+  * 客户端异常退出时仍然占用资源问题修复
+  * 降低dtk依赖版本，Debian 11 stable可直接安装
+
+-- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
+spark-store (3.2.2) stable; urgency=medium
+
+  * aptss will now refresh the system source before doing install,  policy....etc
+  * 启动客户端GPU加速支持
+
+-- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
+spark-store (3.2.1) stable; urgency=medium
+
+  * 更改刷新系统源的功能
+
+
+-- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
+spark-store (3.2) stable; urgency=medium
+
+  * 新增 下载量统计功能
+  * 新增 显示下载量
+  * 修复 spk链接生成错误
+  * 调整 启动时检测商店applist源
+  * 新增 applist cdn加速
+  * 调整 ssupdate不再更新/etc/aptss下的cache，如要如此，请使用aptss update
+  * 修复 在更新检测设置中的是否开启自动更新检测设置项的显示不随开启或关闭状态改变
+  * 修复 在检测更新时临时降低优先级到100，防止系统中有且版本一致的包被反复来回更新 
+
+-- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
+spark-store (3.1.6) stable; urgency=medium
+
+  * 修复部分情况下无法选中正确的镜像源的问题
+  * 合入3.1.5以来的各项修改
+
+-- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
+spark-store (3.1.5-5) stable; urgency=medium
+
+  * 从所有镜像源中选取最快镜像源高速下载
+
+-- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
+
+spark-store (3.1.5-4) stable; urgency=medium
+
+  * 更改ss-apt-fast策略，现在只会在update，ssupdate和没有检测到配置文件的时候更新配置文件
+  * 新增ss-apt-fast别名：aptss 
+  * 更新检测服务优化：从分体改为一体
+  * aptss 支持自动补全
+
+-- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
+spark-store (3.1.5-3) stable; urgency=medium
+
+  * 包内自带密钥
+
+
+-- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
+spark-store (3.1.5-2) stable; urgency=medium
+
+  * 下载软件时跳过获取大小，修复部分软件无法下载的问题
+  * 修复 获取key时出错，指定使用http1.1
+
+
+-- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
+spark-store (3.1.5-1) stable; urgency=medium
+
+  * 改变更新策略，UOS也下载加速，但是安装不加速
+
+
+
+-- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
+spark-store (3.1.5) stable; urgency=medium
+
+  * 改变更新策略，现在支持应用在更新时引入新依赖
+  * ss-apt-fast现在默认允许降级，以与apt使用体验一致
+
+
+-- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
+spark-store (3.1.4-2) stable; urgency=medium
+
+  * 客户端下载使用metalink来支持bt下载加速
+  * 修复使用更新和安装设置更新商店本体时出错
+
+
+-- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
+spark-store (3.1.4-1) stable; urgency=medium
+
+  * 安装脚本和检测更新脚本检查网络时间超时时间延长至5s  
+  * 修复：ssinstall在没有安装apt-fast的情况下首次安装需要依赖的软件时安装失败 
+
+-- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
+spark-store (3.1.4) stable; urgency=medium
+
+  * 发布正式版，同步到官网
+  * 修复安装时使用wget的问题
+  * 合并3.1.3-1和3.1.3-2的更改
+  * 屏蔽了ssinstall之外的安装方式
+  * 调整了报错框的形式
+  * 修复pkexec下ssinstall不处理依赖
+
+ -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
+spark-store (3.1.3-2) stable; urgency=medium
+
+  * 调整 现在与系统更新分开，不再导致更新失败
+  * 支持直接更新软件源文件，不再让d.吃全部更新流量
+  * ss-apt-fast不再强制root权限
+  * 修改ss-apt-fast的策略，现在除了安装，下载和更新都改用apt
+  * ssinstall 现在也会在不适用ss-apt-fast的时候模拟源了（针对UOS）
+
+
+ -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
+spark-store (3.1.3-1) stable; urgency=medium
+
+  * 修复 下载提前退出
+  * 移除 下载量显示
+
+
+ -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
+spark-store (3.1.3) stable; urgency=medium
+
+  * Now uses aria2 to download softwares form all mirrors
+  * 新增：ssinstall现在会在没有apt-fast的时候自动安装
+  * 新增：ss-apt-fast现在会在没有apt-fast的时候自动安装
+  * 修改：删除ssinstall中无用的 || dpkg -P $1
+  * 新增：ss-apt-fast会先下载云上的conf以确保mirror是最新的
+  * 修复：去除wget指令
+
+ -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
+spark-store (3.1.2) stable; urgency=medium
+
+  * Now let apt-fast method support all mirrors
+  * Now will download dependencies and upgrade with all mirrors
+
+ -- shenmo <shenmo@spark-app.store>  Mon, 17 Jan 2022 00:00:00 +0800
+
+
+
+
+spark-store (3.1.1) stable; urgency=medium
+
+  * Now will delete the link of policy file after uninstall or upgrade
+  * Now ss-update-controler will create symbol link instead of hard link
+
+ -- shenmo <shenmo@spark-app.store>  Mon, 17 Jan 2022 00:00:00 +0800
+
+
+
+
+spark-store (3.1.0) stable; urgency=medium
+
+  * Add pkexec policy: ssinstall. Only will be enabled after permitted.
+  * Modify ssinistall script: Now will ask for password when not run as root
 
  -- shenmo <shenmo@spark-app.store>  Mon, 17 Jan 2022 00:00:00 +0800
 

debian/control

@@ -11,9 +11,9 @@ Build-Depends:
  libqt5widgets5,
  libqt5network5,
  libqt5concurrent5,
- libdtkcore-dev(>=5.2),
- libdtkgui-dev(>=5.2),
- libdtkwidget-dev(>=5.2),
+ libdtkcore-dev(>=5.0),
+ libdtkgui-dev(>=5.0),
+ libdtkwidget-dev(>=5.0),
  qttools5-private-dev,
  libnotify-dev,
  qtwebengine5-dev
@@ -29,12 +29,16 @@ Depends:${shlibs:Depends}, ${misc:Depends},
  libqt5widgets5,
  libqt5network5,
  libqt5concurrent5,
- libdtkcore5(>=5.2),
- libdtkgui5(>=5.2),
- libdtkwidget5(>=5.2),
+ libdtkcore5,
+ libdtkgui5,
+ libdtkwidget5,
  libnotify4,
  curl,
- dde-qt5integration
+ openssl,
+ dde-qt5integration,
+ bubblewrap,
+ aria2,
+ gcc
 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/spark-store.postinst

@@ -2,6 +2,17 @@
 
 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
+
+	#  Remove the sources.list file
+	if [ -e /etc/apt/sources.list.d/sparkstore.list ];then
+	rm /etc/apt/sources.list.d/sparkstore.list
+	fi
+        
+
 		# Check if /usr/local/bin existed
 		mkdir -p /usr/local/bin
 
@@ -11,19 +22,26 @@ 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
 
+		# Compile the Sender module
 
+		gcc /opt/durapps/spark-store/bin/ss-feedback/sender-d.sh.c -o /opt/durapps/spark-store/bin/ss-feedback/sender-d
 
 		# Download and install key
-		wget -O /tmp/spark-store-install/spark-store.asc https://d.store.deepinos.org.cn/dcs-repo.gpg-key.asc 
-		gpg --dearmor /tmp/spark-store-install/spark-store.asc 
+		mkdir -p /tmp/spark-store-install/
+		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 -o Dir::Etc::sourcelist="sources.list.d/sparkstore.list"     -o Dir::Etc::sourceparts="-" -o APT::Get::List-Cleanup="0"
 
-		# Create symbo links to start upgrade detect
-		ln -s /opt/durapps/spark-store/bin/update-upgrade/autostart/spark-update-notifier.desktop /etc/xdg/autostart/spark-update-notifier.desktop
+
+        	# Run apt update to avoid users being fucked up by the non-exist dependency problem
+
+		aptss ssupdate
+
 
 		# Start upgrade detect service
 		systemctl enable spark-update-notifier
@@ -41,6 +59,8 @@ case "$1" in
 
 		# Remove temp dir
 		rm -rf /tmp/spark-store-install
+
+
 	;;
 
 	triggered)

debian/spark-store.preinst

@@ -3,7 +3,7 @@
 function network-check()
 {
     #超时时间
-    local timeout=1
+    local timeout=5
 
     #目标网站
     local target=www.baidu.com

debian/spark-store.prerm

@@ -6,9 +6,16 @@ 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 Sender module
+rm /opt/durapps/spark-store/bin/ss-feedback/sender-d
 
 # Remove residual symbol links to stop upgrade detect if exist
-if [ -f /etc/xdg/autostart/spark-update-notifier.desktop ];then
+if [ -e /etc/xdg/autostart/spark-update-notifier.desktop ];then
 rm /etc/xdg/autostart/spark-update-notifier.desktop
 fi
 
@@ -20,9 +27,9 @@ systemctl disable spark-update-notifier
 
 
 
-# Clean the service place file
-if [ -d "/tmp/spark-store-updatenum/" ] ; then
-	rm -rf /tmp/spark-store-updatenum/s
+# 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

pkg/etc/apt/preferences.d/sparkstore

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

pkg/tmp/spark-store-install/feedback.sh

@@ -6,4 +6,4 @@ Subject: spark-store_3.0.2: $(lsb_release -a | grep "Description" | sed -e "s#\t
 
 $(uname -a)" | tee /tmp/spark-store-install/feedback.txt > /dev/null
 
-curl -s --url "smtp://smtp.163.com" --mail-from "sparkstorefeedback@163.com" --mail-rcpt "sparkstorefeedback@163.com" --upload-file /tmp/spark-store-install/feedback.txt --user "sparkstorefeedback@163.com:YWYGLQNOPLWNNJJY"
+curl -s --url "smtp://smtp.163.com" --mail-from "${MAIL_FEEDBACK}" --mail-rcpt "${MAIL_FEEDBACK}" --upload-file /tmp/spark-store-install/feedback.txt --user "${MAIL_FEEDBACK}:${M}AIL_AUTH"

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

@@ -6,7 +6,7 @@ After=apt-daily.service network.target network-online.target systemd-networkd.se
 [Service]
 Type=simple
 RemainAfterExit=yes 
-ExecStart=/opt/durapps/spark-store/bin/update-upgrade/ss-update-notify-placer.sh
+ExecStart=/opt/durapps/spark-store/bin/update-upgrade/ss-update-notifier.sh
 Restart=on-failure
 RestartSec=10
 

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

@@ -21,11 +21,14 @@ 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.path = /etc/apt/preferences.d
+#preferences.files += pkg/etc/apt/preferences.d/sparkstore
+#preferences.path = /etc/apt/preferences.d
 
-sourceslist.files += pkg/etc/apt/sources.list.d/sparkstore.list
-sourceslist.path = /etc/apt/sources.list.d
+#sourceslist.files += pkg/etc/apt/sources.list.d/sparkstore.list
+#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
@@ -37,6 +40,7 @@ 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
 
@@ -48,9 +52,9 @@ INSTALLS += \
     qm \
     desktop \
     icon \
-    sourceslist \
     preferences \
     tmp \
-    service 
+    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");
-    deepin.open(QIODevice::ReadOnly);
-    if(deepin.isOpen())
-    {
-        menu_install->addAction(action_deepin);
-    }
-    QFile gdebi("/usr/bin/gdebi");
-    gdebi.open(QIODevice::ReadOnly);
-    if(gdebi.isOpen())
-    {
-        menu_install->addAction(action_gdebi);
-    }
+//    QFile deepin("/usr/bin/deepin-deb-installer");
+//    deepin.open(QIODevice::ReadOnly);
+//    if(deepin.isOpen())
+//    {
+//        menu_install->addAction(action_deepin);
+//    }
+//    QFile gdebi("/usr/bin/gdebi");
+//    gdebi.open(QIODevice::ReadOnly);
+//    if(gdebi.isOpen())
+//    {
+//        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 <QNetworkRequest>
-#include <QNetworkReply>
-#include <QThread>
+#include <QProcess>
 #include <QRegularExpression>
-#include <QFileInfo>
 #include <QDir>
-
-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();
-}
-
+#include <QtConcurrent>
 
 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,135 @@ 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();
+        }
 
-    // 创建下载线程
-    workers.clear();
-    for(int i = 0; i < ranges.size(); i++)
-    {
-        qDebug() << QString("第%1个下载请求：%2-%3").arg(i).arg(ranges.at(i).first).arg(ranges.at(i).second);
-        auto worker = new DownloadWorker(this);
-        auto range = ranges.at(i);
-        QString chunkUrl = replaceDomain(url, domains.at(i));
-        worker->setIdentifier(i);
-        worker->setParamter(chunkUrl, range, file);
-        workers.append(worker);
+        QString aria2Command = "-d";
+        QString aria2Urls = "";
+        QString aria2Verbose = "--summary-interval=1";
+        QString aria2SizePerThreads = "--min-split-size=1M"; 
+        QString aria2NoConfig = "--no-conf";
+        QString aria2NoSeeds = "--seed-time=0";
+        QStringList command;
+        QString downloadDir = "/tmp/spark-store/";
+        QString aria2ConnectionPerServer = "--max-connection-per-server=1";
 
-        connect(worker, &DownloadWorker::downloadProcess, this, &DownloadController::handleProcess);
-        connect(worker, &DownloadWorker::workFinished, this, &DownloadController::chunkDownloadFinish);
+        if (useMetalink){
+            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(aria2SizePerThreads.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;
+        }
+
+        // 统计下载量
+        QString SenderdPath = "/opt/durapps/spark-store/bin/ss-feedback/sender-d";
+        /*
+        * https://en.wikipedia.org/wiki/HD_70642
+        * HD 70642 is a star with an exoplanetary companion in the southern constellation of Puppis. 
+        */
+        system(SenderdPath.toUtf8() + " " + metaUrl.toUtf8() + " " + "HD70642");
+
+        emit downloadFinished(); });
 }
 
 /**
@@ -221,78 +215,23 @@ void DownloadController::startDownload(const QString &url)
  */
 void DownloadController::stopDownload()
 {
-    for(int i = 0; i < workers.size(); i++)
-    {
-        workers.at(i)->doStop();
-        workers.at(i)->disconnect();
-        workers.at(i)->deleteLater();
-    }
-    workers.clear();
-    qDebug() << "文件下载路径：" << QFileInfo(file->fileName()).absoluteFilePath();
-
-    file->flush();
-    file->close();
-    delete file;
-    file = nullptr;
+    // 实现下载进程退出
+    QString killCmd = QString("kill -9 %1").arg(pidNumber);
+    system(killCmd.toUtf8());
+    qDebug() << "kill aria2!";
 }
 
-
-void DownloadController::handleProcess()
+qint64 DownloadController::getFileSize(const QString &url)
 {
-    qint64 bytesReceived = 0;
-    for(int i = 0; i < workers.size(); i++)
-    {
-        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();
+    // 已经无需使用 qtnetwork 再获取 filesize，完全交给 aria2 来计算进度。 为保证兼容性，故保留此函数。
+    qint64 fileSize = 10000;
     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;
-    int finish = 0;
+    bool finished = false;
     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

@@ -13,6 +13,10 @@ int main(int argc, char *argv[])
     DApplication::loadDXcbPlugin();  // 已废弃，但是对于非deepin桌面可以正常使用标题栏
     DApplication::setAttribute(Qt::AA_EnableHighDpiScaling);    // 开启 Hidpi 支持
     // 程序内强制添加"-platformtheme deepin"参数喂给Qt让Qt正确使用Deepin主题修复各种奇怪样式问题
+
+    // 浏览器开启 GPU 支持
+    qputenv("QTWEBENGINE_CHROMIUM_FLAGS", "--ignore-gpu-blacklist --enable-gpu-rasterization --enable-native-gpu-memory-buffers --enable-accelerated-video-decode");
+    
     QVector<char*> fakeArgs(argc + 2);
     fakeArgs[0] = argv[0];
     fakeArgs[1] = "-platformtheme";
@@ -30,7 +34,7 @@ int main(int argc, char *argv[])
      DAboutDialog dialog;
       a.setAboutDialog(&dialog);
       dialog.setLicense(QObject::tr("We publish this program under GPL V3"));
-      dialog.setVersion(DApplication::buildVersion("Version 3.1"));
+      dialog.setVersion(DApplication::buildVersion("Version 3.2.3"));
       dialog.setProductIcon(QIcon::fromTheme("spark-store"));  // 设置Logo
       dialog.setProductName(QLabel::tr("Spark Store"));
       dialog.setDescription(
@@ -41,7 +45,7 @@ int main(int argc, char *argv[])
                       )
                   );
       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.setWebsiteLink("https://gitee.com/deepin-community-store");
      
@@ -51,7 +55,7 @@ int main(int argc, char *argv[])
     a.setOrganizationName("spark-union");
     a.setOrganizationDomain("https://www.deepinos.org/");
     a.setApplicationName("Spark Store");    //不需要翻译，否则 ~/.local/share/ 下文件夹名称也被翻译为中文
-    a.setApplicationVersion(DApplication::buildVersion("3.1"));
+    a.setApplicationVersion(DApplication::buildVersion("3.2.3"));
     a.setApplicationAcknowledgementPage("https://gitee.com/deepin-community-store/spark-store");
     a.setApplicationDescription(
                 QObject::tr(

src/widget.cpp

@@ -18,6 +18,7 @@
 #include <QSettings>
 #include <QGraphicsOpacityEffect>
 #include <QtConcurrent> // 并发
+#include <QCloseEvent>  // close event
 
 #include <DApplication>
 #include <DGuiApplicationHelper>
@@ -46,7 +47,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);});
@@ -94,7 +95,7 @@ Widget::Widget(DBlurEffectWidget *parent) :
     connect(searchEdit, &DSearchEdit::returnPressed, this, [=]()
     {
         qDebug() << "触发了搜索，呜啦啦啦!";
-        QString searchtext = searchEdit->text();
+        QString searchtext = searchEdit->text().replace("\r","");
         if(!searchtext.isEmpty())
         {
             qDebug() << searchEdit->text();
@@ -108,10 +109,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 +129,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,7 +194,7 @@ void Widget::initUI()
     // 添加菜单项
     QAction *actionSubmission = new QAction(tr("Submit App"), this);
     QAction *setting = new QAction(tr("Settings"));
-    QAction *upgrade = new QAction(tr("App Upgrade"));
+    QAction *upgrade = new QAction(tr("APP Upgrade and Install Settings"));
 
     QMenu *menu = new QMenu;
     menu->addAction(setting);
@@ -291,18 +293,20 @@ void Widget::initConfig()
 
     // 读取服务器URL并初始化菜单项的链接
     QSettings readConfig(QDir::homePath() + "/.config/spark-store/config.ini", QSettings::IniFormat);
-    if(!readConfig.value("server/choose").toString().isEmpty())
+    if(!readConfig.value("server/choose").toString().isEmpty() && readConfig.value("server/updated").toString() == "TRUE")
     {
         ui->comboBox_server->setCurrentText(readConfig.value("server/choose").toString());
         appinfoLoadThread.setServer(serverUrl = readConfig.value("server/choose").toString());
     }
     else
     {
-        appinfoLoadThread.setServer(serverUrl = "https://d.store.deepinos.org.cn/");  // 默认URL
+        this->cdnSeverUrl = "https://cdn.d.store.deepinos.org.cn/";
+        appinfoLoadThread.setServer(serverUrl = this->cdnSeverUrl);  // 默认URL
     }
     configCanSave = true;   //　防止触发保存配置信号
 
     // menuUrl[0] = "http://127.0.0.1:8000/#/darkprogramming";
+    qDebug() << "serverUrl: " << serverUrl;
     menuUrl[0] = serverUrl + "store/#/";
     menuUrl[1] = serverUrl + "store/#/network";
     menuUrl[2] = serverUrl + "store/#/relations";
@@ -569,14 +573,14 @@ void Widget::chooseLeftMenu(int index)
 
     updateUI();
 
-    if(index <= 12)
+    if (index <= 12)
     {
-        if(themeIsDark)
+        if (themeIsDark)
         {
             QString darkurl = menuUrl[index].toString();
             QStringList list = darkurl.split("/");
             darkurl.clear();
-            for(int i = 0; i < list.size() - 1; i++)
+            for (int i = 0; i < list.size() - 1; i++)
             {
                 darkurl += list[i] + "/";
             }
@@ -667,6 +671,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);});
@@ -683,22 +688,18 @@ void Widget::searchApp(QString text)
     }
     else
     {
-        // sendNotification(tr("Spark store could only process spk:// links for now. The search feature is coming soon!"));
-        // ui->webView->setUrl(QUrl("http://www.baidu.com/s?wd="+text));    // 这东西对接百度
-        // ui->stackedWidget->setCurrentIndex(0);
-
         // 禁止同时进行多次搜索
-        if(!mutex.tryLock())
+        if (!mutex.tryLock())
         {
             return;
         }
 
         // 关键字搜索处理
         httpClient->get("https://search.deepinos.org.cn/appinfo/search")
-                .header("content-type", "application/json")
-                .queryParam("keyword", text)
-                .onResponse([this](QByteArray result)
-        {
+            .header("content-type", "application/json")
+            .queryParam("keyword", text)
+            .onResponse([this](QByteArray result)
+                        {
             auto json = QJsonDocument::fromJson(result).array();
             if (json.empty())
             {
@@ -707,20 +708,24 @@ void Widget::searchApp(QString text)
                 mutex.unlock();
                 return;
             }
-            displaySearchApp(json);
-        })
-        .onError([this](QString errorStr)
-        {
+            displaySearchApp(json); })
+            .onError([this](QString errorStr)
+                     {
             qDebug()  << "请求出错：" << errorStr;
             sendNotification(QString(tr("Request Error: %1")).arg(errorStr));
             mutex.unlock();
-            return;
-        })
-        .timeout(10 * 1000)
-                .exec();
+            return; })
+            .timeout(10 * 1000)
+            .exec();
     }
 }
 
+void Widget::closeEvent(QCloseEvent *event)
+{
+    mutex.unlock();
+    httpClient->deleteLater();
+}
+
 /**
  * @brief 展示搜索的APP信息
  */
@@ -787,15 +792,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)
     {
@@ -954,7 +959,9 @@ void Widget::httpFinished() // 完成下载
     download_list[nowDownload - 1].free = true;
     if(nowDownload < allDownload)
     {
+
         // 如果有排队则下载下一个
+        qDebug() << "切换下一个下载...";
         nowDownload += 1;
         while(download_list[nowDownload - 1].close)
         {
@@ -1022,11 +1029,13 @@ void Widget::on_comboBox_server_currentIndexChanged(const QString &arg1)
 {
     appinfoLoadThread.setServer(arg1);  // 服务器信息更新
 
+    const QString updatedInfo = "TRUE";
     if(configCanSave)
     {
         // ui->label_setting1->show();
         QSettings *setConfig = new QSettings(QDir::homePath() + "/.config/spark-store/config.ini", QSettings::IniFormat);
         setConfig->setValue("server/choose", arg1);
+        setConfig->setValue("server/updated", updatedInfo);
     }
 }
 
@@ -1038,7 +1047,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;
@@ -1082,77 +1091,13 @@ void Widget::on_pushButton_updateApt_clicked()
         ui->pushButton_updateApt->setEnabled(false);
         ui->label_aptserver->setText(tr("Updating, please wait..."));
 
-        std::fstream sourcesList, policy, update;
-        QDir tmpdir("/tmp");
-        auto tmpPath = QString::fromUtf8(TMP_PATH).toStdString();
-        bool unknownError = true;
-
-        tmpdir.mkpath("spark-store");
-        sourcesList.open(tmpPath + "/sparkstore.list", std::ios::out);
-        // 商店已经下架会替换系统库的包，优先级 policy 弃用
-        // policy.open(tmpPath + "/sparkstore", std::ios::out);
-
-        if(sourcesList /*&& policy*/)
-        {
-            auto serverAddr = ui->comboBox_server->currentText();
-
-            sourcesList << "deb [by-hash=force] ";
-            sourcesList << serverAddr.toUtf8().toStdString();
-            sourcesList << " /";
-            sourcesList.close();
-
-            /*
-             * policy << "Package: *\n" << "Pin: origin *" <<
-             * serverAddr.mid(serverAddr.indexOf('.')).toUtf8().toStdString() << "\n" <<
-             * "Pin-Priority: 90"; // 降低星火源的优先级，防止从星火安装已存在的系统包，破坏依赖
-             * policy.close();
-           */
-
-            update.open(tmpPath + "/update.sh", std::ios::out);
-            if(update)
-            {
-                unknownError = false;
-                update << "#!/bin/sh\n" <<
-                          "mv " + tmpPath + "/sparkstore.list /etc/apt/sources.list.d/sparkstore.list && " <<
-                          // "mv " + tmpPath + "/sparkstore /etc/apt/preferences.d/sparkstore && " <<
-                          "apt update";
-                update.close();
-
-                system(("chmod +x " + tmpPath + "/update.sh").c_str());
-
-                QProcess runupdate;
-                runupdate.start("pkexec", QStringList() << QString::fromStdString(tmpPath + "/update.sh"));
-                runupdate.waitForFinished();
-                QString error = runupdate.readAllStandardError();
-
-                QStringList everyError = error.split("\n");
-                bool haveError = false;
-                for(int i = 0; i < everyError.size(); i++)
-                {
-                    if(everyError[i].left(2) == "E:")
-                    {
-                        haveError = true;
-                    }
-                }
-
-                if(!haveError)
-                {
-                    ui->label_aptserver->setText("deb [by-hash=force] " + ui->comboBox_server->currentText().toUtf8() + " /");
-                }
-                else
-                {
-                    ui->label_aptserver->setText(tr("Apt has reported an error. Please use apt update in terminal to locate the problem."));
-                }
-            }
-        }
-
-        if(unknownError)
-        {
-            ui->label_aptserver->setText(tr("Unknown error!"));
-        }
+        QString storeSpk = "spk://store/tools/spark-store";
+        openUrl(storeSpk);
+        ui->label_aptserver->setText(tr(""));
 
         ui->pushButton_updateApt->setEnabled(true);
-    });
+      });
+
 }
 
 void Widget::on_pushButton_uninstall_clicked()
@@ -1204,6 +1149,16 @@ void Widget::on_pushButton_clear_clicked()  // 清空临时缓存目录
     });
 }
 
+void Widget::on_pushButton_clearWebCache_clicked()
+{
+    QtConcurrent::run([=]()
+                      {
+
+        QString dataLocal = QStandardPaths::writableLocation(QStandardPaths::AppLocalDataLocation);
+        QDir cacheDir(dataLocal );
+        cacheDir.removeRecursively(); });
+}
+
 quint64 Widget::dirFileSize(const QString &path)
 {
     QDir dir(path);
@@ -1304,13 +1259,16 @@ void Widget::on_stackedWidget_currentChanged(int arg1)
 void Widget::on_webEngineView_urlChanged(const QUrl &arg1)
 {
     //分析出服务器中的分类名称
-    QStringList url_ = arg1.path().split("/");
+    QStringList url_ = arg1.path().replace("//", "/").split("/");
     QString pname;
-    if(url_.size() > 3)
+    qDebug() << "URL size:" << url_.size();
+    if (url_.size() > 3)
     {
         type_name = url_[2];
         pname = url_[3];
     }
+    qDebug() << "type_name:" << type_name << ";pname" << pname;
+
     //如果是app.json就打开详情页
     if(arg1.path().right(8) == "app.json")
     {
@@ -1324,8 +1282,8 @@ 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() << "链接地址：" << arg1;
+        
+        qDebug() << "程序跳转链接地址：" << arg1;
 
         /*
         load.cancel();  // 打开并发加载线程前关闭正在执行的线程

src/widget.h

@@ -43,7 +43,6 @@ class DownloadController;
 namespace AeaQt {
 class HttpClient;
 }
-
 class Widget : public DBlurEffectWidget
 {
     Q_OBJECT
@@ -69,7 +68,7 @@ private slots:
 
     void httpFinished();
     void httpReadyRead();
-    void updateDataReadProgress(qint64,qint64);
+    void updateDataReadProgress(QString, qint64, qint64);
 
     // SpkAppInfoLoaderThread的槽函数
     void sltAppinfoResetUi();
@@ -92,6 +91,7 @@ private slots:
     void on_pushButton_updateApt_clicked();
     void on_pushButton_uninstall_clicked();
     void on_pushButton_clear_clicked();
+    void on_pushButton_clearWebCache_clicked();
     void on_pushButton_website_clicked();
     void on_pushButton_clicked();
     void on_btn_openDir_clicked();
@@ -105,6 +105,7 @@ private slots:
 
   public:
     QUrl url;
+    QString cdnSeverUrl;
 
     downloadlist download_list[LIST_MAX];
     Ui::Widget *ui;
@@ -127,6 +128,7 @@ private:
     void setfoot(int);
     void updatefoot();
     void updateUI();
+    void closeEvent(QCloseEvent *event);
 
     quint64 dirFileSize(const QString &path);
 
@@ -147,6 +149,7 @@ private:
     QFuture<void> load;
     QFutureWatcher<void> watchScreenshotLoad;
     QTimer download_speed;
+    QString theSpeed;
     QString type_name;
     QColor main_color;
     int foot;

src/widget.ui

@@ -345,7 +345,7 @@
       <number>0</number>
      </property>
      <property name="currentIndex">
-      <number>2</number>
+      <number>3</number>
      </property>
      <widget class="QWidget" name="page">
       <layout class="QVBoxLayout" name="verticalLayout_4">
@@ -489,7 +489,7 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>903</width>
+            <width>889</width>
             <height>849</height>
            </rect>
           </property>
@@ -993,8 +993,8 @@
                   <rect>
                    <x>0</x>
                    <y>0</y>
-                   <width>869</width>
-                   <height>325</height>
+                   <width>851</width>
+                   <height>324</height>
                   </rect>
                  </property>
                  <layout class="QHBoxLayout" name="horizontalLayout_4">
@@ -1123,8 +1123,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>738</width>
-            <height>886</height>
+            <width>889</width>
+            <height>716</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_23">
@@ -1220,7 +1220,7 @@
                     <string notr="true">color:#808080</string>
                    </property>
                    <property name="text">
-                    <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The role of the source server is to ensure that the software is updated, and supports the use of the apt tool to get the software. We usually prefer that you use the first line as the update source, which is generally the most stable. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                    <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Check update for Spark Store. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
                    </property>
                    <property name="wordWrap">
                     <bool>true</bool>
@@ -1237,7 +1237,7 @@
                  <item row="0" column="0">
                   <widget class="QLabel" name="label_6">
                    <property name="text">
-                    <string>Source Server</string>
+                    <string>Spark Store Update</string>
                    </property>
                   </widget>
                  </item>
@@ -1285,7 +1285,31 @@
               <item>
                <widget class="QWidget" name="widget_10" native="true">
                 <layout class="QGridLayout" name="gridLayout_4">
-                 <item row="0" column="3">
+                 <item row="2" column="0" colspan="5">
+                  <widget class="QLabel" name="label_12">
+                   <property name="styleSheet">
+                    <string notr="true">color:#808080</string>
+                   </property>
+                   <property name="text">
+                    <string>Since the dictionary is at /tmp,It would be cleaned automatically when  system reboot.</string>
+                   </property>
+                  </widget>
+                 </item>
+                 <item row="1" column="1">
+                  <widget class="QLabel" name="tmp_size_ui">
+                   <property name="text">
+                    <string>0B</string>
+                   </property>
+                  </widget>
+                 </item>
+                 <item row="0" column="0" colspan="2">
+                  <widget class="QLabel" name="label_11">
+                   <property name="text">
+                    <string>Location：/tmp/spark-store</string>
+                   </property>
+                  </widget>
+                 </item>
+                 <item row="0" column="4">
                   <spacer name="horizontalSpacer_5">
                    <property name="orientation">
                     <enum>Qt::Horizontal</enum>
@@ -1305,16 +1329,6 @@
                    </property>
                   </widget>
                  </item>
-                 <item row="2" column="0" colspan="4">
-                  <widget class="QLabel" name="label_12">
-                   <property name="styleSheet">
-                    <string notr="true">color:#808080</string>
-                   </property>
-                   <property name="text">
-                    <string>Since the dictionary is at /tmp,It would be cleaned automatically when  system reboot.</string>
-                   </property>
-                  </widget>
-                 </item>
                  <item row="1" column="0">
                   <widget class="QLabel" name="label_13">
                    <property name="maximumSize">
@@ -1328,17 +1342,10 @@
                    </property>
                   </widget>
                  </item>
-                 <item row="1" column="1">
-                  <widget class="QLabel" name="tmp_size_ui">
+                 <item row="0" column="3">
+                  <widget class="QPushButton" name="pushButton_clearWebCache">
                    <property name="text">
-                    <string>0B</string>
-                   </property>
-                  </widget>
-                 </item>
-                 <item row="0" column="0" colspan="2">
-                  <widget class="QLabel" name="label_11">
-                   <property name="text">
-                    <string>Location：/tmp/spark-store</string>
+                    <string>Clear Web Cache</string>
                    </property>
                   </widget>
                  </item>

src/workerthreads.cpp

@@ -13,8 +13,29 @@ void SpkAppInfoLoaderThread::run()
     emit requestResetUi();
 
     httpClient = new AeaQt::HttpClient;
+    QString oriSeverUrl = "https://d.store.deepinos.org.cn";
+    QString cdnSeverUrl = "https://cdn.d.store.deepinos.org.cn";
 
-    httpClient->get(targetUrl.toString())
+    QString downloadTimesUrl = targetUrl.toString();
+    downloadTimesUrl = downloadTimesUrl.replace(oriSeverUrl, cdnSeverUrl);
+    downloadTimesUrl = downloadTimesUrl.replace("app.json", "download-times.txt");
+    httpClient->get(downloadTimesUrl)
+            .onResponse([this](QString downloadTimesFeedback)
+    {
+        qDebug() << "请求应用下载量信息 " << downloadTimesFeedback;
+        this->downloadTimes = downloadTimesFeedback.replace("\n","");
+    })
+    .onError([this](QString errorStr)
+    {
+        qDebug() << "请求下载量失败:" << errorStr;
+        this->downloadTimes  = "0";
+    })
+    .block()
+            .timeout(3*1000)
+            .exec();
+
+
+    httpClient->get(targetUrl.toString().replace(oriSeverUrl, cdnSeverUrl))
             .header("content-type", "application/json")
             .onResponse([this](QByteArray json_array)
     {
@@ -29,8 +50,12 @@ void SpkAppInfoLoaderThread::run()
 
         QString deburl = serverUrl;
         deburl = deburl.left(urladdress.length() - 1);
-        urladdress = "https://img.jerrywang.top/";  // 使用图片专用服务器请保留这行，删除后将使用源服务器
-        urladdress = urladdress.left(urladdress.length() - 1);
+        
+        QStringList url_ = targetUrl.toString().replace("//", "/").split("/");
+        urladdress = "https://" + url_[1];
+        // 使用 cdn 服务器
+        urladdress = "https://cdn.d.store.deepinos.org.cn";  // 使用图片专用服务器请保留这行，删除后将使用源服务器
+
 
         for(int i = 3; i < downloadurl.size(); i++)
         {
@@ -60,7 +85,8 @@ void SpkAppInfoLoaderThread::run()
         }
         details += tr("Contributor: ") + json["Contributor"].toString() + "\n";
         details += tr("Update Time: ") + json["Update"].toString() + "\n";
-        details += tr("Installed Size: ") + json["Size"].toString() + "\n";
+        details += tr("Installed Size: ") + json["Size"].toString() + "\n\n";
+        details += tr("Download Times: ") + this->downloadTimes + "\n";
         more = json["More"].toString();
 
         QProcess isInstall;

src/workerthreads.h

@@ -23,6 +23,7 @@ protected:
 private:
     QUrl targetUrl;
     QString serverUrl;
+    QString downloadTimes;
     bool finishedDownload = false;
     int downloaderRetval = 0;
 

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,101 @@
+#/bin/bash
+
+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
+
+
+
+
+
+
+
+
+if  [ "$1" = "install" ] || [ "$1" = "upgrade" ] || [ "$1" = "full-upgrade" ] ; then
+
+DEPEND=`which  apt-fast`
+if [ "$DEPEND" = "" ] ; 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
+
+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"
+
+###执行
+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" = "download" ];then
+DEPEND=`which  apt-fast`
+if [ "$DEPEND" = "" ] ; 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
+
+###执行
+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" = "policy" ] || [ "$1" = "search" ];then
+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"
+
+###执行
+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 "$@" --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"
+
+#只更新星火源
+
+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/password-check/ss-certificate-passwd

@@ -3,9 +3,15 @@ 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 
+	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/ss-feedback/README.md

@@ -0,0 +1,2 @@
+# Feadback 反馈脚本
+使用 shc 加密, 需要使用 cc、gcc 编译。

tool/ss-feedback/sender-d.sh.c

@@ -0,0 +1,817 @@
+#if 0
+	shc Version 4.0.3, Generic Shell Script Compiler
+	GNU GPL Version 3 Md Jahidul Hamid <jahidulhamid@yahoo.com>
+
+	shc -v -r -f sender-d.sh 
+#endif
+
+static  char data [] = 
+#define      pswd_z	256
+#define      pswd	((&data[15]))
+	"\073\237\114\151\003\324\064\061\057\100\342\310\062\343\346\075"
+	"\105\011\036\257\154\107\223\050\237\060\137\020\063\015\377\156"
+	"\162\230\321\117\026\333\267\322\335\062\077\075\261\355\172\366"
+	"\367\231\246\144\341\071\215\201\151\354\221\234\371\221\013\153"
+	"\052\334\273\101\267\162\023\224\244\123\322\125\100\115\114\067"
+	"\347\362\233\310\053\050\111\225\025\333\061\016\154\075\172\227"
+	"\031\065\330\320\250\354\145\114\077\067\242\200\204\357\267\154"
+	"\341\123\064\015\174\176\242\221\131\324\240\306\021\032\136\053"
+	"\117\066\373\367\043\141\104\142\230\347\342\035\326\232\212\270"
+	"\356\276\306\152\075\151\374\227\076\234\135\120\266\273\173\006"
+	"\362\167\376\025\330\103\170\161\052\133\217\001\366\031\272\344"
+	"\330\201\116\025\352\113\254\051\347\012\171\236\305\365\245\270"
+	"\154\243\316\105\346\106\267\021\242\106\023\230\137\316\174\067"
+	"\117\313\115\072\026\371\143\376\003\334\234\311\322\101\202\076"
+	"\345\120\204\313\227\073\335\071\202\360\321\341\276\116\031\016"
+	"\031\146\110\057\140\253\056\144\210\312\056\132\014\260\231\361"
+	"\000\036\275\230\131\232\321\333\213\243\275\112\361\327\130\360"
+	"\173\100\213\115\034\027\361\331\141\342\261\272\356\360\133\051"
+	"\217\247\222\222\173\307\304\253\007\247\163\072\212\132\052\005"
+	"\232\266\123\266\315\104\220"
+#define      date_z	1
+#define      date	((&data[311]))
+	"\375"
+#define      tst2_z	19
+#define      tst2	((&data[312]))
+	"\031\242\273\246\041\336\076\145\246\300\036\051\047\366\106\356"
+	"\220\064\226"
+#define      shll_z	10
+#define      shll	((&data[331]))
+	"\142\312\022\213\061\052\357\062\161\266\353\321"
+#define      inlo_z	3
+#define      inlo	((&data[343]))
+	"\216\314\250"
+#define      msg1_z	65
+#define      msg1	((&data[347]))
+	"\300\115\164\240\306\270\356\211\346\362\207\042\205\377\337\231"
+	"\113\016\267\021\330\324\374\242\242\336\361\041\143\054\223\355"
+	"\361\326\220\125\016\336\260\031\012\341\025\102\124\131\005\244"
+	"\234\133\315\262\013\375\340\025\227\352\060\034\236\222\347\136"
+	"\160\356\206\333\112\340\006\120\173\274\243\061"
+#define      chk1_z	22
+#define      chk1	((&data[427]))
+	"\270\017\004\242\044\277\223\036\316\135\273\047\172\354\056\123"
+	"\141\200\041\375\363\101\127\122\242\373\336\067\346\143\370"
+#define      text_z	1869
+#define      text	((&data[549]))
+	"\071\315\146\114\156\047\322\111\162\262\117\303\055\014\146\137"
+	"\226\117\042\116\136\046\360\203\135\327\346\126\251\033\243\342"
+	"\351\012\056\127\062\000\240\244\263\360\147\341\374\316\101\222"
+	"\035\143\341\174\212\322\377\350\251\345\076\122\001\342\065\352"
+	"\355\143\101\037\144\342\304\030\323\053\372\320\372\073\142\030"
+	"\237\104\224\051\026\223\022\300\171\121\023\172\064\110\144\041"
+	"\131\377\367\164\123\316\261\141\353\367\301\016\274\016\120\047"
+	"\114\046\100\031\034\140\073\010\260\305\236\267\340\334\172\305"
+	"\021\246\221\332\021\311\021\154\112\347\316\242\317\135\332\301"
+	"\336\151\126\072\217\354\230\133\220\107\301\140\001\353\360\166"
+	"\213\363\372\027\233\047\323\276\201\201\216\023\154\320\161\313"
+	"\320\152\257\025\322\272\025\153\247\235\321\160\071\321\067\253"
+	"\241\156\046\022\220\271\031\066\331\215\206\354\323\250\277\275"
+	"\253\021\137\373\037\247\054\101\371\345\374\104\113\056\231\313"
+	"\256\361\253\230\051\271\176\340\337\333\050\341\362\056\167\255"
+	"\110\043\213\146\047\300\122\142\314\236\021\040\074\377\243\374"
+	"\373\242\311\017\027\025\325\213\232\031\105\104\013\052\212\072"
+	"\030\104\271\142\045\220\026\110\122\375\151\376\117\030\367\246"
+	"\217\256\245\325\077\346\276\327\045\113\166\374\164\175\046\022"
+	"\327\265\135\221\047\346\332\276\260\240\227\230\211\165\023\170"
+	"\316\154\240\317\001\217\073\173\212\106\115\070\141\315\324\116"
+	"\204\026\326\026\254\252\257\044\333\310\024\223\327\026\336\312"
+	"\151\363\273\204\220\242\016\226\317\314\156\124\240\122\232\124"
+	"\110\055\240\223\016\373\000\136\102\135\122\057\222\070\210\130"
+	"\012\234\324\361\047\201\232\126\155\021\270\134\303\377\110\250"
+	"\220\352\314\011\276\260\131\175\233\367\254\266\366\263\014\102"
+	"\237\066\305\270\257\117\034\316\147\136\133\373\051\333\006\077"
+	"\242\225\073\276\155\106\311\232\247\112\341\143\016\103\013\062"
+	"\214\247\315\302\241\024\076\037\135\126\145\227\342\323\061\230"
+	"\016\246\203\251\033\223\105\251\131\001\060\306\305\034\005\133"
+	"\161\366\173\132\343\314\135\205\273\260\170\145\370\262\153\321"
+	"\253\345\131\260\346\020\367\016\127\056\307\040\112\052\012\264"
+	"\247\057\273\157\016\275\270\226\173\033\071\042\072\142\170\134"
+	"\045\016\163\251\362\073\214\166\354\103\017\330\122\073\211\204"
+	"\200\004\003\176\324\343\275\017\056\341\055\071\173\175\144\147"
+	"\365\115\274\012\253\277\036\370\220\115\307\120\131\037\206\063"
+	"\355\032\324\265\064\114\014\217\113\302\125\301\033\100\357\042"
+	"\334\212\202\353\262\040\130\240\027\110\343\271\356\171\001\325"
+	"\167\062\056\061\210\316\075\142\261\005\116\142\230\367\343\135"
+	"\174\302\375\047\075\334\222\326\253\073\174\173\360\260\021\344"
+	"\331\315\146\233\057\007\314\231\256\113\221\021\126\173\045\315"
+	"\247\126\162\253\375\041\043\263\232\274\171\132\320\020\070\152"
+	"\013\224\371\045\350\270\077\251\145\063\357\171\036\245\125\315"
+	"\020\206\333\111\062\331\054\144\346\173\132\113\374\043\022\371"
+	"\311\101\043\300\337\334\367\145\030\023\207\043\253\042\227\302"
+	"\350\037\067\332\350\253\117\124\243\341\046\211\061\007\303\154"
+	"\022\210\064\112\311\170\123\071\332\266\205\151\265\300\343\237"
+	"\147\001\024\013\173\265\330\375\070\111\044\246\204\155\146\067"
+	"\036\060\065\251\005\354\200\115\136\076\034\040\335\033\043\221"
+	"\374\211\170\061\251\321\372\116\023\167\330\007\310\060\175\076"
+	"\064\242\253\131\116\074\275\022\133\016\203\214\254\115\002\325"
+	"\046\213\073\107\241\341\273\110\300\236\005\231\275\325\012\175"
+	"\365\056\370\275\132\330\041\035\166\130\240\013\162\041\163\140"
+	"\377\225\075\315\115\106\270\277\233\113\106\305\270\240\026\106"
+	"\317\325\264\324\126\337\214\155\366\331\372\200\306\272\163\333"
+	"\266\343\246\100\016\002\242\070\231\262\005\137\323\257\343\047"
+	"\301\206\266\341\302\046\266\167\227\276\125\165\027\044\353\035"
+	"\043\036\300\137\140\244\156\205\364\361\067\016\324\110\142\167"
+	"\125\216\360\003\023\161\060\263\356\073\050\173\151\371\005\027"
+	"\027\273\363\163\017\044\064\055\267\345\052\320\370\132\374\123"
+	"\020\263\163\176\037\145\346\003\275\377\154\040\166\363\224\240"
+	"\214\304\332\367\057\146\070\165\101\026\125\361\100\357\001\031"
+	"\305\363\242\164\125\067\077\063\134\271\250\242\243\022\031\114"
+	"\225\006\352\203\137\376\201\147\225\372\053\217\331\003\156\143"
+	"\332\361\315\167\027\232\307\331\314\071\025\271\047\031\126\310"
+	"\254\200\324\257\022\351\244\007\335\036\150\036\362\072\021\007"
+	"\140\155\073\242\063\071\162\205\121\257\302\056\155\071\306\057"
+	"\236\364\027\143\074\375\254\324\117\176\242\267\247\215\374\137"
+	"\003\123\113\247\064\347\123\321\123\044\211\351\253\045\226\324"
+	"\034\147\117\066\000\370\074\041\242\137\270\361\106\154\113\045"
+	"\275\172\101\331\157\137\222\202\136\241\075\132\267\033\325\113"
+	"\042\352\305\133\274\252\111\213\330\215\261\145\322\246\174\031"
+	"\267\347\275\247\251\030\255\106\116\362\117\277\024\135\356\172"
+	"\033\066\346\252\205\144\302\147\131\076\122\021\152\225\313\235"
+	"\202\066\043\300\027\147\263\001\201\341\121\051\310\140\317\333"
+	"\131\254\112\104\337\014\320\143\375\231\252\220\064\143\234\000"
+	"\017\304\317\113\131\055\324\177\367\224\230\264\132\311\261\152"
+	"\034\137\223\225\365\314\014\076\377\025\023\040\222\043\022\047"
+	"\332\363\144\102\015\314\010\256\206\065\310\103\337\001\326\206"
+	"\024\354\074\045\337\107\003\225\137\032\055\332\056\347\073\055"
+	"\267\115\315\204\061\310\304\007\065\267\107\176\066\216\011\014"
+	"\066\215\236\247\176\327\164\113\353\215\343\313\302\106\302\250"
+	"\077\220\165\207\015\144\336\311\065\351\311\163\104\104\267\262"
+	"\307\057\106\061\110\271\053\136\133\263\066\177\103\212\234\166"
+	"\271\130\043\076\352\006\066\017\220\207\275\024\235\356\377\344"
+	"\005\257\200\002\253\123\052\015\326\342\225\116\137\256\213\354"
+	"\251\026\237\347\166\014\121\075\306\022\247\276\265\017\375\161"
+	"\174\113\273\017\227\064\057\217\376\326\311\140\354\074\160\121"
+	"\346\370\327\255\277\376\062\301\033\111\042\016\233\162\101\303"
+	"\161\123\210\042\157\270\114\252\372\315\352\335\221\115\300\252"
+	"\163\344\140\324\157\261\256\232\173\171\024\250\006\342\320\340"
+	"\365\137\167\336\216\320\337\345\265\346\363\133\023\076\121\117"
+	"\002\021\237\112\206\043\012\370\033\045\133\151\303\330\001\222"
+	"\073\174\074\320\054\005\127\000\210\240\347\131\256\126\253\007"
+	"\342\137\135\162\075\344\340\210\333\057\141\042\223\055\006\174"
+	"\000\005\225\117\203\320\143\136\130\037\333\217\136\371\221\220"
+	"\052\071\173\374\261\213\235\241\071\260\057\226\360\212\211\346"
+	"\333\062\135\157\357\316\156\022\111\201\010\151\065\111\364\364"
+	"\137\005\161\265\354\014\003\204\117\112\075\042\357\165\042\354"
+	"\263\304\343\323\045\127\244\326\160\216\335\042\353\173\135\061"
+	"\354\306\013\252\265\013\046\173\100\050\146\372\303\210\171\200"
+	"\160\377\013\300\245\265\307\146\355\047\052\007\011\214\060\367"
+	"\177\327\043\302\111\263\123\276\107\220\316\207\024\142\070\325"
+	"\004\262\276\355\075\175\146\163\370\345\135\214\322\041\105\047"
+	"\371\073\016\023\064\231\203\005\246\204\203\306\340\002\160\365"
+	"\315\022\302\170\340\356\151\323\344\242\134\046\134\162\227\117"
+	"\262\240\062\234\324\135\326\242\341\066\232\314\200\331\124\077"
+	"\201\245\227\252\073\356\252\367\277\232\331\005\324\350\032\261"
+	"\035\246\325\177\334\121\146\316\041\043\352\253\373\043\035\234"
+	"\231\321\046\171\221\105\216\272\025\321\042\222\007\351\363\232"
+	"\006\016\231\137\124\215\132\071\166\042\065\127\337\253\307\021"
+	"\337\364\070\261\112\201\310\242\335\104\353\055\277\322\232\240"
+	"\007\374\034\322\312\373\031\130\204\036\362\373\142\043\273\315"
+	"\216\373\273\260\310\111\070\031\207\101\325\157\110\142\216\357"
+	"\172\023\345\067\105\007\375\023\053\256\121\163\255\323\257\132"
+	"\164\360\307\234\106\130\275\217\211\327\300\322\261\206\364\326"
+	"\021\255\077\302\202\027\207\370\263\313\333\070\010\115\377\271"
+	"\173\302\243\224\126\201\255\356\261\176\213\135\216\054\237\371"
+	"\040\174\342\367\323\053\341\031\333\211\214\042\343\254\122\252"
+	"\325\326\263\326\325\063\065\362\114\161\314\151\116\237\160\073"
+	"\321\025\336\117\020\055\371\021\371\104\001\072\204\064\227\333"
+	"\034\374\123\265\343\026\372\207\264\033\065\316\147\211\142\366"
+	"\371\257\120\162\107\234\134\010\035\212\241\132\317\254\246\101"
+	"\020\211\005\051\134\061\043\054\054\137\217\104\376\323\330\050"
+	"\352\154\072\253\345\214\276\137\300\006\304\341\262\152\043\303"
+	"\364\051\354\120\132\017\175\207\156\014\313\155\337\244\225\312"
+	"\020\320\165\366\134\063\126\034\072\032\376\355\205\041\260\171"
+	"\113\234\312\245\254\107\055\033\123\370\210\063\235\036\375\256"
+	"\356\163\245\113\247\373\150\341\025\146\316\233\210\177\024\323"
+	"\034\336\171\310\046\246\343\171\237\153\255\075\211\252\353\170"
+	"\036\220\304\305\214\054\246\242\222\165\075\033\365\122\357\021"
+	"\061\150\331\127\017\275\321\257\051\176"
+#define      chk2_z	19
+#define      chk2	((&data[2562]))
+	"\330\053\107\261\150\156\021\060\277\165\015\167\176\171\251\302"
+	"\276\160\207\325\012\334"
+#define      lsto_z	1
+#define      lsto	((&data[2581]))
+	"\010"
+#define      xecc_z	15
+#define      xecc	((&data[2582]))
+	"\005\040\327\254\114\361\156\300\024\244\110\337\050\143\126\227"
+	"\257"
+#define      tst1_z	22
+#define      tst1	((&data[2603]))
+	"\036\047\271\057\207\076\001\326\201\264\356\151\036\164\071\111"
+	"\027\304\031\244\017\252\223\354\153\051\130\042\011\260"
+#define      msg2_z	19
+#define      msg2	((&data[2632]))
+	"\341\357\377\335\143\002\251\076\361\005\267\075\204\313\320\034"
+	"\012\023\243\361\261\374\315\242"
+#define      rlax_z	1
+#define      rlax	((&data[2653]))
+	"\121"
+#define      opts_z	1
+#define      opts	((&data[2654]))
+	"\241"/* End of data[] */;
+#define      hide_z	4096
+#define SETUID 0	/* Define as 1 to call setuid(0) at start of script */
+#define DEBUGEXEC	0	/* Define as 1 to debug execvp calls */
+#define TRACEABLE	1	/* Define as 1 to enable ptrace the executable */
+#define HARDENING	0	/* Define as 1 to disable ptrace/dump the executable */
+#define BUSYBOXON	0	/* Define as 1 to enable work with busybox */
+
+#if HARDENING
+static const char * shc_x[] = {
+"/*",
+" * Copyright 2019 - Intika <intika@librefox.org>",
+" * Replace ******** with secret read from fd 21",
+" * Also change arguments location of sub commands (sh script commands)",
+" * gcc -Wall -fpic -shared -o shc_secret.so shc_secret.c -ldl",
+" */",
+"",
+"#define _GNU_SOURCE /* needed to get RTLD_NEXT defined in dlfcn.h */",
+"#define PLACEHOLDER \"********\"",
+"#include <dlfcn.h>",
+"#include <stdlib.h>",
+"#include <string.h>",
+"#include <unistd.h>",
+"#include <stdio.h>",
+"#include <signal.h>",
+"",
+"static char secret[128000]; //max size",
+"typedef int (*pfi)(int, char **, char **);",
+"static pfi real_main;",
+"",
+"// copy argv to new location",
+"char **copyargs(int argc, char** argv){",
+"    char **newargv = malloc((argc+1)*sizeof(*argv));",
+"    char *from,*to;",
+"    int i,len;",
+"",
+"    for(i = 0; i<argc; i++){",
+"        from = argv[i];",
+"        len = strlen(from)+1;",
+"        to = malloc(len);",
+"        memcpy(to,from,len);",
+"        // zap old argv space",
+"        memset(from,'\\0',len);",
+"        newargv[i] = to;",
+"        argv[i] = 0;",
+"    }",
+"    newargv[argc] = 0;",
+"    return newargv;",
+"}",
+"",
+"static int mymain(int argc, char** argv, char** env) {",
+"    //fprintf(stderr, \"Inject main argc = %d\\n\", argc);",
+"    return real_main(argc, copyargs(argc,argv), env);",
+"}",
+"",
+"int __libc_start_main(int (*main) (int, char**, char**),",
+"                      int argc,",
+"                      char **argv,",
+"                      void (*init) (void),",
+"                      void (*fini)(void),",
+"                      void (*rtld_fini)(void),",
+"                      void (*stack_end)){",
+"    static int (*real___libc_start_main)() = NULL;",
+"    int n;",
+"",
+"    if (!real___libc_start_main) {",
+"        real___libc_start_main = dlsym(RTLD_NEXT, \"__libc_start_main\");",
+"        if (!real___libc_start_main) abort();",
+"    }",
+"",
+"    n = read(21, secret, sizeof(secret));",
+"    if (n > 0) {",
+"      int i;",
+"",
+"    if (secret[n - 1] == '\\n') secret[--n] = '\\0';",
+"    for (i = 1; i < argc; i++)",
+"        if (strcmp(argv[i], PLACEHOLDER) == 0)",
+"          argv[i] = secret;",
+"    }",
+"",
+"    real_main = main;",
+"",
+"    return real___libc_start_main(mymain, argc, argv, init, fini, rtld_fini, stack_end);",
+"}",
+"",
+0};
+#endif /* HARDENING */
+
+/* rtc.c */
+
+#include <sys/stat.h>
+#include <sys/types.h>
+
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+#include <unistd.h>
+
+/* 'Alleged RC4' */
+
+static unsigned char stte[256], indx, jndx, kndx;
+
+/*
+ * Reset arc4 stte. 
+ */
+void stte_0(void)
+{
+	indx = jndx = kndx = 0;
+	do {
+		stte[indx] = indx;
+	} while (++indx);
+}
+
+/*
+ * Set key. Can be used more than once. 
+ */
+void key(void * str, int len)
+{
+	unsigned char tmp, * ptr = (unsigned char *)str;
+	while (len > 0) {
+		do {
+			tmp = stte[indx];
+			kndx += tmp;
+			kndx += ptr[(int)indx % len];
+			stte[indx] = stte[kndx];
+			stte[kndx] = tmp;
+		} while (++indx);
+		ptr += 256;
+		len -= 256;
+	}
+}
+
+/*
+ * Crypt data. 
+ */
+void arc4(void * str, int len)
+{
+	unsigned char tmp, * ptr = (unsigned char *)str;
+	while (len > 0) {
+		indx++;
+		tmp = stte[indx];
+		jndx += tmp;
+		stte[indx] = stte[jndx];
+		stte[jndx] = tmp;
+		tmp += stte[indx];
+		*ptr ^= stte[tmp];
+		ptr++;
+		len--;
+	}
+}
+
+/* End of ARC4 */
+
+#if HARDENING
+
+#include <sys/ptrace.h>
+#include <sys/wait.h>
+#include <signal.h>
+#include <sys/prctl.h>
+#define PR_SET_PTRACER 0x59616d61
+
+/* Seccomp Sandboxing Init */
+#include <stdlib.h>
+#include <stdio.h>
+#include <stddef.h>
+#include <string.h>
+#include <unistd.h>
+#include <errno.h>
+
+#include <sys/types.h>
+#include <sys/prctl.h>
+#include <sys/syscall.h>
+#include <sys/socket.h>
+
+#include <linux/filter.h>
+#include <linux/seccomp.h>
+#include <linux/audit.h>
+
+#define ArchField offsetof(struct seccomp_data, arch)
+
+#define Allow(syscall) \
+    BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, SYS_##syscall, 0, 1), \
+    BPF_STMT(BPF_RET+BPF_K, SECCOMP_RET_ALLOW)
+
+struct sock_filter filter[] = {
+    /* validate arch */
+    BPF_STMT(BPF_LD+BPF_W+BPF_ABS, ArchField),
+    BPF_JUMP( BPF_JMP+BPF_JEQ+BPF_K, AUDIT_ARCH_X86_64, 1, 0),
+    BPF_STMT(BPF_RET+BPF_K, SECCOMP_RET_KILL),
+
+    /* load syscall */
+    BPF_STMT(BPF_LD+BPF_W+BPF_ABS, offsetof(struct seccomp_data, nr)),
+
+    /* list of allowed syscalls */
+    Allow(exit_group),  /* exits a process */
+    Allow(brk),         /* for malloc(), inside libc */
+    Allow(mmap),        /* also for malloc() */
+    Allow(munmap),      /* for free(), inside libc */
+
+    /* and if we don't match above, die */
+    BPF_STMT(BPF_RET+BPF_K, SECCOMP_RET_KILL),
+};
+struct sock_fprog filterprog = {
+    .len = sizeof(filter)/sizeof(filter[0]),
+    .filter = filter
+};
+
+/* Seccomp Sandboxing - Set up the restricted environment */
+void seccomp_hardening() {
+    if (prctl(PR_SET_NO_NEW_PRIVS, 1, 0, 0, 0)) {
+        perror("Could not start seccomp:");
+        exit(1);
+    }
+    if (prctl(PR_SET_SECCOMP, SECCOMP_MODE_FILTER, &filterprog) == -1) {
+        perror("Could not start seccomp:");
+        exit(1);
+    }
+} 
+/* End Seccomp Sandboxing Init */
+
+void shc_x_file() {
+    FILE *fp;
+    int line = 0;
+
+    if ((fp = fopen("/tmp/shc_x.c", "w")) == NULL ) {exit(1); exit(1);}
+    for (line = 0; shc_x[line]; line++)	fprintf(fp, "%s\n", shc_x[line]);
+    fflush(fp);fclose(fp);
+}
+
+int make() {
+	char * cc, * cflags, * ldflags;
+    char cmd[4096];
+
+	cc = getenv("CC");
+	if (!cc) cc = "cc";
+
+	sprintf(cmd, "%s %s -o %s %s", cc, "-Wall -fpic -shared", "/tmp/shc_x.so", "/tmp/shc_x.c -ldl");
+	if (system(cmd)) {remove("/tmp/shc_x.c"); return -1;}
+	remove("/tmp/shc_x.c"); return 0;
+}
+
+void arc4_hardrun(void * str, int len) {
+    //Decode locally
+    char tmp2[len];
+    char tmp3[len+1024];
+    memcpy(tmp2, str, len);
+
+	unsigned char tmp, * ptr = (unsigned char *)tmp2;
+    int lentmp = len;
+    int pid, status;
+    pid = fork();
+
+    shc_x_file();
+    if (make()) {exit(1);}
+
+    setenv("LD_PRELOAD","/tmp/shc_x.so",1);
+
+    if(pid==0) {
+
+        //Start tracing to protect from dump & trace
+        if (ptrace(PTRACE_TRACEME, 0, 0, 0) < 0) {
+            kill(getpid(), SIGKILL);
+            _exit(1);
+        }
+
+        //Decode Bash
+        while (len > 0) {
+            indx++;
+            tmp = stte[indx];
+            jndx += tmp;
+            stte[indx] = stte[jndx];
+            stte[jndx] = tmp;
+            tmp += stte[indx];
+            *ptr ^= stte[tmp];
+            ptr++;
+            len--;
+        }
+
+        //Do the magic
+        sprintf(tmp3, "%s %s", "'********' 21<<<", tmp2);
+
+        //Exec bash script //fork execl with 'sh -c'
+        system(tmp2);
+
+        //Empty script variable
+        memcpy(tmp2, str, lentmp);
+
+        //Clean temp
+        remove("/tmp/shc_x.so");
+
+        //Sinal to detach ptrace
+        ptrace(PTRACE_DETACH, 0, 0, 0);
+        exit(0);
+    }
+    else {wait(&status);}
+
+    /* Seccomp Sandboxing - Start */
+    seccomp_hardening();
+
+    exit(0);
+}
+#endif /* HARDENING */
+
+/*
+ * Key with file invariants. 
+ */
+int key_with_file(char * file)
+{
+	struct stat statf[1];
+	struct stat control[1];
+
+	if (stat(file, statf) < 0)
+		return -1;
+
+	/* Turn on stable fields */
+	memset(control, 0, sizeof(control));
+	control->st_ino = statf->st_ino;
+	control->st_dev = statf->st_dev;
+	control->st_rdev = statf->st_rdev;
+	control->st_uid = statf->st_uid;
+	control->st_gid = statf->st_gid;
+	control->st_size = statf->st_size;
+	control->st_mtime = statf->st_mtime;
+	control->st_ctime = statf->st_ctime;
+	key(control, sizeof(control));
+	return 0;
+}
+
+#if DEBUGEXEC
+void debugexec(char * sh11, int argc, char ** argv)
+{
+	int i;
+	fprintf(stderr, "shll=%s\n", sh11 ? sh11 : "<null>");
+	fprintf(stderr, "argc=%d\n", argc);
+	if (!argv) {
+		fprintf(stderr, "argv=<null>\n");
+	} else { 
+		for (i = 0; i <= argc ; i++)
+			fprintf(stderr, "argv[%d]=%.60s\n", i, argv[i] ? argv[i] : "<null>");
+	}
+}
+#endif /* DEBUGEXEC */
+
+void rmarg(char ** argv, char * arg)
+{
+	for (; argv && *argv && *argv != arg; argv++);
+	for (; argv && *argv; argv++)
+		*argv = argv[1];
+}
+
+void chkenv_end(void);
+
+int chkenv(int argc)
+{
+	char buff[512];
+	unsigned long mask, m;
+	int l, a, c;
+	char * string;
+	extern char ** environ;
+
+	mask = (unsigned long)getpid();
+	stte_0();
+	 key(&chkenv, (void*)&chkenv_end - (void*)&chkenv);
+	 key(&data, sizeof(data));
+	 key(&mask, sizeof(mask));
+	arc4(&mask, sizeof(mask));
+	sprintf(buff, "x%lx", mask);
+	string = getenv(buff);
+#if DEBUGEXEC
+	fprintf(stderr, "getenv(%s)=%s\n", buff, string ? string : "<null>");
+#endif
+	l = strlen(buff);
+	if (!string) {
+		/* 1st */
+		sprintf(&buff[l], "=%lu %d", mask, argc);
+		putenv(strdup(buff));
+		return 0;
+	}
+	c = sscanf(string, "%lu %d%c", &m, &a, buff);
+	if (c == 2 && m == mask) {
+		/* 3rd */
+		rmarg(environ, &string[-l - 1]);
+		return 1 + (argc - a);
+	}
+	return -1;
+}
+
+void chkenv_end(void){}
+
+#if HARDENING
+
+static void gets_process_name(const pid_t pid, char * name) {
+	char procfile[BUFSIZ];
+	sprintf(procfile, "/proc/%d/cmdline", pid);
+	FILE* f = fopen(procfile, "r");
+	if (f) {
+		size_t size;
+		size = fread(name, sizeof (char), sizeof (procfile), f);
+		if (size > 0) {
+			if ('\n' == name[size - 1])
+				name[size - 1] = '\0';
+		}
+		fclose(f);
+	}
+}
+
+void hardening() {
+    prctl(PR_SET_DUMPABLE, 0);
+    prctl(PR_SET_PTRACER, -1);
+
+    int pid = getppid();
+    char name[256] = {0};
+    gets_process_name(pid, name);
+
+    if (   (strcmp(name, "bash") != 0) 
+        && (strcmp(name, "/bin/bash") != 0) 
+        && (strcmp(name, "sh") != 0) 
+        && (strcmp(name, "/bin/sh") != 0) 
+        && (strcmp(name, "sudo") != 0) 
+        && (strcmp(name, "/bin/sudo") != 0) 
+        && (strcmp(name, "/usr/bin/sudo") != 0)
+        && (strcmp(name, "gksudo") != 0) 
+        && (strcmp(name, "/bin/gksudo") != 0) 
+        && (strcmp(name, "/usr/bin/gksudo") != 0) 
+        && (strcmp(name, "kdesu") != 0) 
+        && (strcmp(name, "/bin/kdesu") != 0) 
+        && (strcmp(name, "/usr/bin/kdesu") != 0) 
+       )
+    {
+        printf("Operation not permitted\n");
+        kill(getpid(), SIGKILL);
+        exit(1);
+    }
+}
+
+#endif /* HARDENING */
+
+#if !TRACEABLE
+
+#define _LINUX_SOURCE_COMPAT
+#include <sys/ptrace.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <fcntl.h>
+#include <signal.h>
+#include <stdio.h>
+#include <unistd.h>
+
+#if !defined(PT_ATTACHEXC) /* New replacement for PT_ATTACH */
+   #if !defined(PTRACE_ATTACH) && defined(PT_ATTACH)
+       #define PT_ATTACHEXC	PT_ATTACH
+   #elif defined(PTRACE_ATTACH)
+       #define PT_ATTACHEXC PTRACE_ATTACH
+   #endif
+#endif
+
+void untraceable(char * argv0)
+{
+	char proc[80];
+	int pid, mine;
+
+	switch(pid = fork()) {
+	case  0:
+		pid = getppid();
+		/* For problematic SunOS ptrace */
+#if defined(__FreeBSD__)
+		sprintf(proc, "/proc/%d/mem", (int)pid);
+#else
+		sprintf(proc, "/proc/%d/as",  (int)pid);
+#endif
+		close(0);
+		mine = !open(proc, O_RDWR|O_EXCL);
+		if (!mine && errno != EBUSY)
+			mine = !ptrace(PT_ATTACHEXC, pid, 0, 0);
+		if (mine) {
+			kill(pid, SIGCONT);
+		} else {
+			perror(argv0);
+			kill(pid, SIGKILL);
+		}
+		_exit(mine);
+	case -1:
+		break;
+	default:
+		if (pid == waitpid(pid, 0, 0))
+			return;
+	}
+	perror(argv0);
+	_exit(1);
+}
+#endif /* !TRACEABLE */
+
+char * xsh(int argc, char ** argv)
+{
+	char * scrpt;
+	int ret, i, j;
+	char ** varg;
+	char * me = argv[0];
+	if (me == NULL) { me = getenv("_"); }
+	if (me == 0) { fprintf(stderr, "E: neither argv[0] nor $_ works."); exit(1); }
+
+	ret = chkenv(argc);
+	stte_0();
+	 key(pswd, pswd_z);
+	arc4(msg1, msg1_z);
+	arc4(date, date_z);
+	if (date[0] && (atoll(date)<time(NULL)))
+		return msg1;
+	arc4(shll, shll_z);
+	arc4(inlo, inlo_z);
+	arc4(xecc, xecc_z);
+	arc4(lsto, lsto_z);
+	arc4(tst1, tst1_z);
+	 key(tst1, tst1_z);
+	arc4(chk1, chk1_z);
+	if ((chk1_z != tst1_z) || memcmp(tst1, chk1, tst1_z))
+		return tst1;
+	arc4(msg2, msg2_z);
+	if (ret < 0)
+		return msg2;
+	varg = (char **)calloc(argc + 10, sizeof(char *));
+	if (!varg)
+		return 0;
+	if (ret) {
+		arc4(rlax, rlax_z);
+		if (!rlax[0] && key_with_file(shll))
+			return shll;
+		arc4(opts, opts_z);
+#if HARDENING
+	    arc4_hardrun(text, text_z);
+	    exit(0);
+       /* Seccomp Sandboxing - Start */
+       seccomp_hardening();
+#endif
+		arc4(text, text_z);
+		arc4(tst2, tst2_z);
+		 key(tst2, tst2_z);
+		arc4(chk2, chk2_z);
+		if ((chk2_z != tst2_z) || memcmp(tst2, chk2, tst2_z))
+			return tst2;
+		/* Prepend hide_z spaces to script text to hide it. */
+		scrpt = malloc(hide_z + text_z);
+		if (!scrpt)
+			return 0;
+		memset(scrpt, (int) ' ', hide_z);
+		memcpy(&scrpt[hide_z], text, text_z);
+	} else {			/* Reexecute */
+		if (*xecc) {
+			scrpt = malloc(512);
+			if (!scrpt)
+				return 0;
+			sprintf(scrpt, xecc, me);
+		} else {
+			scrpt = me;
+		}
+	}
+	j = 0;
+#if BUSYBOXON
+	varg[j++] = "busybox";
+	varg[j++] = "sh";
+#else
+	varg[j++] = argv[0];		/* My own name at execution */
+#endif
+	if (ret && *opts)
+		varg[j++] = opts;	/* Options on 1st line of code */
+	if (*inlo)
+		varg[j++] = inlo;	/* Option introducing inline code */
+	varg[j++] = scrpt;		/* The script itself */
+	if (*lsto)
+		varg[j++] = lsto;	/* Option meaning last option */
+	i = (ret > 1) ? ret : 0;	/* Args numbering correction */
+	while (i < argc)
+		varg[j++] = argv[i++];	/* Main run-time arguments */
+	varg[j] = 0;			/* NULL terminated array */
+#if DEBUGEXEC
+	debugexec(shll, j, varg);
+#endif
+	execvp(shll, varg);
+	return shll;
+}
+
+int main(int argc, char ** argv)
+{
+#if SETUID
+   setuid(0);
+#endif
+#if DEBUGEXEC
+	debugexec("main", argc, argv);
+#endif
+#if HARDENING
+	hardening();
+#endif
+#if !TRACEABLE
+	untraceable(argv[0]);
+#endif
+	argv[1] = xsh(argc, argv);
+	fprintf(stderr, "%s%s%s: %s\n", argv[0],
+		errno ? ": " : "",
+		errno ? strerror(errno) : "",
+		argv[1] ? argv[1] : "<null>"
+	);
+	return 1;
+}

tool/ssinstall

@@ -21,7 +21,7 @@ then
     echo "ssinstall需要在root下运行";
 	uname=`whoami`
 	echo "Now input the password of $uname"
-	read upass
+	read -e upass
 	################检查密码对不对
     echo "$upass" | sudo -S echo "i love amber forever"
 	passcheck=`echo "$upass" | sudo -S echo "i love amber forever"`
@@ -38,74 +38,61 @@ fi
 
 
 
-
-
 ##################apt-fast/metalink测试
-DEPEND=`which apt-fast`
+DEPEND="这里一定会安装所以放弃处理"
 isuos=`cat /etc/os-release | grep UnionTech`
 
 
 ##############判断是否是root运行，如果是，则正常走；如果不是，则代输密码
 if [ "$(id -u)" != "0" ];then
 #############################无root权限时
-#临时提升星火源的优先级
-echo "$upass" | sudo -S sed -i 's/400/500/g' /etc/apt/preferences.d/sparkstore
 
-if [ "$DEPEND" = "" ] ; then
-echo "没有检测到apt-fast组件，将会使用单线程下载依赖"
-echo "你可以安装apt-fast来加速下载（对UOS无效）"
-echo "若要使用apt-fast加速下载，请在安装apt-fast时选择使用apt并选择略过确认对话框"
-echo ----------------------------------------------------------------------------------
-echo "$upass" | sudo -S dpkg -i $1 || apt install -yf || dpkg -P $1
+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 ----------------------------------------------------------------------------------
-dpkg -i $1 || apt install -yf || dpkg -P $1
+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，使用apt-fast进行多线程下载加速"
+echo "检测到apt-fast，使用aptss进行多线程下载加速"
 echo ----------------------------------------------------------------------------------
-echo "$upass" | sudo -S dpkg -i $1 || apt-fast install -yf || dpkg -P $1
+echo "$upass" | sudo -S dpkg -i $1 || sudo aptss install -yf 
 fi
 
-echo "$upass" | sudo -S sed -i 's/500/400/g' /etc/apt/preferences.d/sparkstore
-#恢复优先级
+
 
 
 
 else
 ###########################有root权限时
 
-#临时提升星火源的优先级
-sed -i 's/400/500/g' /etc/apt/preferences.d/sparkstore
-
-if [ "$DEPEND" = "" ] ; then
-echo "没有检测到apt-fast组件，将会使用单线程下载依赖"
-echo "你可以安装apt-fast来加速下载（对UOS无效）"
-echo "若要使用apt-fast加速下载，请在安装apt-fast时选择使用apt并选择略过确认对话框"
-echo ----------------------------------------------------------------------------------
-dpkg -i $1 || apt install -yf || dpkg -P $1
+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 || apt install -yf || dpkg -P $1
+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，使用apt-fast进行多线程下载加速"
+echo "检测到apt-fast，使用aptss进行多线程下载加速"
 echo ----------------------------------------------------------------------------------
-dpkg -i $1 || apt-fast install -yf || dpkg -P $1
+dpkg -i $1 || aptss install -yf 
 fi
 
-sed -i 's/500/400/g' /etc/apt/preferences.d/sparkstore
-#恢复优先级
 
 
 

tool/update-upgrade/autostart/spark-update-notifier.desktop

@@ -1,5 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Type=Application
-Exec=/opt/durapps/spark-store/bin/update-upgrade/ss-update-notify.sh
-Name=spark-update-notifier

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

@@ -1,9 +1,52 @@
 #!/bin/bash
-DEPEND=`which apt-fast`
-if [ "$DEPEND" = "" ] ; then
-echo "没有安装apt-fast，使用apt运行"
-sudo apt upgrade -o Dir::Etc::sourcelist="sources.list.d/sparkstore.list"     -o Dir::Etc::sourceparts="-" -o APT::Get::List-Cleanup="0"
-else
-echo "已安装apt-fast，使用apt-fast加速运行"
-sudo apt-fast upgrade -o Dir::Etc::sourcelist="sources.list.d/sparkstore.list"     -o Dir::Etc::sourceparts="-" -o APT::Get::List-Cleanup="0"
-fi
+
+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

@@ -1,72 +1,113 @@
 #!/bin/bash
-set -e
-echo "因为目前没有有时间的Qt程序员志愿者所以现在加功能只有让shenmo写脚本了..."
-echo
-echo "此功能被添加的原因是：为了防止影响系统更新，星火源默认的优先级是400，低于默认的500。这导致了与系统仓库相同包名的软件包无法正常更新到比系统仓库更高的版本。例如：hugo，系统仓库中的低版本会被优先安装，而且默认不会更新到星火的更新的版本"
-echo "此脚本可以检测星火源中是否有比当前系统更高版本的软件包，由您决定是否安装"
-echo "此脚本使用apt update/apt list --upgrade/apt upgrade来更新软件源、列出更新列表和操作更新"
-echo
-echo "该脚本不对其使用效果有任何明示或暗示的担保，在使用前请您确保您清楚地知道您在干什么。您应当清楚，星火商店的软件包并不是适配所有发行版的；尽管绝大多数的软件更新是无害的，您仍然应该仔细检查显示出来的更新内容，以确保不会对您的依赖环境造成破坏，尤其是那些看起来和系统依赖相关的软件包。在查看过更新列表之后，确认更新之前，您仍有一次取消更新的机会。"
-echo "本脚本的开发者不对使用该脚本可能造成的后果负责"
-echo
-echo
-echo
-echo "请按回车继续..."
-#"只有回车可以用啊！""啊？"“你说的任意都行啊”“唔。。。戳到我的盲区了”
-read
 
 reset
 
 endloop=0
 
-
+#####################检测是否启动过了更新检测工具
 while [ $endloop -eq 0 ] ;do
 
-if [  -f /etc/xdg/autostart/spark-update-notifier.desktop ];then 
-textupdateopen="关闭"
+if [  -e /etc/systemd/system/multi-user.target.wants/spark-update-notifier.service ];then 
+text_update_open="关闭"
 #已经开启了就显示关闭
 else
-textupdateopen="开启"
+text_update_open="开启"
 fi
 
-echo "欢迎使用星火更新工具 脚本版 "
+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 "输入1 $textupdateopen星火更新检测工具(如果开启则会在系统启动后自动检测更新。如有更新则会弹出通知)"
+echo "输入0 查看自动更新相关功能使用前须知（重要）"
+echo "输入1 $text_update_open星火更新检测工具(如果开启则会在系统启动后自动检测更新。如有更新则会弹出通知)"
 echo "输入2 查看可更新软件包列表并决定是否更新"
-echo "输入3 退出脚本"
-read option
+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 [  -f /etc/xdg/autostart/spark-update-notifier.desktop ];then 
-	echo "检测到已经启动了自动更新检测，关闭中"
+	if [  -e /etc/systemd/system/multi-user.target.wants/spark-update-notifier.service ];then 
+	echo "---检测到已经启动了自动更新检测，执行关闭"
 	sudo systemctl disable spark-update-notifier
-	sudo rm /etc/xdg/autostart/spark-update-notifier.desktop
-	
+	sleep 3
+	reset
 	else
-	echo "未检测到自动更新检测，启动中"
+	echo "---未检测到自动更新检测，执行启动"
 	sudo systemctl enable spark-update-notifier
 	sudo service spark-update-notifier start
-#	ln -s /opt/durapps/spark-store/bin/update-upgrade/autostart/spark-update-notifier.desktop $XDG_CONFIG_HOME/autostart
-#	
-	sudo ln -s /opt/durapps/spark-store/bin/update-upgrade/autostart/spark-update-notifier.desktop /etc/xdg/autostart
-	/opt/durapps/spark-store/bin/update-upgrade/ss-update-notify.sh now
+	sleep 3
+	reset
 	fi
 	;;
 
 	2)
 	echo "执行以下操作需要授权..."
-	/opt/durapps/spark-store/bin/update-upgrade/ss-upgrade-list.sh
+	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)
-	echo "按回车退出"
+	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 "无法识别的输入！请重新输入"
+	echo "---无法识别的输入！请重新输入"
 	reset
 esac
 

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

@@ -0,0 +1,77 @@
+#!/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"
+# 每日更新星火源文件
+mkdir -p /etc/apt/preferences.d
+touch /etc/apt/preferences.d/sparkstore
+cat << EOF >/etc/apt/preferences.d/sparkstore
+Package: *
+Pin: origin *.deepinos.org.cn
+Pin-Priority: 100
+
+EOF
+
+updatetext=`aptss ssupdate`
+
+rm /etc/apt/preferences.d/sparkstore
+
+
+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-update-notify-placer.sh

@@ -1,57 +0,0 @@
-#!/bin/bash
-set -e
-rm -rf /tmp/spark-store-updatenum/number
-LANG=en.US
-
-#!/bin/bash
-
-#检测网络链接畅通
-function network()
-{
-    #超时时间
-    local timeout=1
-
-    #目标网站
-    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
-
-
-updatetext=`sudo apt update -o Dir::Etc::sourcelist="sources.list.d/sparkstore.list"     -o Dir::Etc::sourceparts="-" -o APT::Get::List-Cleanup="0"`
-
-mkdir -p /tmp/spark-store-updatenum/
-
-
-isupdate=`echo ${updatetext: -5}`
-if [ "$isupdate" = "date." ];then
-sudo echo "0" > /tmp/spark-store-updatenum/number
-exit 0 
-fi
-
-
-update_app_number=`echo ${updatetext%package*} #从右向左截取第一个 src 后的字符串`
-update_app_number=`echo ${update_app_number: -1}`	
-sudo echo "$update_app_number" > /tmp/spark-store-updatenum/number
-
-	
-

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

@@ -1,28 +0,0 @@
-#!/bin/bash
-set -e
-isexistnumber=0
-if [ "$1" = "now" ];then
-	if [  -f /tmp/spark-store-updatenum/number ];then
-	update_app_number=`cat /tmp/spark-store-updatenum/number`
-	echo "$update_app_number"
-		if [ "$update_app_number" = "0" ];then
-		exit 0
-		fi
-	notify-send -i spark-store "星火更新提醒" "星火商店仓库中有$update_app_number个软件包可以更新啦！请到星火商店的菜单处理"
-	fi
-exit 0
-fi
-
-until [  $isexistnumber -eq 1 ];do
-if [  -f /tmp/spark-store-updatenum/number ];then
-	sleep 10
-	update_app_number=`cat /tmp/spark-store-updatenum/number`
-	echo "$update_app_number"
-		if [ "$update_app_number" = "0" ];then
-		exit 0
-		fi
-	notify-send -i spark-store "星火更新提醒" "星火商店仓库中有$update_app_number个软件包可以更新啦！请到星火商店的菜单处理"
-	isexistnumber=1
-fi
-sleep 10
-done

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

@@ -2,5 +2,5 @@
 set -e
 
 
-echo "可更新的应用有："
-sudo apt list --upgradable -o Dir::Etc::sourcelist="sources.list.d/sparkstore.list"     -o Dir::Etc::sourceparts="-" -o APT::Get::List-Cleanup="0"
+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

@@ -45,47 +45,52 @@
 <context>
     <name>SpkAppInfoLoaderThread</name>
     <message>
-        <location filename="../src/workerthreads.cpp" line="167"/>
+        <location filename="../src/workerthreads.cpp" line="193"/>
         <source>Failed to download app info. Please check internet connection.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/workerthreads.cpp" line="48"/>
+        <location filename="../src/workerthreads.cpp" line="73"/>
         <source>PkgName: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/workerthreads.cpp" line="49"/>
+        <location filename="../src/workerthreads.cpp" line="74"/>
         <source>Version: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/workerthreads.cpp" line="52"/>
+        <location filename="../src/workerthreads.cpp" line="77"/>
         <source>Author: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/workerthreads.cpp" line="57"/>
+        <location filename="../src/workerthreads.cpp" line="82"/>
         <source>Official Site: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/workerthreads.cpp" line="61"/>
+        <location filename="../src/workerthreads.cpp" line="86"/>
         <source>Contributor: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/workerthreads.cpp" line="62"/>
+        <location filename="../src/workerthreads.cpp" line="87"/>
         <source>Update Time: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/workerthreads.cpp" line="63"/>
+        <location filename="../src/workerthreads.cpp" line="88"/>
         <source>Installed Size: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/workerthreads.cpp" line="123"/>
+        <location filename="../src/workerthreads.cpp" line="89"/>
+        <source>Download Times: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/workerthreads.cpp" line="149"/>
         <source>Failed to load application icon.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -144,8 +149,8 @@
     </message>
     <message>
         <location filename="../src/widget.ui" line="547"/>
-        <location filename="../src/widget.cpp" line="906"/>
-        <location filename="../src/widget.cpp" line="1175"/>
+        <location filename="../src/widget.cpp" line="910"/>
+        <location filename="../src/widget.cpp" line="1119"/>
         <source>Install</source>
         <translation type="unfinished"></translation>
     </message>
@@ -342,11 +347,6 @@
         <source>Refresh</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../src/widget.ui" line="1223"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The role of the source server is to ensure that the software is updated, and supports the use of the apt tool to get the software. We usually prefer that you use the first line as the update source, which is generally the most stable. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../src/widget.ui" line="1233"/>
         <source>Update</source>
@@ -354,7 +354,7 @@
     </message>
     <message>
         <location filename="../src/widget.ui" line="1240"/>
-        <source>Source Server</source>
+        <source>Spark Store Update</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -422,103 +422,98 @@
         <source>Take effect when restart</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../src/widget.ui" line="1223"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Check update for Spark Store. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../src/widget.ui" line="1334"/>
         <source>0B</source>
         <translation type="unfinished">0B</translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="186"/>
+        <location filename="../src/widget.cpp" line="187"/>
         <source>Spark Store</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="187"/>
+        <location filename="../src/widget.cpp" line="188"/>
         <source>Search or enter spk://</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="193"/>
+        <location filename="../src/widget.cpp" line="194"/>
         <source>Submit App</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="194"/>
+        <location filename="../src/widget.cpp" line="195"/>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="344"/>
+        <location filename="../src/widget.cpp" line="196"/>
+        <source>APP Upgrade and Install Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/widget.cpp" line="347"/>
         <source>Not Exist</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="138"/>
-        <location filename="../src/widget.cpp" line="406"/>
-        <location filename="../src/widget.cpp" line="411"/>
-        <location filename="../src/widget.cpp" line="421"/>
-        <location filename="../src/widget.cpp" line="426"/>
+        <location filename="../src/widget.cpp" line="139"/>
+        <location filename="../src/widget.cpp" line="409"/>
+        <location filename="../src/widget.cpp" line="414"/>
+        <location filename="../src/widget.cpp" line="424"/>
+        <location filename="../src/widget.cpp" line="429"/>
         <source>Spark\ Store</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="656"/>
-        <location filename="../src/widget.cpp" line="895"/>
+        <location filename="../src/widget.cpp" line="659"/>
+        <location filename="../src/widget.cpp" line="899"/>
         <source>Reinstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="622"/>
+        <location filename="../src/widget.cpp" line="625"/>
         <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="195"/>
-        <source>App Upgrade</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/widget.cpp" line="900"/>
+        <location filename="../src/widget.cpp" line="904"/>
         <source>Upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="1083"/>
+        <location filename="../src/widget.cpp" line="1091"/>
         <source>Updating, please wait...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <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="1151"/>
-        <source>Unknown error!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/widget.cpp" line="1179"/>
+        <location filename="../src/widget.cpp" line="1123"/>
         <source>Uninstall succeeded</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="706"/>
+        <location filename="../src/widget.cpp" line="710"/>
         <source>Relative apps Not Found!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="715"/>
+        <location filename="../src/widget.cpp" line="719"/>
         <source>Request Error: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="1201"/>
+        <location filename="../src/widget.cpp" line="1145"/>
         <source>Temporary cache was cleaned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="1283"/>
+        <location filename="../src/widget.cpp" line="1227"/>
         <source>The URL has been copied to the clipboard</source>
         <translation type="unfinished"></translation>
     </message>
@@ -582,51 +577,41 @@
     </message>
     <message>
         <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="100"/>
-        <source>Failed to download %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <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="114"/>
+        <location filename="../src/downloadlist.cpp" line="101"/>
         <source>Finished downloading %1, awaiting to install</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/downloadlist.cpp" line="147"/>
+        <location filename="../src/downloadlist.cpp" line="134"/>
         <source>Installing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/downloadlist.cpp" line="190"/>
+        <location filename="../src/downloadlist.cpp" line="177"/>
         <source>Finish</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/downloadlist.cpp" line="196"/>
+        <location filename="../src/downloadlist.cpp" line="183"/>
         <source>Retry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/downloadlist.cpp" line="197"/>
+        <location filename="../src/downloadlist.cpp" line="184"/>
         <source>Error happened in dpkg progress , you can try it again</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/downloadlist.cpp" line="203"/>
+        <location filename="../src/downloadlist.cpp" line="190"/>
         <source>dpkg progress had been aborted，you can retry installation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/downloadlist.cpp" line="225"/>
+        <location filename="../src/downloadlist.cpp" line="212"/>
         <source>Download canceled</source>
         <translation type="unfinished"></translation>
     </message>

translations/spark-store_fr.ts

@@ -56,47 +56,52 @@ Nous sommes nés pour le changement.</translation>
 <context>
     <name>SpkAppInfoLoaderThread</name>
     <message>
-        <location filename="../src/workerthreads.cpp" line="167"/>
+        <location filename="../src/workerthreads.cpp" line="193"/>
         <source>Failed to download app info. Please check internet connection.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/workerthreads.cpp" line="48"/>
+        <location filename="../src/workerthreads.cpp" line="73"/>
         <source>PkgName: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/workerthreads.cpp" line="49"/>
+        <location filename="../src/workerthreads.cpp" line="74"/>
         <source>Version: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/workerthreads.cpp" line="52"/>
+        <location filename="../src/workerthreads.cpp" line="77"/>
         <source>Author: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/workerthreads.cpp" line="57"/>
+        <location filename="../src/workerthreads.cpp" line="82"/>
         <source>Official Site: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/workerthreads.cpp" line="61"/>
+        <location filename="../src/workerthreads.cpp" line="86"/>
         <source>Contributor: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/workerthreads.cpp" line="62"/>
+        <location filename="../src/workerthreads.cpp" line="87"/>
         <source>Update Time: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/workerthreads.cpp" line="63"/>
+        <location filename="../src/workerthreads.cpp" line="88"/>
         <source>Installed Size: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/workerthreads.cpp" line="123"/>
+        <location filename="../src/workerthreads.cpp" line="89"/>
+        <source>Download Times: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/workerthreads.cpp" line="149"/>
         <source>Failed to load application icon.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -205,8 +210,8 @@ Nous sommes nés pour le changement.</translation>
     </message>
     <message>
         <location filename="../src/widget.ui" line="547"/>
-        <location filename="../src/widget.cpp" line="906"/>
-        <location filename="../src/widget.cpp" line="1175"/>
+        <location filename="../src/widget.cpp" line="910"/>
+        <location filename="../src/widget.cpp" line="1119"/>
         <source>Install</source>
         <translation type="unfinished"></translation>
     </message>
@@ -365,7 +370,7 @@ Nous sommes nés pour le changement.</translation>
     </message>
     <message>
         <location filename="../src/widget.ui" line="1223"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The role of the source server is to ensure that the software is updated, and supports the use of the apt tool to get the software. We usually prefer that you use the first line as the update source, which is generally the most stable. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Check update for Spark Store. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -375,7 +380,7 @@ Nous sommes nés pour le changement.</translation>
     </message>
     <message>
         <location filename="../src/widget.ui" line="1240"/>
-        <source>Source Server</source>
+        <source>Spark Store Update</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -552,15 +557,15 @@ Nous sommes nés pour le changement.</translation>
         <translation type="vanished">Redémarrez pour prendre effet</translation>
     </message>
     <message>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;源服务器的作用是保证软件更新，并且支持使用apt工具获取软件。通常我们更建议你使用第一个线路作为更新源，一般是最稳定的。&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;跳转到星火应用商店主页检测更新。&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="vanished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Le rôle du serveur source est de s&apos;assurer que le logiciel est mis à jour et prend en charge l&apos;utilisation de l&apos;outil apt pour obtenir le logiciel. Nous préférons généralement que vous utilisiez la première ligne comme source de mise à jour, qui est généralement la plus stable. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <source>更新源</source>
+        <source>跳转更新</source>
         <translation type="vanished">Mettre à jour la source APT</translation>
     </message>
     <message>
-        <source>更新源服务器：</source>
+        <source>星火应用商店更新检测：</source>
         <translation type="vanished">Source APT: </translation>
     </message>
     <message>
@@ -601,97 +606,87 @@ Nous sommes nés pour le changement.</translation>
         <translation type="vanished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Nous ne sommes pas l&apos;équipe officielle, tout comme vous, nous ne sommes qu&apos;un des nombreux passionnés et utilisateurs de systèmes Linux / deepin, nous développons et gérons le &quot;Spark Store&quot;! &quot;, est de rassembler la communauté pour partager des logiciels utiles, ou pour participer au développement ensemble, afin que nous utilisions tous les derniers et meilleurs logiciels. &lt;/p&gt;&lt;p&gt; Nous n&apos;en tirons aucun profit, tous les développeurs et mainteneurs ne sont pas payés, et nous comptons sur les dons de la communauté pour la plupart de nos dépenses, dont nous sommes reconnaissants et qui nous permettent de ne pas dépenser trop d&apos;énergie se soucier du financement. &lt;/p&gt;&lt;p&gt;Notre service et nos logiciels sont gratuits pour tout le monde à utiliser, à communiquer et à apprendre, mais vous devez vous conformer aux lois et réglementations locales dans le processus de votre utilisation, sinon tout problème n&apos;a rien à voir avec nous. &lt;/p&gt;&lt;p&gt;Si une partie du magasin enfreint vos droits, veuillez nous en informer &amp;lt;jifengshenmo@outlook.com&amp;gt; nous retirerons le contenu en infraction dès que possible. &lt;/p&gt;&lt;p&gt;Si vous souhaitez également vous impliquer avec nous, que vous soyez impliqué dans le développement, la conception, le pitching ou la soumission de travaux, nous vous invitons à nous rejoindre. &lt;/p&gt;&lt;p&gt;QQ group:872690351&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="138"/>
-        <location filename="../src/widget.cpp" line="406"/>
-        <location filename="../src/widget.cpp" line="411"/>
-        <location filename="../src/widget.cpp" line="421"/>
-        <location filename="../src/widget.cpp" line="426"/>
+        <location filename="../src/widget.cpp" line="139"/>
+        <location filename="../src/widget.cpp" line="409"/>
+        <location filename="../src/widget.cpp" line="414"/>
+        <location filename="../src/widget.cpp" line="424"/>
+        <location filename="../src/widget.cpp" line="429"/>
         <source>Spark\ Store</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="186"/>
+        <location filename="../src/widget.cpp" line="187"/>
         <source>Spark Store</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="187"/>
+        <location filename="../src/widget.cpp" line="188"/>
         <source>Search or enter spk://</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="193"/>
+        <location filename="../src/widget.cpp" line="194"/>
         <source>Submit App</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="194"/>
+        <location filename="../src/widget.cpp" line="195"/>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="344"/>
+        <location filename="../src/widget.cpp" line="196"/>
+        <source>APP Upgrade and Install Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/widget.cpp" line="347"/>
         <source>Not Exist</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="656"/>
-        <location filename="../src/widget.cpp" line="895"/>
+        <location filename="../src/widget.cpp" line="659"/>
+        <location filename="../src/widget.cpp" line="899"/>
         <source>Reinstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="622"/>
+        <location filename="../src/widget.cpp" line="625"/>
         <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="195"/>
-        <source>App Upgrade</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/widget.cpp" line="706"/>
+        <location filename="../src/widget.cpp" line="710"/>
         <source>Relative apps Not Found!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="715"/>
+        <location filename="../src/widget.cpp" line="719"/>
         <source>Request Error: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="900"/>
+        <location filename="../src/widget.cpp" line="904"/>
         <source>Upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="1083"/>
+        <location filename="../src/widget.cpp" line="1091"/>
         <source>Updating, please wait...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <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="1151"/>
-        <source>Unknown error!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/widget.cpp" line="1179"/>
+        <location filename="../src/widget.cpp" line="1123"/>
         <source>Uninstall succeeded</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="1201"/>
+        <location filename="../src/widget.cpp" line="1145"/>
         <source>Temporary cache was cleaned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="1283"/>
+        <location filename="../src/widget.cpp" line="1227"/>
         <source>The URL has been copied to the clipboard</source>
         <translation type="unfinished"></translation>
     </message>
@@ -776,51 +771,41 @@ Nous sommes nés pour le changement.</translation>
     </message>
     <message>
         <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="100"/>
-        <source>Failed to download %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <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="114"/>
+        <location filename="../src/downloadlist.cpp" line="101"/>
         <source>Finished downloading %1, awaiting to install</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/downloadlist.cpp" line="147"/>
+        <location filename="../src/downloadlist.cpp" line="134"/>
         <source>Installing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/downloadlist.cpp" line="190"/>
+        <location filename="../src/downloadlist.cpp" line="177"/>
         <source>Finish</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/downloadlist.cpp" line="196"/>
+        <location filename="../src/downloadlist.cpp" line="183"/>
         <source>Retry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/downloadlist.cpp" line="197"/>
+        <location filename="../src/downloadlist.cpp" line="184"/>
         <source>Error happened in dpkg progress , you can try it again</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/downloadlist.cpp" line="203"/>
+        <location filename="../src/downloadlist.cpp" line="190"/>
         <source>dpkg progress had been aborted，you can retry installation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/downloadlist.cpp" line="225"/>
+        <location filename="../src/downloadlist.cpp" line="212"/>
         <source>Download canceled</source>
         <translation type="unfinished"></translation>
     </message>

translations/spark-store_zh_CN.ts

@@ -29,7 +29,7 @@
     <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>
+        <translation>&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>
@@ -42,7 +42,7 @@
     <message>
         <location filename="../src/main.cpp" line="45"/>
         <source>The Spark Project</source>
-        <translation type="unfinished">星火计划 The Spark Project</translation>
+        <translation>星火计划 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>
@@ -57,47 +57,52 @@
 <context>
     <name>SpkAppInfoLoaderThread</name>
     <message>
-        <location filename="../src/workerthreads.cpp" line="167"/>
+        <location filename="../src/workerthreads.cpp" line="193"/>
         <source>Failed to download app info. Please check internet connection.</source>
         <translation>下载应用程序详细信息失败，请检查网络连接。</translation>
     </message>
     <message>
-        <location filename="../src/workerthreads.cpp" line="48"/>
+        <location filename="../src/workerthreads.cpp" line="73"/>
         <source>PkgName: </source>
         <translation>包名： </translation>
     </message>
     <message>
-        <location filename="../src/workerthreads.cpp" line="49"/>
+        <location filename="../src/workerthreads.cpp" line="74"/>
         <source>Version: </source>
         <translation>版本： </translation>
     </message>
     <message>
-        <location filename="../src/workerthreads.cpp" line="52"/>
+        <location filename="../src/workerthreads.cpp" line="77"/>
         <source>Author: </source>
         <translation>作者： </translation>
     </message>
     <message>
-        <location filename="../src/workerthreads.cpp" line="57"/>
+        <location filename="../src/workerthreads.cpp" line="82"/>
         <source>Official Site: </source>
         <translation>官网： </translation>
     </message>
     <message>
-        <location filename="../src/workerthreads.cpp" line="61"/>
+        <location filename="../src/workerthreads.cpp" line="86"/>
         <source>Contributor: </source>
         <translation>投稿者： </translation>
     </message>
     <message>
-        <location filename="../src/workerthreads.cpp" line="62"/>
+        <location filename="../src/workerthreads.cpp" line="87"/>
         <source>Update Time: </source>
         <translation>更新时间： </translation>
     </message>
     <message>
-        <location filename="../src/workerthreads.cpp" line="63"/>
+        <location filename="../src/workerthreads.cpp" line="88"/>
         <source>Installed Size: </source>
         <translation>大小： </translation>
     </message>
     <message>
-        <location filename="../src/workerthreads.cpp" line="123"/>
+        <location filename="../src/workerthreads.cpp" line="89"/>
+        <source>Download Times: </source>
+        <translation>下载量： </translation>
+    </message>
+    <message>
+        <location filename="../src/workerthreads.cpp" line="149"/>
         <source>Failed to load application icon.</source>
         <translation>加载应用程序图标失败。</translation>
     </message>
@@ -199,8 +204,8 @@
     </message>
     <message>
         <location filename="../src/widget.ui" line="547"/>
-        <location filename="../src/widget.cpp" line="906"/>
-        <location filename="../src/widget.cpp" line="1175"/>
+        <location filename="../src/widget.cpp" line="910"/>
+        <location filename="../src/widget.cpp" line="1119"/>
         <source>Install</source>
         <translation>安装</translation>
     </message>
@@ -374,19 +379,18 @@
         <translation type="vanished">重启商店后生效</translation>
     </message>
     <message>
-        <location filename="../src/widget.ui" line="1223"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The role of the source server is to ensure that the software is updated, and supports the use of the apt tool to get the software. We usually prefer that you use the first line as the update source, which is generally the most stable. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;源服务器的作用是保证软件更新，并且支持使用apt工具获取软件。通常我们更建议你使用第一个线路作为更新源，一般是最稳定的。&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Jump to the Spark app store home page to check for updates. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="vanished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;跳转到星火应用商店主页检测更新。&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location filename="../src/widget.ui" line="1233"/>
         <source>Update</source>
-        <translation>更新源</translation>
+        <translation>跳转更新</translation>
     </message>
     <message>
         <location filename="../src/widget.ui" line="1240"/>
-        <source>Source Server</source>
-        <translation>更新源服务器</translation>
+        <source>Spark Store Update</source>
+        <translation>星火应用商店更新检测</translation>
     </message>
     <message>
         <location filename="../src/widget.ui" line="1260"/>
@@ -471,54 +475,63 @@
     <message>
         <location filename="../src/widget.ui" line="912"/>
         <source>Request Update</source>
-        <translation type="unfinished">软件催更/应用反馈</translation>
+        <translation>软件催更/应用反馈</translation>
     </message>
     <message>
         <location filename="../src/widget.ui" line="1194"/>
         <source>Take effect when restart</source>
         <translation>重启商店后生效</translation>
     </message>
+    <message>
+        <location filename="../src/widget.ui" line="1223"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Check update for Spark Store. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>检查星火应用商店更新</translation>
+    </message>
     <message>
         <location filename="../src/widget.ui" line="1334"/>
         <source>0B</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="186"/>
+        <location filename="../src/widget.cpp" line="187"/>
         <source>Spark Store</source>
         <translation>Spark 应用商店</translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="187"/>
+        <location filename="../src/widget.cpp" line="188"/>
         <source>Search or enter spk://</source>
         <translation>搜索或打开链接</translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="193"/>
+        <location filename="../src/widget.cpp" line="194"/>
         <source>Submit App</source>
         <translation>投递应用</translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="194"/>
+        <location filename="../src/widget.cpp" line="195"/>
         <source>Settings</source>
         <translation>设置</translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="195"/>
-        <source>App Upgrade</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/widget.cpp" line="196"/>
+        <source>APP Upgrade and Install Settings</source>
+        <translation>应用更新和安装设置</translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="344"/>
+        <location filename="../src/widget.cpp" line="347"/>
         <source>Not Exist</source>
         <translation>不存在</translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="138"/>
-        <location filename="../src/widget.cpp" line="406"/>
-        <location filename="../src/widget.cpp" line="411"/>
-        <location filename="../src/widget.cpp" line="421"/>
-        <location filename="../src/widget.cpp" line="426"/>
+        <source>Update finished</source>
+        <translation type="obsolete">更新完毕</translation>
+    </message>
+    <message>
+        <location filename="../src/widget.cpp" line="139"/>
+        <location filename="../src/widget.cpp" line="409"/>
+        <location filename="../src/widget.cpp" line="414"/>
+        <location filename="../src/widget.cpp" line="424"/>
+        <location filename="../src/widget.cpp" line="429"/>
         <source>Spark\ Store</source>
         <translation>星火应用商店</translation>
     </message>
@@ -555,8 +568,8 @@
         <translation type="vanished">大小： </translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="656"/>
-        <location filename="../src/widget.cpp" line="895"/>
+        <location filename="../src/widget.cpp" line="659"/>
+        <location filename="../src/widget.cpp" line="899"/>
         <source>Reinstall</source>
         <translation>重新安装</translation>
     </message>
@@ -565,17 +578,17 @@
         <translation type="vanished">加载应用程序图标失败。</translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="622"/>
+        <location filename="../src/widget.cpp" line="625"/>
         <source>Failed to get the name to the file to be downloaded.</source>
         <translation>获取安装包文件名失败。</translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="706"/>
+        <location filename="../src/widget.cpp" line="710"/>
         <source>Relative apps Not Found!</source>
         <translation>相关应用未找到！</translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="715"/>
+        <location filename="../src/widget.cpp" line="719"/>
         <source>Request Error: %1</source>
         <translation>请求错误：%1</translation>
     </message>
@@ -584,24 +597,22 @@
         <translation type="vanished">目前仅支持商店专用链接的打开，搜索功能正在开发，请期待以后的版本！</translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="900"/>
+        <location filename="../src/widget.cpp" line="904"/>
         <source>Upgrade</source>
         <translation>升级</translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="1083"/>
+        <location filename="../src/widget.cpp" line="1091"/>
         <source>Updating, please wait...</source>
         <translation>正在更新，请稍候……</translation>
     </message>
     <message>
-        <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>
+        <translation type="vanished">更新中发生错误，请在终端使用apt update来查看错误原因。</translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="1151"/>
         <source>Unknown error!</source>
-        <translation>未知错误！</translation>
+        <translation type="vanished">未知错误！</translation>
     </message>
     <message>
         <source>Yes</source>
@@ -651,17 +662,17 @@ Click yes to continue.</source>
         <translation type="vanished">服务器未知错误</translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="1179"/>
+        <location filename="../src/widget.cpp" line="1123"/>
         <source>Uninstall succeeded</source>
         <translation>卸载成功</translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="1201"/>
+        <location filename="../src/widget.cpp" line="1145"/>
         <source>Temporary cache was cleaned</source>
         <translation>缓存目录已清空</translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="1283"/>
+        <location filename="../src/widget.cpp" line="1227"/>
         <source>The URL has been copied to the clipboard</source>
         <translation>链接已复制到剪贴板</translation>
     </message>
@@ -728,27 +739,24 @@ Click yes to continue.</source>
         <translation>深度软件包安装器</translation>
     </message>
     <message>
-        <location filename="../src/downloadlist.cpp" line="74"/>
         <source>Downloaded, waiting to install</source>
-        <translation>已完成，等待安装</translation>
+        <translation type="vanished">已完成，等待安装</translation>
     </message>
     <message>
-        <location filename="../src/downloadlist.cpp" line="100"/>
         <source>Failed to download %1</source>
-        <translation>下载 %1 失败</translation>
+        <translation type="vanished">下载 %1 失败</translation>
     </message>
     <message>
-        <location filename="../src/downloadlist.cpp" line="102"/>
         <source>Download Failed，Check Your Connection</source>
-        <translation>下载失败，请检查网络连接</translation>
+        <translation type="vanished">下载失败，请检查网络连接</translation>
     </message>
     <message>
-        <location filename="../src/downloadlist.cpp" line="114"/>
+        <location filename="../src/downloadlist.cpp" line="101"/>
         <source>Finished downloading %1, awaiting to install</source>
         <translation>%1 下载完成，等待安装</translation>
     </message>
     <message>
-        <location filename="../src/downloadlist.cpp" line="147"/>
+        <location filename="../src/downloadlist.cpp" line="134"/>
         <source>Installing</source>
         <translation>正在安装</translation>
     </message>
@@ -757,27 +765,32 @@ Click yes to continue.</source>
         <translation type="obsolete">正在安装</translation>
     </message>
     <message>
-        <location filename="../src/downloadlist.cpp" line="190"/>
+        <location filename="../src/downloadlist.cpp" line="74"/>
+        <source>Downloaded. Open APP Upgrade and Install Settings to enable password-free installation</source>
+        <translation>下载完成 可进入应用更新和安装设置来启动免密码安装</translation>
+    </message>
+    <message>
+        <location filename="../src/downloadlist.cpp" line="177"/>
         <source>Finish</source>
         <translation>完成</translation>
     </message>
     <message>
-        <location filename="../src/downloadlist.cpp" line="196"/>
+        <location filename="../src/downloadlist.cpp" line="183"/>
         <source>Retry</source>
         <translation>重试</translation>
     </message>
     <message>
-        <location filename="../src/downloadlist.cpp" line="197"/>
+        <location filename="../src/downloadlist.cpp" line="184"/>
         <source>Error happened in dpkg progress , you can try it again</source>
         <translation>dpkg出现错误，可重新安装</translation>
     </message>
     <message>
-        <location filename="../src/downloadlist.cpp" line="203"/>
+        <location filename="../src/downloadlist.cpp" line="190"/>
         <source>dpkg progress had been aborted，you can retry installation</source>
         <translation>安装被中止，可重新安装</translation>
     </message>
     <message>
-        <location filename="../src/downloadlist.cpp" line="225"/>
+        <location filename="../src/downloadlist.cpp" line="212"/>
         <source>Download canceled</source>
         <translation>下载已取消</translation>
     </message>