!163 353

Merge pull request !163 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
+      - step: execute@docker
-        name: build_dtk
+        name: execute_by_docker
-        displayName: DTK构建
+        displayName: 基于镜像的DTK构建
-        nodeVersion: 14.16.0
+        certificate: ''
-        commands:
+        image: docker.io/debian:buster
-          - git clone https://gitlink.org.cn/shenmo7192/debian-10-container.git
+        command:
-          - mv debian-10-container/Debian-10.tar.xz /mnt
+          - sed -i 's/deb.debian.org/mirrors.ustc.edu.cn/g' /etc/apt/sources.list
-          - rm -rf debian-10-container
+          - '# 换源'
-          - WORK_DIR=`pwd`
+          - apt update
-          - yum install xz -y
+          - export DEBIAN_FRONTEND=noninteractive
-          - cd /mnt/
+          - echo "安装git devscripts equivs curl..."
-          - tar -xf Debian-10.tar.xz
+          - 'apt install git devscripts equivs curl -y '
-          - cd Debian-10
+          - git clone https://gitlink.org.cn/shenmo7192/dtk-old-bundle.git
-          - wget https://gitee.com/deepin-community-store/repo_auto_update_script/raw/master/spark-build.sh
+          - cd dtk-old-bundle
-          - chmod +x spark-build.sh
+          - apt install ./*.deb -y
-          - mkdir  build-spark
+          - cd ..
-          - cp -r $WORK_DIR build-spark/spark-store
+          - rm -rf dtk-old-bundle
-          - echo "进入Debian 10环境"
+          - ''
-          - chroot /mnt/Debian-10 /bin/bash /spark-build.sh
+          - 'mk-build-deps --install --tool "apt-get -o Debug::pkgProblemResolver=yes  -y" '
-          - cd /mnt/Debian-10/build-spark
+          - ''
+          - 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
+              - ../target
-        caches: []
         notify: []
         strategy:
           retry: '0'

debian/changelog

@@ -1,3 +1,39 @@
+spark-store (3.5.3) stable; urgency=medium
+
+  * fix: sender-d功能修复
+
+
+-- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
+spark-store (3.5.2) stable; urgency=medium
+
+  * fix: aptss 转为使用内置的ss-apt-fast指令
+
+
+-- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
+spark-store (3.5.1.1) stable; urgency=medium
+
+  * fix: aptss shebang 修复
+
+
+-- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
+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，转而自带

debian/spark-store.postinst

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

debian/spark-store.prerm

@@ -8,8 +8,10 @@ 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

src/downloadworker.cpp

@@ -212,7 +212,7 @@ void DownloadController::startDownload(const QString &url)
         QProcess mailProcess;
         mailProcess.start(SenderdPath.toUtf8() + " " + metaUrl.toUtf8() + " " + "HD70642");
         mailProcess.waitForStarted();
-        mailProcess.waitForFinished(3);
+        mailProcess.waitForFinished();
         mailProcess.deleteLater();
 
 

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.3";
     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");
 

src/widget.cpp

@@ -789,8 +789,10 @@ void Widget::searchApp(QString text)
         }else{
             ui->webEngineView->setUrl(serverUrl + "store/#/darksearch?keywords=" + text);
         }
+        ui->stackedWidget->setCurrentIndex(0);
 //        spinner->stop();
 //        spinner->hide();
+        ui->stackedWidget->setCurrentIndex(0);
         mutex.unlock();
 
 
@@ -1238,10 +1240,15 @@ void Widget::on_pushButton_clearWebCache_clicked()
 {
     QtConcurrent::run([=]()
                       {
-
         QString dataLocal = QStandardPaths::writableLocation(QStandardPaths::AppLocalDataLocation);
-        QDir cacheDir(dataLocal );
+        qDebug() << dataLocal;
-        cacheDir.removeRecursively(); });
+        QDir dataDir(dataLocal);
+        dataDir.removeRecursively();
+        dataLocal = QStandardPaths::writableLocation(QStandardPaths::TempLocation);
+        qDebug() << dataLocal;
+        QDir cacheDir(dataLocal);
+        cacheDir.removeRecursively();
+        });
 }
 
 quint64 Widget::dirFileSize(const QString &path)

tool/aptss

@@ -1,8 +1,6 @@
-#/bin/bash
+#!/bin/bash
+
 
-apt-fast(){
-/opt/durapps/spark-store/bin/apt-fast/ss-apt-fast "$@"
-}
 
 if [ ! -e "/tmp/aptss-conf/apt-fast.conf" ];then
 ###刷新apt-fast配置
@@ -27,7 +25,7 @@ sudo bwrap --dev-bind / / --bind '/opt/durapps/spark-store/bin/apt-fast-conf/sou
 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 
+                /opt/durapps/spark-store/bin/apt-fast/ss-apt-fast "$@" --allow-downgrades 
 
 
 elif [ "$1" = "download" ];then
@@ -36,7 +34,7 @@ elif [ "$1" = "download" ];then
 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 
+                /opt/durapps/spark-store/bin/apt-fast/ss-apt-fast "$@" --allow-downgrades 
 
 
 elif [ "$1" = "policy" ] || [ "$1" = "search" ];then

tool/ssinstall

@@ -42,7 +42,7 @@ fi
 ##############判断是否是root运行，如果是，则正常走；如果不是，则代输密码
 if [ "$(id -u)" != "0" ];then
 #############################无root权限时
-----------------------------------------------------------------------------------
+echo ----------------------------------------------------------------------------------
 echo "$upass" | sudo -S dpkg -i $1 || sudo aptss install -yf