修复搜索的一些细节

Merge pull request  from Pluto/lts-3.5
This commit is contained in:
shenmo 2022-12-09 05:09:18 +00:00 committed by Gitee
commit 9fc5153f37
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
3 changed files with 41 additions and 26 deletions

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

@ -14,31 +14,40 @@ stages:
trigger: auto trigger: auto
executor: [] executor: []
steps: 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: artifacts:
- name: BUILD_ARTIFACT - name: BUILD_ARTIFACT
path: path:
- /mnt/Debian-10/build-spark/target - ../target
caches: []
notify: [] notify: []
strategy: strategy:
retry: '0' retry: '0'

@ -791,6 +791,7 @@ void Widget::searchApp(QString text)
} }
// spinner->stop(); // spinner->stop();
// spinner->hide(); // spinner->hide();
ui->stackedWidget->setCurrentIndex(0);
mutex.unlock(); mutex.unlock();
@ -1238,10 +1239,15 @@ void Widget::on_pushButton_clearWebCache_clicked()
{ {
QtConcurrent::run([=]() QtConcurrent::run([=]()
{ {
QString dataLocal = QStandardPaths::writableLocation(QStandardPaths::AppLocalDataLocation); 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) quint64 Widget::dirFileSize(const QString &path)