Merge from dev-unity

libsearch/appsearch/app-match.cpp

@@ -297,14 +297,14 @@ void AppMatch::appNameMatch(QMap<NameString, QStringList> &installed) {
             QString shouzimu = pinyinlist.at(2 * i + 1); // 中文转首字母
             if(shouzimu.contains(m_sourceText, Qt::CaseInsensitive)) {
                 installed.insert(name, list);
-                continue;
+                break;
             }
             if(m_sourceText.size() < 2)
-                continue;
+                break;
             QString pinyin = pinyinlist.at(2 * i); // 中文转拼音
             if(pinyin.contains(m_sourceText, Qt::CaseInsensitive)) {
                 installed.insert(name, list);
-                continue;
+                break;
             }
         }
     }

libsearch/index/inotify-watch.cpp

@@ -133,9 +133,17 @@ void InotifyWatch::run()
     if (m_inotifyFd > 0) {
         qDebug()<<"Inotify init success!";
     } else {
-        printf("errno=%d\n",errno);
-        printf("Mesg:%s\n",strerror(errno));
-        Q_ASSERT_X(0, "InotifyWatch", "Failed to initialize inotify");
+        qWarning() << "Inotify init fail! Now try add inotify_user_instances.";
+        UkuiSearchQDBus usQDBus;
+        usQDBus.addInotifyUserInstances(128);
+        m_inotifyFd = inotify_init();
+        if (m_inotifyFd > 0) {
+            qDebug()<<"Inotify init success!";
+        } else {
+            printf("errno=%d\n",errno);
+            printf("Mesg:%s\n",strerror(errno));
+            Q_ASSERT_X(0, "InotifyWatch", "Failed to initialize inotify");
+        }
     }
 
     this->addWatch(QStandardPaths::writableLocation(QStandardPaths::HomeLocation));

libsearch/index/ukui-search-qdbus.cpp

@@ -42,5 +42,15 @@ void UkuiSearchQDBus::setInotifyMaxUserWatches() {
     // sysctl
     this->tmpSystemQDBusInterface->call("setInotifyMaxUserWatchesStep2");
     // /etc/sysctl.conf
-//    this->tmpSystemQDBusInterface->call("setInotifyMaxUserWatchesStep3");
+    //    this->tmpSystemQDBusInterface->call("setInotifyMaxUserWatchesStep3");
+}
+
+int UkuiSearchQDBus::addInotifyUserInstances(int addNum)
+{
+    QDBusReply<int> reply = tmpSystemQDBusInterface->call("AddInotifyMaxUserInstance", addNum);
+    if(reply.isValid()) {
+        qDebug() << "Set inotify_max_user_instances to" << reply.value();
+    } else {
+        qWarning() << "Call AddInotifyMaxUserInstance failed!";
+    }
 }

libsearch/index/ukui-search-qdbus.h

@@ -21,12 +21,14 @@
 #define UKUISEARCHQDBUS_H
 
 #include <QDBusInterface>
+#include <QDBusReply>
 namespace Zeeker {
 class UkuiSearchQDBus {
 public:
     UkuiSearchQDBus();
     ~UkuiSearchQDBus();
     void setInotifyMaxUserWatches();
+    int addInotifyUserInstances(int addNum);
 private:
     QDBusInterface* tmpSystemQDBusInterface;
 };

src/content-widget.cpp

@@ -730,7 +730,7 @@ void ContentWidget::onListViewRowChanged(SearchListView * listview, const int &t
     if(type == SearchItem::SearchType::Contents && !m_contentDetailList.isEmpty()) {
         m_detailView->isContent = true;
         m_detailView->setContent(m_contentDetailList.at(listview->currentIndex().row()), m_keyword);
-    } else if(type == SearchItem::SearchType::Best && !m_bestContent.isEmpty() && listview->currentIndex().row() == listview->getLength() - 1) {
+    } else if(type == SearchItem::SearchType::Best && !m_bestContent.isEmpty() && SearchItem::SearchType::Contents == m_bestList.at(listview->currentIndex().row()).first) {
         m_detailView->setContent(m_bestContent, m_keyword);
         m_detailView->isContent = true;
         m_detailView->setupWidget(SearchItem::SearchType::Contents, path);

ukuisearch-systemdbus/sysdbusregister.cpp

@@ -102,6 +102,36 @@ QString SysdbusRegister::setInotifyMaxUserWatchesStep3() {
     return QString(ba);
 }
 
+int SysdbusRegister::AddInotifyMaxUserInstance(int addNum)
+{
+    QFile file("/proc/sys/fs/inotify/max_user_instances");
+    if(!file.open(QIODevice::ReadOnly | QIODevice::Text))
+        return -1;
+    QTextStream ts(&file);
+    QString s = ts.read(512);
+    int instances = s.toInt() + addNum;
+
+    QByteArray ba;
+    FILE * fp = NULL;
+    char cmd[128];
+    char buf[1024];
+    sprintf(cmd, "sysctl -w fs.inotify.max_user_instances=\"%d\"", instances);
+    if((fp = popen(cmd, "r")) != NULL) {
+        rewind(fp);
+        while(!feof(fp)) {
+            fgets(buf, sizeof(buf), fp);
+            ba.append(buf);
+        }
+        pclose(fp);
+        fp = NULL;
+    } else {
+        qWarning() << "popen open failed";
+        return -1;
+    }
+    return instances;
+
+}
+
 //The following example comes from control center
 
 //void SysdbusRegister::setAutoLoginStatus(QString username) {

ukuisearch-systemdbus/sysdbusregister.h

@@ -52,6 +52,7 @@ public slots:
     Q_SCRIPTABLE QString setInotifyMaxUserWatchesStep1();
     Q_SCRIPTABLE QString setInotifyMaxUserWatchesStep2();
     Q_SCRIPTABLE QString setInotifyMaxUserWatchesStep3();
+    Q_SCRIPTABLE int AddInotifyMaxUserInstance(int addNum);
 
 //    // 设置免密登录状态
 //    Q_SCRIPTABLE void setNoPwdLoginStatus();