Differential D11529 Diff 30575 src/file/indexcleaner.cpp

Changeset View

Standalone View

src/file/indexcleaner.cpp

Show All 13 Lines
14	* You should have received a copy of the GNU Lesser General Public	14		* You should have received a copy of the GNU Lesser General Public
15	* License along with this library; if not, write to the Free Software	15		* License along with this library; if not, write to the Free Software
16	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA	16		* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
17	*	17		*
18	*/	18		*/
19		19
20	#include "indexcleaner.h"	20		#include "indexcleaner.h"
21	#include "fileindexerconfig.h"	21		#include "fileindexerconfig.h"
		22		#include "storagedevices.h"
22		23
23	#include "database.h"	24		#include "database.h"
24	#include "transaction.h"	25		#include "transaction.h"
25	#include "idutils.h"	26		#include "idutils.h"
26		27
27	#include <QDebug>	28		#include <QDebug>
28	#include <QFile>	29		#include <QFile>
29	#include <QMimeDatabase>	30		#include <QMimeDatabase>
30		31
31	using namespace Baloo;	32		using namespace Baloo;
32		33
33	IndexCleaner::IndexCleaner(Database* db, FileIndexerConfig* config)	34		IndexCleaner::IndexCleaner(Database* db, FileIndexerConfig* config, StorageDevices* devices)
34	: m_db(db)	35		: m_db(db)
35	, m_config(config)	36		, m_config(config)
		37		, m_devices(devices)
36	{	38		{
37	Q_ASSERT(db);	39		Q_ASSERT(db);
38	Q_ASSERT(config);	40		Q_ASSERT(config);
39	}	41		}
40		42
41	void IndexCleaner::run()	43		void IndexCleaner::run()
42	{	44		{
43	QMimeDatabase mimeDb;	45		QMimeDatabase mimeDb;
44		46
			michaelhUnsubmitted Done Unrelated whitespace change michaelh: Unrelated whitespace change
45	Transaction tr(m_db, Transaction::ReadWrite);	47		Transaction tr(m_db, Transaction::ReadWrite);
46		48
47	auto shouldDelete = [&](quint64 id) {	49		auto shouldDelete = [&](quint64 id) {
48	if (!id) {	50		if (!id) {
49	return false;	51		return false;
50	}	52		}
51		53
52	QString url = tr.documentUrl(id);	54		QString url = tr.documentUrl(id);
Show All 13 Lines
66	if (!m_config->shouldMimeTypeBeIndexed(mimetype)) {	68		if (!m_config->shouldMimeTypeBeIndexed(mimetype)) {
67	qDebug() << "mimetype should not be indexed: " << url << mimetype;	69		qDebug() << "mimetype should not be indexed: " << url << mimetype;
68	return true;	70		return true;
69	}	71		}
70		72
71	return false;	73		return false;
72	};	74		};
73		75
		76		for (const auto& device: m_devices->allMedia()) {
		77		if (!device.isMounted()) {
		78		qDebug() << "skipping device:" << device.udi();
		79		} else {
		80		QString devicePath(device.mountPath() + QLatin1Char('/'));
		81
			michaelhUnsubmitted Done You can use `QStringLiteral("%1/").arg(device.mountPath())` here and maybe define it outside the loop michaelh: You can use `QStringLiteral("%1/").arg(device.mountPath())` here and maybe define it outside…
74	for (const QString& folder : m_config->includeFolders()) {	82		for (const QString& folder : m_config->includeFolders()) {
			brunsUnsubmitted Not Done Undesired detach bruns: Undesired detach
			smithjdAuthorUnsubmitted Not Done Same as above. smithjd: Same as above.
		83		if (folder.startsWith(devicePath)) {
75	quint64 id = filePathToId(QFile::encodeName(folder));	84		quint64 id = filePathToId(QFile::encodeName(folder));
76	tr.removeRecursively(id, shouldDelete);	85		tr.removeRecursively(id, shouldDelete);
77	}	86		}
		87		}
		88		}
			brunsUnsubmitted Not Done Undesired detach bruns: Undesired detach
			smithjdAuthorUnsubmitted Not Done This example will also detach with or without a const intermediate. ...returning a copy from a method means that the copy is shared and has negative side-effects when used with range-based loops. - https://www.dvratil.cz/2015/06/qt-containers-and-c11-range-based-loops smithjd: This example will also detach with or without a const intermediate. > ...returning a copy…
			brunsUnsubmitted Not Done No, if done correctly, it will not detach. For iterating, you need a readonly copy of the container. Using `const auto` gurantees you will not modify the container. Calling begin() on a const Qt container will not detach. Try to understand the linked article. bruns: No, if done correctly, it will not detach. For iterating, you need a readonly copy of the…
		89		}
78	tr.commit();	90		tr.commit();
79		91
80	Q_EMIT done();	92		Q_EMIT done();
81	}	93		}