!124 fix： 安装时可能出现的超时错误

Merge pull request !124 from Pluto/dev

README.md

@@ -12,8 +12,10 @@ 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
 
 
+You can track our Issue resoving progress here  https://gitee.com/deepin-community-store/spark-store/board
 
-I hope people who see here can also join our team，development help or submit applications are welcomed
+
+We 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)
 

README.zh.md

@@ -10,6 +10,8 @@
 
 希望看到这里的人也可以加入我们的队伍，开发或者投递应用都很欢迎，共同构建Linux应用生态
 
+在这里追踪我们的Issue处理情况 https://gitee.com/deepin-community-store/spark-store/board
+
 如果有想要提交的软件包，请 [在这里投稿](https://upload.deepinos.org/index)
 
 
@@ -26,7 +28,7 @@
 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
+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 fakeroot
 
 ```
 

debian/changelog

@@ -1,3 +1,41 @@
+spark-store (3.2.4~test2) stable; urgency=medium
+
+  * 客户端集成投稿器入口和支持
+  * 修复：安装依赖时间较长时错误地返回“安装完毕”结果
+
+
+
+-- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
+spark-store (3.2.4~test1) stable; urgency=medium
+
+  * 客户端更新时不关闭免密码登录
+  * UOS合并正常aptss中
+
+
+-- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
+spark-store (3.2.3) stable; urgency=medium
+
+  * 客户端异常退出时仍然占用资源问题修复
+  * 降低dtk依赖版本，Debian 11 stable可直接安装
+
+-- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
+spark-store (3.2.2) stable; urgency=medium
+
+  * aptss will now refresh the system source before doing install,  policy....etc
+  * 启动客户端GPU加速支持
+
+-- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
+spark-store (3.2.1) stable; urgency=medium
+
+  * 更改刷新系统源的功能
+
+
+-- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
 spark-store (3.2) stable; urgency=medium
 
   * 新增 下载量统计功能

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

debian/spark-store.postinst

@@ -6,6 +6,11 @@ case "$1" in
         # 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

debian/spark-store.prerm

@@ -1,5 +1,6 @@
 #!/bin/sh
 
+if [ "$1" = "remove" ] || [ "$1" = "purge" ];then
 # Remove residual symbol links
 rm /usr/local/bin/spark-store
 rm /usr/local/bin/ssinstall
@@ -39,3 +40,8 @@ fi
 
 apt-key del '9D9A A859 F750 24B1 A1EC  E16E 0E41 D354 A29A 440C'
 
+else
+
+echo "非卸载操作，不进行配置清理"
+
+fi

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"

src/downloadlist.cpp

@@ -151,7 +151,7 @@ void downloadlist::install(int t)
 
             bool haveError = false;
             bool notRoot = false;
-            installer.waitForFinished();
+            installer.waitForFinished(-1); // 不设置超时
             out = installer.readAllStandardOutput();
 
             QStringList everyOut = out.split("\n");
@@ -169,7 +169,7 @@ void downloadlist::install(int t)
 
             QProcess isInstall;
             isInstall.start("dpkg -s " + pkgName);
-            isInstall.waitForFinished();
+            isInstall.waitForFinished(180); // 默认超时 3 分钟
             int error = QString::fromStdString(isInstall.readAllStandardError().toStdString()).length();
             if(error == 0)
             {

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-blocklist --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.2"));
+      dialog.setVersion(DApplication::buildVersion("Version 3.2.4"));
       dialog.setProductIcon(QIcon::fromTheme("spark-store"));  // 设置Logo
       dialog.setProductName(QLabel::tr("Spark Store"));
       dialog.setDescription(
@@ -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.2"));
+    a.setApplicationVersion(DApplication::buildVersion("3.2.4"));
     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>
@@ -192,6 +193,7 @@ void Widget::initUI()
 
     // 添加菜单项
     QAction *actionSubmission = new QAction(tr("Submit App"), this);
+    QAction *actionSubmissionWithClient = new QAction(tr("Submit App with client(Recommanded)"), this);
     QAction *setting = new QAction(tr("Settings"));
     QAction *upgrade = new QAction(tr("APP Upgrade and Install Settings"));
 
@@ -199,6 +201,7 @@ void Widget::initUI()
     menu->addAction(setting);
     menu->addAction(upgrade);
     menu->addAction(actionSubmission);
+    menu->addAction(actionSubmissionWithClient);
 
     titlebar->setMenu(menu);
 
@@ -206,6 +209,23 @@ void Widget::initUI()
     connect(setting, &QAction::triggered, this, &Widget::opensetting);
     connect(upgrade, &QAction::triggered, this, [=]{QProcess::startDetached("x-terminal-emulator -e /opt/durapps/spark-store/bin/update-upgrade/ss-update-controler.sh");});
 
+    // 投稿器
+    connect(actionSubmissionWithClient, &QAction::triggered, this, [=]
+        {
+            QString submitterSpk = "spk://store/tools/spark-store-submitter";
+            QFile actionSubmissionClientStatus("/opt/spark-store-submitter/bin/spark-store-submitter");
+            if (actionSubmissionClientStatus.exists())
+            {
+                qDebug() << "投稿器存在";
+                QProcess::startDetached("/opt/spark-store-submitter/bin/spark-store-submitter"); 
+            }
+            else{
+                qDebug() << "投稿器不存在，跳转页面";
+                openUrl(submitterSpk);
+            }
+                
+        });
+
     // 载入自定义字体
     int loadedFontID = QFontDatabase::addApplicationFont(":/fonts/fonts/hksnzt.ttf");
     QStringList loadedFontFamilies = QFontDatabase::applicationFontFamilies(loadedFontID);
@@ -572,14 +592,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] + "/";
             }
@@ -687,22 +707,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())
             {
@@ -711,20 +727,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信息
  */
@@ -1090,77 +1110,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()
@@ -1172,11 +1128,11 @@ void Widget::on_pushButton_uninstall_clicked()
 
         QProcess uninstall;
         uninstall.start("pkexec", QStringList() << "apt" << "purge" << "-y" << pkgName.toLower());
-        uninstall.waitForFinished();
+        uninstall.waitForFinished(-1); // 默认无限时长
 
         QProcess check;
         check.start("dpkg", QStringList() << "-s" << pkgName.toLower());
-        check.waitForFinished();
+        check.waitForFinished(180); // 默认超时 3 分钟
 
         if (check.readAllStandardOutput().isEmpty())
         {
@@ -1212,6 +1168,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);

src/widget.h

@@ -91,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();
@@ -127,6 +128,7 @@ private:
     void setfoot(int);
     void updatefoot();
     void updateUI();
+    void closeEvent(QCloseEvent *event);
 
     quint64 dirFileSize(const QString &path);
 

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

@@ -92,7 +92,7 @@ void SpkAppInfoLoaderThread::run()
         QProcess isInstall;
         packagename = json["Pkgname"].toString();
         isInstall.start("dpkg -s " + json["Pkgname"].toString());
-        isInstall.waitForFinished();
+        isInstall.waitForFinished(180); // 默认超时 3 分钟
         int error = QString::fromStdString(isInstall.readAllStandardError().toStdString()).length();
         if(error == 0)
         {
@@ -100,12 +100,12 @@ void SpkAppInfoLoaderThread::run()
 
             QProcess isUpdate;
             isUpdate.start("dpkg-query --showformat='${Version}' --show " + json["Pkgname"].toString());
-            isUpdate.waitForFinished();
+            isUpdate.waitForFinished(180); // 默认超时 3 分钟
             QString localVersion = isUpdate.readAllStandardOutput();
             localVersion.replace("'", "");
 
             isUpdate.start("dpkg --compare-versions " + localVersion + " ge " + json["Version"].toString());
-            isUpdate.waitForFinished();
+            isUpdate.waitForFinished(180); // 默认超时 3 分钟
             if(!isUpdate.exitCode())
             {
                 isUpdated = true;

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

@@ -14,6 +14,17 @@
 _APTMGR=apt
 
 
+####
+#
+# UOS sources auth config
+#
+#
+if grep -Eqi "UnionTech" /etc/issue || grep -Eq "UnionTech" /etc/*-release;then
+AUTH_UOS_USER="uos-https://license.chinauos.com-apt"
+AUTH_UOS_PASSWD="`cat /etc/apt/auth.conf.d/uos.conf  | grep home-packages.chinauos.com`"
+AUTH_UOS_PASSWD=`echo ${AUTH_UOS_PASSWD#*password }`
+
+fi
 # Enable DOWNLOADBEFORE to suppress apt-fast confirmation dialog and download
 # packages directly.
 #
@@ -54,7 +65,7 @@ DOWNLOADBEFORE=true
 #
 # 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/' )
+MIRRORS=( 'https://d.store.deepinos.org.cn/,https://mirrors.sdu.edu.cn/spark-store-repository/,http://cdn.dl.uniartisan.com:9000/deepinos/,https://d1.store.deepinos.org.cn/,https://d2.store.deepinos.org.cn/,https://d4.store.deepinos.org.cn/,https://d5.store.deepinos.org.cn/' )
 
 
 # Maximum number of connections
@@ -68,14 +79,10 @@ _MAXNUM=5
 # Maximum number of connections per server
 # Default: 10
 #
-_MAXCONPERSRV=10
+_MAXCONPERSRV=1
+
 
 
-# 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
@@ -93,6 +100,7 @@ _MINSPLITSZ=1M
 _PIECEALGO=default
 
 
+
 # Downloadmanager listfile
 # You can use this value in _DOWNLOADER command. Escape with ${}: ${DLLIST}
 #
@@ -118,7 +126,7 @@ DLLIST='/tmp/apt-fast.list'
 #
 # 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'
+_DOWNLOADER='aria2c --no-conf -c -j ${_MAXNUM} -x ${_MAXCONPERSRV}  --min-split-size=${_MINSPLITSZ}  --stream-piece-selector=${_PIECEALGO} -i ${DLLIST} --connect-timeout=600 --timeout=600 -m0 --http-user ${AUTH_UOS_USER} --http-passwd ${AUTH_UOS_PASSWD}'
 
 
 # Download temp folder for Downloadmanager

tool/aptss

@@ -1,11 +1,5 @@
 #/bin/bash
 
-
-
-
-
-if  [ "$1" = "install" ] || [ "$1" = "upgrade" ] || [ "$1" = "full-upgrade" ] || [ "$1" = "download" ] ; then
-
 if [ ! -e "/tmp/aptss-conf/apt-fast.conf" ];then
 ###刷新apt-fast配置
 mkdir -p /tmp/aptss-conf/
@@ -17,10 +11,35 @@ 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 开始安装"
-sudo aptss ssupdate && sudo bwrap --dev-bind / / --bind '/opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list' /etc/apt/sources.list.d/sparkstore.list apt install apt-fast -y
+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
 
 ###执行
@@ -30,6 +49,15 @@ bwrap --dev-bind / / \
                 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/

tool/ssinstall

@@ -40,8 +40,6 @@ fi
 
 ##################apt-fast/metalink测试
 DEPEND="这里一定会安装所以放弃处理"
-isuos=`cat /etc/os-release | grep UnionTech`
-
 
 ##############判断是否是root运行，如果是，则正常走；如果不是，则代输密码
 if [ "$(id -u)" != "0" ];then
@@ -54,18 +52,11 @@ echo "$upass" | sudo -S aptss ssupdate && echo "$upass" | sudo -S bwrap --dev-bi
 
 fi
 
-if [ "$DEPEND" != "" ]  && [ "$isuos" != "" ]; then
-echo "UOS中系统依赖无法使用第三方下载工具，放弃使用apt-fast"
-echo ----------------------------------------------------------------------------------
-echo "$upass" | sudo -S dpkg -i $1 || sudo aptss ssupdate && sudo bwrap --dev-bind / / --bind '/opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list' /etc/apt/sources.list.d/sparkstore.list apt install -yf
 
-
-fi
-
-if  [ "$DEPEND" != "" ]  && [ "$isuos" = "" ]; then
+if  [ "$DEPEND" != "" ]; then
 echo "检测到apt-fast，使用aptss进行多线程下载加速"
 echo ----------------------------------------------------------------------------------
-echo "$upass" | sudo -S dpkg -i $1 || sudo aptss ssupdate && sudo aptss install -yf 
+echo "$upass" | sudo -S dpkg -i $1 || sudo aptss install -yf 
 fi
 
 
@@ -81,16 +72,11 @@ echo "未安装依赖：apt-fast 开始安装"
 aptss ssupdate && bwrap --dev-bind / / --bind '/opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list' /etc/apt/sources.list.d/sparkstore.list apt install apt-fast -y 
 fi
 
-if [ "$DEPEND" != "" ]  && [ "$isuos" != "" ]; then
-echo "UOS中系统依赖无法使用第三方下载工具，放弃使用apt-fast"
-echo ----------------------------------------------------------------------------------
-dpkg -i $1 || aptss ssupdate && sudo bwrap --dev-bind / / --bind '/opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list' /etc/apt/sources.list.d/sparkstore.list apt install -yf
-fi
 
-if  [ "$DEPEND" != "" ]  && [ "$isuos" = "" ]; then
+if  [ "$DEPEND" != "" ]; then
 echo "检测到apt-fast，使用aptss进行多线程下载加速"
 echo ----------------------------------------------------------------------------------
-dpkg -i $1 || aptss ssupdate && aptss install -yf 
+dpkg -i $1 || aptss install -yf 
 fi
 
 

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

@@ -8,33 +8,6 @@ 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 正在更新..."
@@ -47,6 +20,5 @@ else ###这是确定是否为UOS,如果不是
   done
 
 
-fi ###这是确定是否为UOS
 
 fi  ###这是确定是否同意

translations/spark-store_en.ts

@@ -150,7 +150,7 @@
     <message>
         <location filename="../src/widget.ui" line="547"/>
         <location filename="../src/widget.cpp" line="910"/>
-        <location filename="../src/widget.cpp" line="1183"/>
+        <location filename="../src/widget.cpp" line="1119"/>
         <source>Install</source>
         <translation type="unfinished"></translation>
     </message>
@@ -347,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>
@@ -359,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>
@@ -427,6 +422,11 @@
         <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>
@@ -493,17 +493,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="1152"/>
-        <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="1159"/>
-        <source>Unknown error!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/widget.cpp" line="1187"/>
+        <location filename="../src/widget.cpp" line="1123"/>
         <source>Uninstall succeeded</source>
         <translation type="unfinished"></translation>
     </message>
@@ -518,12 +508,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="1209"/>
+        <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="1291"/>
+        <location filename="../src/widget.cpp" line="1227"/>
         <source>The URL has been copied to the clipboard</source>
         <translation type="unfinished"></translation>
     </message>

translations/spark-store_fr.ts

@@ -211,7 +211,7 @@ Nous sommes nés pour le changement.</translation>
     <message>
         <location filename="../src/widget.ui" line="547"/>
         <location filename="../src/widget.cpp" line="910"/>
-        <location filename="../src/widget.cpp" line="1183"/>
+        <location filename="../src/widget.cpp" line="1119"/>
         <source>Install</source>
         <translation type="unfinished"></translation>
     </message>
@@ -370,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>
@@ -380,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>
@@ -557,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>
@@ -676,27 +676,17 @@ Nous sommes nés pour le changement.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="1152"/>
-        <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="1159"/>
-        <source>Unknown error!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/widget.cpp" line="1187"/>
+        <location filename="../src/widget.cpp" line="1123"/>
         <source>Uninstall succeeded</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="1209"/>
+        <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="1291"/>
+        <location filename="../src/widget.cpp" line="1227"/>
         <source>The URL has been copied to the clipboard</source>
         <translation type="unfinished"></translation>
     </message>

translations/spark-store_zh_CN.ts

@@ -205,7 +205,7 @@
     <message>
         <location filename="../src/widget.ui" line="547"/>
         <location filename="../src/widget.cpp" line="910"/>
-        <location filename="../src/widget.cpp" line="1183"/>
+        <location filename="../src/widget.cpp" line="1119"/>
         <source>Install</source>
         <translation>安装</translation>
     </message>
@@ -379,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"/>
@@ -476,13 +475,18 @@
     <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>
@@ -518,6 +522,10 @@
         <source>Not Exist</source>
         <translation>不存在</translation>
     </message>
+    <message>
+        <source>Update finished</source>
+        <translation type="obsolete">更新完毕</translation>
+    </message>
     <message>
         <location filename="../src/widget.cpp" line="139"/>
         <location filename="../src/widget.cpp" line="409"/>
@@ -599,14 +607,12 @@
         <translation>正在更新，请稍候……</translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="1152"/>
         <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="1159"/>
         <source>Unknown error!</source>
-        <translation>未知错误！</translation>
+        <translation type="vanished">未知错误！</translation>
     </message>
     <message>
         <source>Yes</source>
@@ -656,17 +662,17 @@ Click yes to continue.</source>
         <translation type="vanished">服务器未知错误</translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="1187"/>
+        <location filename="../src/widget.cpp" line="1123"/>
         <source>Uninstall succeeded</source>
         <translation>卸载成功</translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="1209"/>
+        <location filename="../src/widget.cpp" line="1145"/>
         <source>Temporary cache was cleaned</source>
         <translation>缓存目录已清空</translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="1291"/>
+        <location filename="../src/widget.cpp" line="1227"/>
         <source>The URL has been copied to the clipboard</source>
         <translation>链接已复制到剪贴板</translation>
     </message>