Differential D13216 Diff 40393 src/file/fileindexscheduler.h

Changeset View

Standalone View

View Options

src/file/fileindexscheduler.h

Show All 39 Lines
40{ 40​{
41 Q_OBJECT 41​ Q_OBJECT
42 Q_CLASSINFO("D-Bus Interface", "org.kde.baloo.scheduler") 42​ Q_CLASSINFO("D-Bus Interface", "org.kde.baloo.scheduler")
43 43​
44 Q_PROPERTY(int state READ state NOTIFY stateChanged) 44​ Q_PROPERTY(int state READ state NOTIFY stateChanged)
45public: 45​public:
46 FileIndexScheduler(Database* db, FileIndexerConfig* config, QObject* parent = nullptr); 46​ FileIndexScheduler(Database* db, FileIndexerConfig* config, QObject* parent = nullptr);
47 ~FileIndexScheduler() override; 47​ ~FileIndexScheduler() override;
48 int state() const { return m_indexerState; } 48​ int state() const { return m_indexerStates.at(0); }
49 49​
50Q_SIGNALS: 50​Q_SIGNALS:
51 Q_SCRIPTABLE void stateChanged(int state); 51​ Q_SCRIPTABLE void stateChanged(int state);
52 52​
53public Q_SLOTS: 53​public Q_SLOTS:
54 void indexNewFile(const QString& file) { 54​ void indexNewFile(const QString& file) {
55 if (!m_newFiles.contains(file)) { 55​ if (!m_newFiles.contains(file) && !m_indexerStates.contains(UnindexedFileCheck)) {
56 m_newFiles << file; 56​ m_newFiles << file;
57 QTimer::singleShot(0, this, &FileIndexScheduler::scheduleIndexing); 57​ QTimer::singleShot(0, this, &FileIndexScheduler::scheduleIndexing);
58 } 58​ }
59 } 59​ }
60 60​
61 void indexModifiedFile(const QString& file) { 61​ void indexModifiedFile(const QString& file) {
62 if (!m_modifiedFiles.contains(file)) { 62​ if (!m_modifiedFiles.contains(file)) {
63 m_modifiedFiles << file; 63​ m_modifiedFiles << file;
64 QTimer::singleShot(0, this, &FileIndexScheduler::scheduleIndexing); 64​ QTimer::singleShot(0, this, &FileIndexScheduler::scheduleIndexing);
65 } 65​ }
66 } 66​ }
67 67​
68 void indexXAttrFile(const QString& file) { 68​ void indexXAttrFile(const QString& file) {
69 if (!m_xattrFiles.contains(file)) { 69​ if (!m_xattrFiles.contains(file)) {
70 m_xattrFiles << file; 70​ m_xattrFiles << file;
71 QTimer::singleShot(0, this, &FileIndexScheduler::scheduleIndexing); 71​ QTimer::singleShot(0, this, &FileIndexScheduler::scheduleIndexing);
72 } 72​ }
73 } 73​ }
74 74​
75 void handleFileRemoved(const QString& file); 75​ void handleFileRemoved(const QString& file);
76 76​
77 void scheduleIndexing(); 77​ void scheduleIndexing();
78 78​
79 Q_SCRIPTABLE void suspend() { setSuspend(true); } 79​ Q_SCRIPTABLE void suspend() { suspendContentIndexer(true); }
80 Q_SCRIPTABLE void resume() { setSuspend(false); } 80​ Q_SCRIPTABLE void resume() { suspendContentIndexer(false); }
81 Q_SCRIPTABLE uint getRemainingTime(); 81​ Q_SCRIPTABLE uint getRemainingTime();
82 Q_SCRIPTABLE void checkUnindexedFiles(); 82​ Q_SCRIPTABLE void checkUnindexedFiles();
83 Q_SCRIPTABLE uint getBatchSize(); 83​ Q_SCRIPTABLE uint getBatchSize();
84 84​
85private Q_SLOTS: 85​private Q_SLOTS:
86 void powerManagementStatusChanged(bool isOnBattery); 86​ void suspendContentIndexer(bool suspend);
87 87​
88private: 88​private:
89 void setSuspend(bool suspend); ​
90 ​
91 Database* m_db; 89​ Database* m_db;
92 FileIndexerConfig* m_config; 90​ FileIndexerConfig* m_config;
93 91​
92​ QList<Baloo::IndexerState> m_indexerStates;
brunsUnsubmitted
Not Done

Make this a QFlags ...

bruns: Make this a QFlags ...
smithjdAuthorUnsubmitted
Not Done

There is no cast from int to enum anywhere here. There is a cast fron enum to int, to a negative integer used to set the QRunnable thread priority.

smithjd: There is no cast from int to enum anywhere here. There is a cast fron enum to int, to a…
brunsUnsubmitted
Not Done

Sigh ...
Make each state a bit in the flags. No bits set -> Idle, one or multiple bits set -> Suspended, or runners active.

bruns: Sigh ... Make each state a bit in the flags. No bits set -> Idle, one or multiple bits set ->…
93​
94 QStringList m_newFiles; 94​ QStringList m_newFiles;
95 QStringList m_modifiedFiles; 95​ QStringList m_modifiedFiles;
96 QStringList m_xattrFiles; 96​ QStringList m_xattrFiles;
97 97​
98 QThreadPool m_threadPool; 98​ QThreadPool m_threadPool;
99 99​
100 FileContentIndexerProvider m_provider; 100​ FileContentIndexerProvider m_provider;
101 FileContentIndexer* m_contentIndexer; 101​ FileContentIndexer* m_contentIndexer;
102 102​
103 PowerStateMonitor m_powerMonitor; 103​ PowerStateMonitor m_powerMonitor;
104 104​
105 IndexerState m_indexerState; ​
106 TimeEstimator m_timeEstimator; 105​ TimeEstimator m_timeEstimator;
107 106​
108 bool m_checkUnindexedFiles; 107​ bool m_checkUnindexedFiles;
109}; 108​};
110 109​
111} 110​}
112 111​
113#endif // BALOO_FILEINDEXSCHEDULER_H 112​#endif // BALOO_FILEINDEXSCHEDULER_H