packages/ukui-search
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!5 Black list wont't work when block home location

Browse Source 
From: @tanyulong2021
Reviewed-by: @pei-jiankang
Signed-off-by: @pei-jiankang
This commit is contained in:
openeuler-ci-bot 2021-11-09 06:35:49 +00:00 committed by Gitee
commit ad632d0368
2 changed files with 42 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
0004-Black-list-wont-t-work-when-block-home-location.patch Normal file
View File

@ -0,0 +1,36 @@
From 5cd5f93db4c72b048ad7da484ee6237fabb4a023 Mon Sep 17 00:00:00 2001
From: tanyulong <tanyulong@kylinos.cn>
Date: Mon, 1 Nov 2021 14:12:50 +0800
Subject: [PATCH] Black list wont't work when block home location
---
libsearch/index/search-manager.cpp | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/libsearch/index/search-manager.cpp b/libsearch/index/search-manager.cpp
index c501594..5f1ea8a 100644
--- a/libsearch/index/search-manager.cpp
+++ b/libsearch/index/search-manager.cpp
@@ -398,6 +398,10 @@ DirectSearch::DirectSearch(QString keyword, QQueue<QString> *searchResultFile, Q
}
void DirectSearch::run() {
+ QStringList blockList = GlobalSettings::getInstance()->getBlockDirs();
+ if(blockList.contains(QStandardPaths::writableLocation(QStandardPaths::HomeLocation).remove(0,1), Qt::CaseSensitive)) {
+ return;
+ }
QQueue<QString> bfs;
bfs.enqueue(QStandardPaths::writableLocation(QStandardPaths::HomeLocation));
QFileInfoList list;
@@ -405,7 +409,7 @@ void DirectSearch::run() {
// QDir::Hidden
dir.setFilter(QDir::Dirs | QDir::Files | QDir::NoDotAndDotDot);
dir.setSorting(QDir::DirsFirst);
- QStringList blockList = GlobalSettings::getInstance()->getBlockDirs();
+ //QStringList blockList = GlobalSettings::getInstance()->getBlockDirs();
while(!bfs.empty()) {
dir.setPath(bfs.dequeue());
list = dir.entryInfoList();
--
2.30.0

7
ukui-search.spec
View File

@ -2,7 +2,7 @@
Name: ukui-search
Version: 0.4.1
Release: 4
Release: 5
Summary: Advanced ukui menu
License: GPL-3.0
URL: http://www.ukui.org
@ -11,6 +11,7 @@ Source0: %{name}-%{version}.tar.gz
Patch0: 0001-Update-changelog.patch
Patch1: 0002-fix-Index-crash-when-meet-encrypt-doc-files.patch
Patch2: 0003-File-name-is-obscured-when-it-s-too-long-in-detail-page.patch
Patch3: 0004-Black-list-wont-t-work-when-block-home-location.patch
BuildRequires: pkgconf
BuildRequires: gsettings-qt-devel
@ -88,6 +89,7 @@ permanent.
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
%build
mkdir build && cd build
@ -139,6 +141,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Mon Nov 1 2021 tanyulong <tanyulong@kylinos.cn> - 0.4.1-5
- fix Black list wont't work when block home location
* Mon Nov 1 2021 tanyulong <tanyulong@kylinos.cn> - 0.4.1-4
- fix File name is obscured when it's too long in detail page