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

!17 sync master to openEuler-22.03-LTS-Next

Browse Source 
From: @peijiankang 
Reviewed-by: @dou33 
Signed-off-by: @dou33
This commit is contained in:
openeuler-ci-bot 2022-06-22 06:52:55 +00:00 committed by Gitee
commit 3aff024466
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
13 changed files with 78 additions and 311 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
0001-Update-changelog.patch
View File

@ -1,27 +0,0 @@
From df1939d0ae618ab22e11a5f161c3df63e51fdc60 Mon Sep 17 00:00:00 2001
From: tanyulong <tanyulong@kylinos.cn>
Date: Wed, 27 Oct 2021 18:27:25 +0800
Subject: [PATCH] Update changelog
---
debian/changelog | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 9c45c7e..2ed311f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ukui-search (0.5.1+0926) v101; urgency=medium
+
+ * Bug 78787
+ * 任务号:无
+ * 其他改动：无
+
+ -- zhangpengfei <zhangpengfei@kylinos.cn> Sun, 26 Sep 2021 13:37:10 +0800
ukui-search (0.4.1-1~0803) unstable; urgency=medium
* Initial release.
--
2.30.0

33
0001-fix-compile-error-of-ukui-search.patch Normal file
View File

@ -0,0 +1,33 @@
From 53bb749a41bfb68fec3772aa6f7f7f7da9486c17 Mon Sep 17 00:00:00 2001
From: peijiankang <peijiankang@kylinos.cn>
Date: Tue, 21 Jun 2022 14:57:30 +0800
Subject: [PATCH] fix compile error of ukui-search
---
libsearch/file-utils.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/libsearch/file-utils.h b/libsearch/file-utils.h
index 6e8a617..43547ee 100644
--- a/libsearch/file-utils.h
+++ b/libsearch/file-utils.h
@@ -39,14 +39,14 @@
#include <QFontMetrics>
#include <QLabel>
-#include <quazip/quazipfile.h>
+#include <quazip5/quazipfile.h>
#include <stdio.h>
#include <unistd.h>
#include <stdlib.h>
#include <string.h>
#include <sys/stat.h>
#include <fcntl.h>
-#include <quazip/quazip.h>
+#include <quazip5/quazip.h>
#include <uchardet/uchardet.h>
//#include <poppler-qt5.h>
#include <poppler/qt5/poppler-qt5.h>
--
2.33.0

37
0002-fix-Index-crash-when-meet-encrypt-doc-files.patch
View File

@ -1,37 +0,0 @@
From b537d67f758a349b26afb15c1fba4aaa472a2186 Mon Sep 17 00:00:00 2001
From: tanyulong <tanyulong@kylinos.cn>
Date: Fri, 29 Oct 2021 14:44:36 +0800
Subject: [PATCH] fix Index crash when meet encrypt doc files
---
libsearch/parser/binary-parser.cpp | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/libsearch/parser/binary-parser.cpp b/libsearch/parser/binary-parser.cpp
index 59e9ef4..e45ca67 100644
--- a/libsearch/parser/binary-parser.cpp
+++ b/libsearch/parser/binary-parser.cpp
@@ -4874,6 +4874,7 @@ bool KBinaryParser::read8DocText(FILE *pFile, const ppsInfoType *pPPS,
const ULONG *aulBlockDepot;
ULONG ulTextOffset, ulBeginTextInfo;
ULONG ulTotLength, ulLen;
+ ULONG ulEncryptInfo;
long lIndex, lPieces, lOff;
size_t tTextInfoLen, tBlockDepotLen, tBlockSize;
int iType, iLen;
@@ -4883,6 +4884,12 @@ bool KBinaryParser::read8DocText(FILE *pFile, const ppsInfoType *pPPS,
ulBeginTextInfo = ulGetLong(0x1a2, aucHeader); /* fcClx */
tTextInfoLen = (size_t)ulGetLong(0x1a6, aucHeader); /* lcbClx */
+ ulEncryptInfo = ulGetLong(0x0a, aucHeader);
+ if(ulEncryptInfo & 0x0100) {
+ qDebug() << "Encrypt file:" << m_strFileName << (size_t)ulEncryptInfo;
+ return false;
+ }
+
if(pPPS->tTable.ulSize == 0)
return false;
--
2.30.0

34
0003-File-name-is-obscured-when-it-s-too-long-in-detail-page.patch
View File

@ -1,34 +0,0 @@
From c3f9d1a9197f25df90267917cc45f3224f5f0721 Mon Sep 17 00:00:00 2001
From: tanyulong <tanyulong@kylinos.cn>
Date: Mon, 1 Nov 2021 14:01:30 +0800
Subject: [PATCH] File name is obscured when it's too long in detail page
---
src/control/search-detail-view.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/control/search-detail-view.cpp b/src/control/search-detail-view.cpp
index 8865e81..f791188 100644
--- a/src/control/search-detail-view.cpp
+++ b/src/control/search-detail-view.cpp
@@ -216,7 +216,7 @@ void SearchDetailView::setAppWidget(const QString &appname, const QString &path,
m_optionView->show();
QFontMetrics fontMetrics = m_nameLabel->fontMetrics();
- QString showname = fontMetrics.elidedText(m_name, Qt::ElideRight, 274); //当字体长度超过215时显示为省略号
+ QString showname = fontMetrics.elidedText(m_name, Qt::ElideRight, 200); //当字体长度超过200时显示为省略号
// m_nameLabel->setText(showname);
m_nameLabel->setText(QString("<h3 style=\"font-weight:normal;\">%1</h3>").arg(escapeHtml(showname)));
if(QString::compare(showname, m_name)) {
@@ -351,7 +351,7 @@ void SearchDetailView::setupWidget(const int& type, const QString& path) {
setIcon(path);
QFontMetrics fontMetrics = m_nameLabel->fontMetrics();
QString wholeName = FileUtils::getFileName(path);
- QString name = fontMetrics.elidedText(wholeName, Qt::ElideRight, 274);
+ QString name = fontMetrics.elidedText(wholeName, Qt::ElideRight, 200);
// m_nameLabel->setText(name);
m_nameLabel->setText(QString("<h3 style=\"font-weight:normal;\">%1</h3>").arg(escapeHtml(name)));
if(QString::compare(name, wholeName)) {
--
2.30.0

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

@ -1,36 +0,0 @@
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

47
0005-Update-changelog-for-easy-view.patch
View File

@ -1,47 +0,0 @@
From bd1da6d672e547cf407a0846da6e9d49e603f774 Mon Sep 17 00:00:00 2001
From: tanyulong <tanyulong@kylinos.cn>
Date: Thu, 11 Nov 2021 16:21:15 +0800
Subject: [PATCH] Update changelog
---
debian/changelog | 27 +++++++++++++++++++++++++++
1 file changed, 27 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 2ed311f..79445c9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,30 @@
+ukui-search (0.1.0+0207) v101; urgency=medium
+
+ * Fix: Index error when there are too much files in user directory.
+ - 当用户目录下的文件太多时，新建的文件有可能不会被索引到。
+ * Fix: 38072 browser+S4休眠500次过程中出现提示空间不足。
+ * Fix: Index error when copied a folder which has many children folders.
+ -当复制一个含有多层子文件夹的文件夹时，文件夹中的文件有可能不会被正确的建立索引。
+ * Fix: Index delete error when files were delete from disk.
+ - 文件删除时，数据库删除操作失败。
+ * Update debian/contorl,add dependence.
+ - 在debian/contorl中增加运行依赖。
+ * Fix: Window title is not translated.
+ - 修复任务栏窗口标题未汉化的Bug(36548)
+ * Fix: Modify applications list opened quickly.
+ - 修改快速打开列表项(35708、35311)
+ * Fix: QFileDialog is incompletely translated.
+ - 修复文件选择弹窗汉化不完整的bug(35800)
+ * Fix: There is no tooltip when filename is too long to display.
+ - 修复文件名过长时，文件详情页文件名悬停不完整显示的问题(37934)
+ * Fix: Translations for warning dialog is incomplete.
+ - 修复警示弹窗翻译为完成的bug(38130)
+ * Fix: Button for question dialog is in English.
+ - 修复删除黑名单询问弹窗按钮未汉化的Bug(38128)
+ * Fix: Detail widget for best content result is incorrect.
+ - 修复最佳匹配里的文件内容项显示有误的问题(35563、35971)
+
+ -- zhangpengfei <zhangpengfei@kylinos.cn> Sun, 07 Feb 2021 10:28:35 +0800
ukui-search (0.5.1+0926) v101; urgency=medium
* Bug 78787
--
2.30.0

28
0006-update-debian-changelog.patch
View File

@ -1,28 +0,0 @@
From 182bfe6bd32ca098008ca50f09bedf61fe3ef558 Mon Sep 17 00:00:00 2001
From: tanyulong <tanyulong@kylinos.cn>
Date: Thu, 2 Dec 2021 10:13:42 +0800
Subject: [PATCH] update debian changelog
---
debian/changelog | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 79445c9..7f1185a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -37,3 +37,11 @@ ukui-search (0.4.1-1~0803) unstable; urgency=medium
* Initial release.
-- handsome_feng <jianfengli@ubuntukylin.com> Thu, 05 Aug 2021 15:58:06 +0800
+ukui-search (0.1.1+0219-1) v101; urgency=medium
+
+ * Remove QWebEngineView dependence.
+ * Remove friso dependence.
+ * Update debian/control.
+
+ -- zhangpengfei <zhangpengfei@kylinos.cn> Fri, 19 Feb 2021 11:37:16 +0800
+
--
2.30.0

24
0007-Update-app-match.cpp-info.patch
View File

@ -1,24 +0,0 @@
From 3118f367f10657c2c9e2da3df17668565810432f Mon Sep 17 00:00:00 2001
From: tanyulong <tanyulong@kylinos.cn>
Date: Fri, 3 Dec 2021 09:49:54 +0800
Subject: [PATCH] Update app-match.cpp info
---
libsearch/appsearch/app-match.cpp | 1 +
1 file changed, 1 insertion(+)
diff --git a/libsearch/appsearch/app-match.cpp b/libsearch/appsearch/app-match.cpp
index 8ad8d31..d7d9fd4 100644
--- a/libsearch/appsearch/app-match.cpp
+++ b/libsearch/appsearch/app-match.cpp
@@ -34,6 +34,7 @@ AppMatch::AppMatch(QObject *parent) : QThread(parent)
{
m_watchAppDir = new QFileSystemWatcher(this);
m_watchAppDir->addPath("/usr/share/applications/");
+ //This part is not right?
QDir androidPath(QDir::homePath() + "/.local/share/applications/");
if(androidPath.exists()) {
m_watchAppDir->addPath(QDir::homePath() + "/.local/share/applications/");
--
2.30.0

24
0008-Modified-fifo-path.patch
View File

@ -1,24 +0,0 @@
From 73e94f5b926d1395cf058ad5e16e5a701f538b7e Mon Sep 17 00:00:00 2001
From: tanyulong <tanyulong@kylinos.cn>
Date: Tue, 7 Dec 2021 15:06:16 +0800
Subject: [PATCH] Modified fifo path
---
libsearch/file-utils.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/libsearch/file-utils.h b/libsearch/file-utils.h
index c47f225..5ae32e7 100644
--- a/libsearch/file-utils.h
+++ b/libsearch/file-utils.h
@@ -55,6 +55,7 @@
//#define CREATING_INDEX 1
//#define FINISH_CREATING_INDEX 2
#define MAX_CONTENT_LENGTH 20480000
+#define UKUI_SEARCH_PIPE_PATH (QDir::homePath()+"/.config/org.ukui/ukui-search/ukuisearch").toLocal8Bit().constData()
namespace Zeeker {
class LIBSEARCH_EXPORT FileUtils {
--
2.30.0

BIN
ukui-search-0.4.1.tar.gz
View File

Binary file not shown.

BIN
ukui-search-0.4.2.tar.xz Normal file
View File

Binary file not shown.

95
ukui-search.spec
View File

@ -1,21 +1,13 @@
%define debug_package %{nil}
Name: ukui-search
Version: 0.4.1
Release: 10
Version: 0.4.2
Release: 3
Summary: Advanced ukui menu
License: GPL-3.0
License: GPL-2.0-or-later and GPL-3.0-or-later and Apache-2.0
URL: http://www.ukui.org
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
Patch4: 0005-Update-changelog-for-easy-view.patch
Patch5: 0006-update-debian-changelog.patch
Patch6: 0007-Update-app-match.cpp-info.patch
Patch7: 0008-Modified-fifo-path.patch
Source0: %{name}-%{version}.tar.xz
Patch01: 0001-fix-compile-error-of-ukui-search.patch
BuildRequires: pkgconf
BuildRequires: gsettings-qt-devel
@ -24,7 +16,7 @@ BuildRequires: qtchooser
BuildRequires: qt5-qtscript-devel
BuildRequires: qt5-qttools-devel
BuildRequires: xapian-core-devel
BuildRequires: quazip-qt5-devel
BuildRequires: quazip-qt5-devel quazip-qt5
BuildRequires: glib2-devel
BuildRequires: kf5-kwindowsystem-devel
BuildRequires: qt5-qtx11extras-devel
@ -32,13 +24,11 @@ BuildRequires: uchardet-devel
BuildRequires: poppler-qt5-devel
BuildRequires: ukui-interface
Requires: libukui-search0 ukui-search-systemdbus quazip-qt5
%description
Portable, efficient middle-ware for different kinds of mail access
%package -n libchinese-segmentation0
Summary: libs
License: LGPLv2+
@ -49,8 +39,6 @@ Provides: libchinese-segmentation
.This package contains a few runtime libraries needed by
libsearch.
%package -n libchinese-segmentation-dev
Summary: libs
License: LGPLv2+
@ -61,26 +49,23 @@ Provides: libchinese-segmentation
.This package contains a few runtime libraries needed by
libsearch.
%package -n libukui-search0
Summary: libs
License: LGPLv2+
Provides: libukui-search
Requires: libchinese-segmentation0 ukui-search-systemdbus
%description -n libukui-search0
Libraries for ukui-search
%package -n libukui-search-dev
Summary: libdevel
License: LGPLv2+
Requires: libukui-search0 libchinese-segmentation0 ukui-search-systemdbus
%description -n libukui-search-dev
Libraries for ukui-search(development files).
%package -n ukui-search-systemdbus
Summary: libdevel
License: LGPLv2+
@ -91,14 +76,7 @@ permanent.
%prep
%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
%patch7 -p1
%patch01 -p1
%build
mkdir build && cd build
@ -110,46 +88,55 @@ rm -rf $RPM_BUILD_ROOT
cd %{_builddir}/%{name}-%{version}/build
make INSTALL_ROOT=%{buildroot} install
mkdir -p %{buildroot}/usr/share/ukui-search/translations
cp -r %{_builddir}/%{name}-%{version}/build/src/.qm/*.qm %{buildroot}/usr/share/ukui-search/translations/
%clean
rm -rf $RPM_BUILD_ROOT
%files
/usr/share/applications/ukui-search-menu.desktop
/etc/xdg/autostart/ukui-search.desktop
/usr/bin/ukui-search
/usr/include/ukui-search/*.h
/usr/share/glib-2.0/schemas/org.ukui.log4qt.ukui-search.gschema.xml
/usr/share/glib-2.0/schemas/org.ukui.search.data.gschema.xml
%{_bindir}/ukui-search
%{_sysconfdir}/xdg/autostart/*.desktop
%{_datadir}/applications/*.desktop
%{_datadir}/ukui-search/translations/*.qm
%{_datadir}/glib-2.0/schemas/*.xml
%{_includedir}/ukui-search/*.h
%files -n libchinese-segmentation0
/usr/lib64/libchinese-segmentation.so.*
/usr/share/ukui-search/res/dict/*.utf8
%{_libdir}/libchinese-segmentation.so.*
%{_datadir}/ukui-search/res/dict/*.utf8
%files -n libchinese-segmentation-dev
/usr/include/chinese-seg/*
/usr/lib64/libchinese-segmentation.so
%{_includedir}/chinese-seg/*
%{_libdir}/libchinese-segmentation.so
%files -n libukui-search0
/usr/lib64/libukui-search.so.*
%{_libdir}/libukui-search.so.*
%files -n libukui-search-dev
/usr/include/ukui-search/*
/usr/lib64/libukui-search.so
%{_includedir}/ukui-search/*
%{_libdir}/libukui-search.so
%files -n ukui-search-systemdbus
/usr/share/dbus-1/system-services/com.ukui.search.qt.systemdbus.service
/etc/dbus-1/system.d/com.ukui.search.qt.systemdbus.conf
/usr/bin/ukui-search-systemdbus
%{_datadir}/dbus-1/system-services/com.ukui.search.qt.systemdbus.service
%{_sysconfdir}/dbus-1/system.d/com.ukui.search.qt.systemdbus.conf
%{_bindir}/ukui-search-systemdbus
%changelog
* Wed Jun 22 2022 peijiankang <peijiankang@kylinos.cn> - 0.4.2-3
- fix install error
* Tue Jun 21 2022 peijiankang <peijiankang@kylinos.cn> - 0.4.2-2
- add translation files
* Tue Jun 21 2022 peijiankang <peijiankang@kylinos.cn> - 0.4.2-1
- update version to 0.4.2
* Mon May 23 2022 tanyulong <tanyulong@kylinos.cn> - 0.4.1-11
- Improve the project according to the requirements of compliance improvement
* Mon May 09 2022 pei-jiankang <peijiankang@kylinos.cn> - 0.4.1-10
- add ukui-interface BuildRequires

4
ukui-search.yaml Normal file
View File

@ -0,0 +1,4 @@
version_control: github
src_repo: https://github.com/ukui/ukui-search.git
tag_prefix: "v"
separator: "."