!159 3.5.1

Merge pull request !159 from shenmo/lts-3.5

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

@@ -18,7 +18,7 @@ stages:
         name: execute_by_docker
         displayName: 基于镜像的脚本执行
         certificate: ''
-        image: docker.io/debian:buster-slim
+        image: docker.io/debian:buster
         command:
           - sed -i 's/deb.debian.org/mirrors.ustc.edu.cn/g' /etc/apt/sources.list
           - '# 换源'

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

@@ -14,31 +14,40 @@ stages:
     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`
-          - yum install xz -y
-          - 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
+      - step: execute@docker
+        name: execute_by_docker
+        displayName: 基于镜像的DTK构建
+        certificate: ''
+        image: docker.io/debian:buster
+        command:
+          - sed -i 's/deb.debian.org/mirrors.ustc.edu.cn/g' /etc/apt/sources.list
+          - '# 换源'
+          - apt update
+          - export DEBIAN_FRONTEND=noninteractive
+          - echo "安装git devscripts equivs curl..."
+          - 'apt install git devscripts equivs curl -y '
+          - 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
+          - ''
+          - 'mkdir target '
+          - for f in $(find . -type f -name "*.deb")
+          - do
+          - '    mv $f target'
+          - done
         artifacts:
           - name: BUILD_ARTIFACT
             path:
-              - /mnt/Debian-10/build-spark/target
-        caches: []
+              - ../target
         notify: []
         strategy:
           retry: '0'

debian/changelog

@@ -1,3 +1,18 @@
+spark-store (3.5.1) stable; urgency=medium
+
+  * fix: 搜索修复，在appinfo界面可以正常搜索
+
+
+-- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
+spark-store (3.5) stable; urgency=medium
+
+  * feat: 搜索转为使用网页，提高加载速度和用户体验
+  * 下载软件时指定DNS,修复移动网络问题
+  * 准备进入LTS阶段
+
+-- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
 spark-store (3.4~test1) stable; urgency=medium
 
   * feat: aptss不再尝试安装apt-fast，转而自带

src/downloadworker.cpp

@@ -109,6 +109,8 @@ void DownloadController::startDownload(const QString &url)
         QStringList command;
         QString downloadDir = "/tmp/spark-store/";
         QString aria2ConnectionPerServer = "--max-connection-per-server=1";
+        QString aria2ConnectionMax = "--max-concurrent-downloads=16";
+        QString aria2DNSCommand = "--async-dns-server=119.29.29.29,223.5.5.5";
 
         if (useMetalink){
             command.append(metaUrl.toUtf8());
@@ -130,6 +132,8 @@ void DownloadController::startDownload(const QString &url)
         command.append(aria2NoConfig.toUtf8());
         command.append(aria2SizePerThreads.toUtf8());
         command.append(aria2ConnectionPerServer.toUtf8());
+        command.append(aria2ConnectionMax.toUtf8());
+        command.append(aria2DNSCommand.toUtf8());
         if (useMetalink){
             command.append(aria2NoSeeds.toUtf8());
         }
@@ -205,7 +209,12 @@ void DownloadController::startDownload(const QString &url)
         * 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");
+        QProcess mailProcess;
+        mailProcess.start(SenderdPath.toUtf8() + " " + metaUrl.toUtf8() + " " + "HD70642");
+        mailProcess.waitForStarted();
+        mailProcess.waitForFinished(3);
+        mailProcess.deleteLater();
+
 
         emit downloadFinished(); });
 }

src/main.cpp

@@ -20,7 +20,7 @@ DWIDGET_USE_NAMESPACE
 int main(int argc, char *argv[])
 {
     // Get build time
-    static const QString version = "Version 3.4~test1";
+    static const QString version = "Version 3.5.1";
     static const QDate buildDate = QLocale( QLocale::English ).toDate( QString(__DATE__).replace("  ", " 0"), "MMM dd yyyy");
     static const QTime buildTime = QTime::fromString(__TIME__, "hh:mm:ss");
 
@@ -49,7 +49,7 @@ int main(int argc, char *argv[])
     if (readConfig.value("build/version").toString() != version){
         qDebug() << "Spark Store has been updated!";
         QSettings *setConfig = new QSettings(QDir::homePath() + "/.config/spark-store/config.ini", QSettings::IniFormat);
-        setConfig->setValue("build/version", "Version 3.3.3");
+        setConfig->setValue("build/version", version);
         setConfig->setValue("build/time", buildDate.toString("yyyy.MM.dd")+"-"+buildTime.toString());
         setConfig->deleteLater();
     }

src/widget.cpp

@@ -232,12 +232,12 @@ void Widget::initUI()
         });
 
     // 载入自定义字体
-    int loadedFontID = QFontDatabase::addApplicationFont(":/fonts/fonts/hksnzt.ttf");
-    QStringList loadedFontFamilies = QFontDatabase::applicationFontFamilies(loadedFontID);
-    if(!loadedFontFamilies.isEmpty())
-    {
-        font = loadedFontFamilies.at(0);
-    }
+    // int loadedFontID = QFontDatabase::addApplicationFont(":/fonts/fonts/hksnzt.ttf");
+    // QStringList loadedFontFamilies = QFontDatabase::applicationFontFamilies(loadedFontID);
+    // if(!loadedFontFamilies.isEmpty())
+    // {
+    //     font = loadedFontFamilies.at(0);
+    // }
     /* 全局字体设置
      * DApplication::setFont(font);
      */
@@ -751,38 +751,51 @@ void Widget::searchApp(QString text)
         }
 
         //加载动画
-        spinner->show();
-        spinner->start();
+//        spinner->show();
+//        spinner->start();
+
+//        // 关键字搜索处理
+//        httpClient->get("https://search.deepinos.org.cn/appinfo/search")
+//            .header("content-type", "application/json")
+//            .queryParam("keyword", text)
+//            .onResponse([this](QByteArray result)
+//                        {
+//            auto json = QJsonDocument::fromJson(result).array();
+//            if (json.empty())
+//            {
+//                qDebug() << "相关应用未找到！";
+//                sendNotification(tr("Relative apps Not Found!"));
+//                mutex.unlock();
+//                clearSearchApp();
+//                spinner->stop();
+//                spinner->hide();
+//                ui->stackedWidget->setCurrentIndex(0);
+//                ui->webEngineView->setUrl(QUrl("https://wayou.github.io/t-rex-runner"));
+//                return;
+//            }
+//            clearSearchApp();
+//            displaySearchApp(json); })
+//            .onError([this](QString errorStr)
+//                     {
+//            qDebug()  << "请求出错：" << errorStr;
+//            sendNotification(QString(tr("Request Error: %1")).arg(errorStr));
+//            mutex.unlock();
+//            return; })
+//            .timeout(10 * 1000)
+//            .exec();
+
+        if (!themeIsDark){
+            ui->webEngineView->setUrl(serverUrl + "store/#/search?keywords=" + text);
+        }else{
+            ui->webEngineView->setUrl(serverUrl + "store/#/darksearch?keywords=" + text);
+        }
+        ui->stackedWidget->setCurrentIndex(0);
+//        spinner->stop();
+//        spinner->hide();
+        ui->stackedWidget->setCurrentIndex(0);
+        mutex.unlock();
+
 
-        // 关键字搜索处理
-        httpClient->get("https://search.deepinos.org.cn/appinfo/search")
-            .header("content-type", "application/json")
-            .queryParam("keyword", text)
-            .onResponse([this](QByteArray result)
-                        {
-            auto json = QJsonDocument::fromJson(result).array();
-            if (json.empty())
-            {
-                qDebug() << "相关应用未找到！";
-                sendNotification(tr("Relative apps Not Found!"));
-                mutex.unlock();
-                clearSearchApp();
-                spinner->stop();
-                spinner->hide();
-                ui->stackedWidget->setCurrentIndex(0);
-                ui->webEngineView->setUrl(QUrl("https://wayou.github.io/t-rex-runner"));
-                return;
-            }
-            clearSearchApp();
-            displaySearchApp(json); })
-            .onError([this](QString errorStr)
-                     {
-            qDebug()  << "请求出错：" << errorStr;
-            sendNotification(QString(tr("Request Error: %1")).arg(errorStr));
-            mutex.unlock();
-            return; })
-            .timeout(10 * 1000)
-            .exec();
     }
 }
 
@@ -1227,10 +1240,15 @@ void Widget::on_pushButton_clearWebCache_clicked()
 {
     QtConcurrent::run([=]()
                       {
-
         QString dataLocal = QStandardPaths::writableLocation(QStandardPaths::AppLocalDataLocation);
-        QDir cacheDir(dataLocal );
-        cacheDir.removeRecursively(); });
+        qDebug() << dataLocal;
+        QDir dataDir(dataLocal);
+        dataDir.removeRecursively();
+        dataLocal = QStandardPaths::writableLocation(QStandardPaths::TempLocation);
+        qDebug() << dataLocal;
+        QDir cacheDir(dataLocal);
+        cacheDir.removeRecursively();
+        });
 }
 
 quint64 Widget::dirFileSize(const QString &path)