gui sandbox: Allow wpath to improve poppler text rendering

Apparently poppler or something needs open() with write flags to render pdfs with proper fonts. Landlock guards file system write access, so this is fine.
gui: PreviewGeneratorPdf: Enable Text hinting
2022-12-06 11:59:26 +01:00 · 2022-12-06 11:58:10 +01:00 · 2022-12-06 11:57:34 +01:00 · 2022-12-06 11:55:16 +01:00
17 changed files with 139 additions and 293 deletions
--- a/2
+++ b/2
@ -1,4 +1,4 @@
-Copyright (c) 2018-2023: Albert Schwarzkopf <looqs at quitesimple period org>
+Copyright (c) 2018-2022: Albert Schwarzkopf <looqs at quitesimple period org>

 looqs is made available under the following license: 

--- a/cli/commandadd.cpp
+++ b/cli/commandadd.cpp
@ -44,30 +44,20 @@ int CommandAdd::handle(QStringList arguments)
 						"Continue adding files, don't exit on first error. If this option is not given, looqs will "
 						"exit asap, but it's possible that a few files will still be processed. "
 						"Set -t 1 to avoid this behavior, but processing will be slower. "},
-					   {{"n", "no-content"}, "Only add paths to database. Do not index content"},
-					   {{"f", "fill-content"}, "Index content for files previously indexed with -n"},
-					   {"tags", "Comma-separated list of tags to assign"},
 					   {{"t", "threads"}, "Number of threads to use.", "threads"}});
+
 	parser.addHelpOption();
 	parser.addPositionalArgument("add", "Add paths to the index",
 								 "add [paths...]. If no path is given, read from stdin, one path per line.");

 	parser.process(arguments);
 	this->keepGoing = parser.isSet("continue");
-	bool pathsOnly = parser.isSet("no-content");
-	bool fillContent = parser.isSet("fill-content");
 	if(parser.isSet("threads"))
 	{
 		QString threadsCount = parser.value("threads");
 		QThreadPool::globalInstance()->setMaxThreadCount(threadsCount.toInt());
 	}

-	if(pathsOnly && fillContent)
-	{
-		Logger::error() << "Invalid options: -n and -f cannot both be set";
-		return EXIT_FAILURE;
-	}
-
 	QStringList files = parser.positionalArguments();

 	if(files.length() == 0)
@ -81,16 +71,9 @@ int CommandAdd::handle(QStringList arguments)
 		}
 	}

-	FileSaverOptions fileSaverOptions;
-	fileSaverOptions.keepGoing = keepGoing;
-	fileSaverOptions.fillExistingContentless = fillContent;
-	fileSaverOptions.metadataOnly = pathsOnly;
-	fileSaverOptions.verbose = false;
-
 	indexer = new Indexer(*this->dbService);
-	indexer->setFileSaverOptions(fileSaverOptions);
-
 	indexer->setTargetPaths(files.toVector());
+	indexer->setKeepGoing(keepGoing);

 	connect(indexer, &Indexer::pathsCountChanged, this,
 			[](int pathsCount) { Logger::info() << "Found paths: " << pathsCount << Qt::endl; });
--- a/cli/commandupdate.cpp
+++ b/cli/commandupdate.cpp
@ -40,12 +40,8 @@ int CommandUpdate::handle(QStringList arguments)

 	bool hasErrors = false;
 	IndexSyncer *syncer = new IndexSyncer(*this->dbService);
-
-	FileSaverOptions fileOptions;
-	fileOptions.keepGoing = keepGoing;
-	fileOptions.verbose = verbose;
-
-	syncer->setFileSaverOptions(fileOptions);
+	syncer->setKeepGoing(keepGoing);
+	syncer->setVerbose(verbose);
 	syncer->setPattern(pattern);
 	syncer->setDryRun(dryRun);
 	syncer->setRemoveDeletedFromIndex(deleteMissing);
--- a/gui/mainwindow.cpp
+++ b/gui/mainwindow.cpp
@ -222,18 +222,16 @@ void MainWindow::connectSignals()
 				qCritical() << msg << Qt::endl;
 				QMessageBox::critical(this, "IPC error", msg);
 			});
-	connect(ui->radioMetadataOnly, &QRadioButton::toggled, this,
-			[this](bool toggled)
-			{
-				if(toggled)
-				{
-					this->ui->chkFillContentForContentless->setChecked(false);
-				};
-			});
+
+	/*connect(this, &MainWindow::startIpcPreviews, &previewCoordinator, &IPCPreviewClient::startGeneration,
+			Qt::QueuedConnection);
+	connect(this, &MainWindow::stopIpcPreviews, &ipcPreviewClient, &IPCPreviewClient::stopGeneration,
+			Qt::QueuedConnection); */
 }

 void MainWindow::exportFailedPaths()
 {
+
 	QString filename =
 		QString("/tmp/looqs_indexresult_failed_%1").arg(QDateTime::currentDateTime().toString("yyyy-MM-dd_hhmmss"));
 	QFile outFile(filename);
@ -266,11 +264,8 @@ void MainWindow::startIndexSync()
 	progressDialog.setValue(0);
 	progressDialog.open();

-	FileSaverOptions options;
-	options.keepGoing = true;
-	options.verbose = false;
-
-	indexSyncer->setFileSaverOptions(options);
+	indexSyncer->setKeepGoing(true);
+	indexSyncer->setVerbose(false);
 	indexSyncer->setDryRun(false);
 	indexSyncer->setRemoveDeletedFromIndex(true);

@ -314,15 +309,6 @@ void MainWindow::startIndexing()
 	this->indexer->setTargetPaths(paths);
 	QString ignorePatterns = ui->txtIgnorePatterns->text();
 	this->indexer->setIgnorePattern(ignorePatterns.split(";"));
-
-	FileSaverOptions options;
-	options.fillExistingContentless =
-		ui->chkFillContentForContentless->isEnabled() && ui->chkFillContentForContentless->isChecked();
-	options.metadataOnly = ui->radioMetadataOnly->isChecked();
-	options.verbose = false;
-	options.keepGoing = true;
-
-	this->indexer->setFileSaverOptions(options);
 	this->indexer->beginIndexing();
 	QSettings settings;
 	settings.setValue("indexPaths", pathSettingsValue);
--- a/gui/mainwindow.ui
+++ b/gui/mainwindow.ui
@ -18,13 +18,16 @@
    <item>
     <widget class="QLineEdit" name="txtSearch"/>
    </item>
+    <item>
+     <layout class="QHBoxLayout" name="horizontalLayout_3"/>
+    </item>
    <item>
     <widget class="QTabWidget" name="tabWidget">
      <property name="tabPosition">
       <enum>QTabWidget::South</enum>
      </property>
      <property name="currentIndex">
-       <number>2</number>
+       <number>1</number>
      </property>
      <widget class="QWidget" name="resultsTab">
       <attribute name="title">
@ -79,7 +82,7 @@
             <x>0</x>
             <y>0</y>
             <width>1244</width>
-             <height>641</height>
+             <height>633</height>
            </rect>
           </property>
           <layout class="QHBoxLayout" name="horizontalLayout"/>
@ -192,6 +195,62 @@
       </attribute>
       <layout class="QGridLayout" name="gridLayout">
        <item row="6" column="0">
+         <widget class="QLineEdit" name="txtIgnorePatterns"/>
+        </item>
+        <item row="11" column="0">
+         <widget class="QPushButton" name="btnStartIndexing">
+          <property name="text">
+           <string>Start indexing</string>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="0">
+         <widget class="QGroupBox" name="groupBoxPaths">
+          <property name="title">
+           <string>Add paths to scan</string>
+          </property>
+          <layout class="QGridLayout" name="gridLayout_2">
+           <item row="1" column="0">
+            <widget class="QLineEdit" name="txtPathScanAdd"/>
+           </item>
+           <item row="3" column="0" colspan="5">
+            <widget class="QListWidget" name="lstPaths"/>
+           </item>
+           <item row="1" column="3">
+            <widget class="QToolButton" name="btnDeletePath">
+             <property name="enabled">
+              <bool>false</bool>
+             </property>
+             <property name="text">
+              <string>Delete</string>
+             </property>
+            </widget>
+           </item>
+           <item row="1" column="1">
+            <widget class="QPushButton" name="btnChoosePath">
+             <property name="text">
+              <string>...</string>
+             </property>
+            </widget>
+           </item>
+           <item row="1" column="2">
+            <widget class="QPushButton" name="btnAddPath">
+             <property name="text">
+              <string>Add</string>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </widget>
+        </item>
+        <item row="5" column="0">
+         <widget class="QLabel" name="label">
+          <property name="text">
+           <string>Ignore patterns, separated by ';'. Example: *.js;*Downloads*</string>
+          </property>
+         </widget>
+        </item>
+        <item row="9" column="0">
         <widget class="QGroupBox" name="groupBoxIndexProgress">
          <property name="contextMenuPolicy">
           <enum>Qt::PreventContextMenu</enum>
@ -393,102 +452,6 @@
          </layout>
         </widget>
        </item>
-        <item row="2" column="0">
-         <widget class="QGroupBox" name="groupBoxIndexOptions">
-          <property name="title">
-           <string>Index options</string>
-          </property>
-          <layout class="QVBoxLayout" name="verticalLayout_11">
-           <item>
-            <widget class="QLabel" name="label">
-             <property name="text">
-              <string>Ignore patterns, separated by ';'. Example: *.js;*Downloads*:</string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QLineEdit" name="txtIgnorePatterns"/>
-           </item>
-           <item>
-            <widget class="Line" name="line">
-             <property name="orientation">
-              <enum>Qt::Horizontal</enum>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QRadioButton" name="radioIndexEverything">
-             <property name="text">
-              <string>Index everything (metadata + file content)</string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QCheckBox" name="chkFillContentForContentless">
-             <property name="enabled">
-              <bool>false</bool>
-             </property>
-             <property name="text">
-              <string>Index content for files previously indexed without content</string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QRadioButton" name="radioMetadataOnly">
-             <property name="text">
-              <string>Index metadata only, don't process content of files</string>
-             </property>
-            </widget>
-           </item>
-          </layout>
-         </widget>
-        </item>
-        <item row="8" column="0">
-         <widget class="QPushButton" name="btnStartIndexing">
-          <property name="text">
-           <string>Start indexing</string>
-          </property>
-         </widget>
-        </item>
-        <item row="1" column="0">
-         <widget class="QGroupBox" name="groupBoxPaths">
-          <property name="title">
-           <string>Add paths to scan</string>
-          </property>
-          <layout class="QGridLayout" name="gridLayout_2">
-           <item row="1" column="0">
-            <widget class="QLineEdit" name="txtPathScanAdd"/>
-           </item>
-           <item row="3" column="0" colspan="5">
-            <widget class="QListWidget" name="lstPaths"/>
-           </item>
-           <item row="1" column="3">
-            <widget class="QToolButton" name="btnDeletePath">
-             <property name="enabled">
-              <bool>false</bool>
-             </property>
-             <property name="text">
-              <string>Delete</string>
-             </property>
-            </widget>
-           </item>
-           <item row="1" column="1">
-            <widget class="QPushButton" name="btnChoosePath">
-             <property name="text">
-              <string>...</string>
-             </property>
-            </widget>
-           </item>
-           <item row="1" column="2">
-            <widget class="QPushButton" name="btnAddPath">
-             <property name="text">
-              <string>Add</string>
-             </property>
-            </widget>
-           </item>
-          </layout>
-         </widget>
-        </item>
       </layout>
      </widget>
      <widget class="QWidget" name="settingsTab">
@ -738,22 +701,5 @@
 </widget>
 <layoutdefault spacing="6" margin="11"/>
 <resources/>
- <connections>
-  <connection>
-   <sender>radioIndexEverything</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>chkFillContentForContentless</receiver>
-   <slot>setEnabled(bool)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>639</x>
-     <y>464</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>639</x>
-     <y>497</y>
-    </hint>
-   </hints>
-  </connection>
- </connections>
+ <connections/>
 </ui>
--- a/shared/filesaver.cpp
+++ b/shared/filesaver.cpp
@ -38,17 +38,18 @@ SaveFileResult FileSaver::updateFile(QString path)
 	return saveFile(info);
 }

-int FileSaver::addFiles(const QVector<QString> paths)
+int FileSaver::addFiles(const QVector<QString> paths, bool keepGoing, bool verbose)
 {
-	return processFiles(paths, std::bind(&FileSaver::addFile, this, std::placeholders::_1));
+	return processFiles(paths, std::bind(&FileSaver::addFile, this, std::placeholders::_1), keepGoing, verbose);
 }

-int FileSaver::updateFiles(const QVector<QString> paths)
+int FileSaver::updateFiles(const QVector<QString> paths, bool keepGoing, bool verbose)
 {
-	return processFiles(paths, std::bind(&FileSaver::updateFile, this, std::placeholders::_1));
+	return processFiles(paths, std::bind(&FileSaver::updateFile, this, std::placeholders::_1), keepGoing, verbose);
 }

-int FileSaver::processFiles(const QVector<QString> paths, std::function<SaveFileResult(QString path)> saverFunc)
+int FileSaver::processFiles(const QVector<QString> paths, std::function<SaveFileResult(QString path)> saverFunc,
+							bool keepGoing, bool verbose)
 {
 	std::atomic<bool> terminate{false};
 	std::atomic<int> processedCount{0};
@ -59,7 +60,7 @@ int FileSaver::processFiles(const QVector<QString> paths, std::function<SaveFile
 								  {
 									  return;
 								  }
-								  if(this->fileSaverOptions.verbose)
+								  if(verbose)
 								  {
 									  Logger::info() << "Processing " << path << Qt::endl;
 								  }
@ -67,7 +68,7 @@ int FileSaver::processFiles(const QVector<QString> paths, std::function<SaveFile
 								  if(result == DBFAIL || result == PROCESSFAIL)
 								  {
 									  Logger::error() << "Failed to process " << path << Qt::endl;
-									  if(!this->fileSaverOptions.keepGoing)
+									  if(!keepGoing)
 									  {
 										  terminate = true;
 									  }
@ -75,7 +76,7 @@ int FileSaver::processFiles(const QVector<QString> paths, std::function<SaveFile
 								  else
 								  {
 									  ++processedCount;
-									  if(this->fileSaverOptions.verbose)
+									  if(verbose)
 									  {
 										  if(result == SKIPPED)
 										  {
@ -119,29 +120,11 @@ SaveFileResult FileSaver::saveFile(const QFileInfo &fileInfo)
 		{
 			if(canonicalPath.startsWith(excludedPath))
 			{
-				if(this->fileSaverOptions.verbose)
-				{
-					Logger::info() << "Skipped due to excluded path";
-				}
 				return SKIPPED;
 			}
 		}

-		bool mustFillContent = this->fileSaverOptions.fillExistingContentless;
-		if(!mustFillContent)
-		{
-			mustFillContent = !this->fileSaverOptions.metadataOnly;
-			if(mustFillContent)
-			{
-				auto filetype = this->dbService->queryFileType(fileInfo.absolutePath());
-				if(filetype)
-				{
-					mustFillContent = filetype.value() == 'c';
-				}
-			}
-		}
-
-		if(fileInfo.size() > 0 && mustFillContent)
+		if(fileInfo.size() > 0)
 		{
 			QProcess process;
 			QStringList args;
@ -176,7 +159,7 @@ SaveFileResult FileSaver::saveFile(const QFileInfo &fileInfo)
 			}
 		}
 	}
-	SaveFileResult result = this->dbService->saveFile(fileInfo, pageData, this->fileSaverOptions.metadataOnly);
+	SaveFileResult result = this->dbService->saveFile(fileInfo, pageData);
 	if(result == OK && processorReturnCode == OK_WASEMPTY)
 	{
 		return OK_WASEMPTY;
--- a/shared/filesaver.h
+++ b/shared/filesaver.h
@ -2,7 +2,6 @@
 #define FILESAVER_H
 #include <QSqlDatabase>
 #include <QFileInfo>
-#include "filesaveroptions.h"
 #include "pagedata.h"
 #include "filedata.h"
 #include "sqlitedbservice.h"
@ -12,21 +11,16 @@ class FileSaver
  private:
 	SqliteDbService *dbService;
 	QStringList excludedPaths = Common::excludedPaths();
-	FileSaverOptions fileSaverOptions;

  public:
 	FileSaver(SqliteDbService &dbService);
 	SaveFileResult addFile(QString path);
 	SaveFileResult updateFile(QString path);
 	SaveFileResult saveFile(const QFileInfo &fileInfo);
-	int processFiles(const QVector<QString> paths, std::function<SaveFileResult(QString path)> saverFunc);
-	int addFiles(const QVector<QString> paths);
-	int updateFiles(const QVector<QString> paths);
-
-	void setFileSaverOptions(FileSaverOptions options)
-	{
-		this->fileSaverOptions = options;
-	}
+	int processFiles(const QVector<QString> paths, std::function<SaveFileResult(QString path)> saverFunc,
+					 bool keepGoing, bool verbose);
+	int addFiles(const QVector<QString> paths, bool keepGoing, bool verbose);
+	int updateFiles(const QVector<QString> paths, bool keepGoing, bool verbose);
 };

 #endif // FILESAVER_H
--- a/shared/filesaveroptions.h
+++ b/shared/filesaveroptions.h
@ -1,14 +0,0 @@
-#ifndef FILESAVEROPTIONS_H
-#define FILESAVEROPTIONS_H
-
-class FileSaverOptions
-{
-  public:
-	bool verbose = false;
-	bool keepGoing = false;
-	bool metadataOnly = false;
-	/* Whether those previously explicitly without content should be filled */
-	bool fillExistingContentless = false;
-};
-
-#endif // FILESAVEROPTIONS_H
--- a/shared/filescanworker.cpp
+++ b/shared/filescanworker.cpp
@ -12,7 +12,6 @@ FileScanWorker::FileScanWorker(SqliteDbService &db, ConcurrentQueue<QString> &qu
 void FileScanWorker::run()
 {
 	FileSaver saver{*this->dbService};
-	saver.setFileSaverOptions(this->fileSaverOptions);
 	auto paths = queue->dequeue(batchsize);
 	for(QString &path : paths)
 	{
@ -35,8 +34,3 @@ void FileScanWorker::run()
 	}
 	emit finished();
 }
-
-void FileScanWorker::setFileSaverOptions(FileSaverOptions options)
-{
-	this->fileSaverOptions = options;
-}
--- a/shared/filescanworker.h
+++ b/shared/filescanworker.h
@ -15,14 +15,12 @@ class FileScanWorker : public QObject, public QRunnable
  protected:
 	SqliteDbService *dbService;
 	ConcurrentQueue<QString> *queue;
-	FileSaverOptions fileSaverOptions;
 	int batchsize;
 	std::atomic<bool> *stopToken;

  public:
 	FileScanWorker(SqliteDbService &db, ConcurrentQueue<QString> &queue, int batchsize, std::atomic<bool> &stopToken);
 	void run() override;
-	void setFileSaverOptions(FileSaverOptions options);
  signals:
 	void result(FileScanResult);
 	void finished();
--- a/shared/indexer.cpp
+++ b/shared/indexer.cpp
@ -73,6 +73,16 @@ void Indexer::setTargetPaths(QVector<QString> pathsToScan)
 	this->pathsToScan = pathsToScan;
 }

+void Indexer::setVerbose(bool verbose)
+{
+	this->verbose = verbose;
+}
+
+void Indexer::setKeepGoing(bool keepGoing)
+{
+	this->keepGoing = keepGoing;
+}
+
 void Indexer::requestCancellation()
 {
 	this->dirScanner->cancel();
@ -98,7 +108,6 @@ void Indexer::launchWorker(ConcurrentQueue<QString> &queue, int batchsize)
 	FileScanWorker *runnable = new FileScanWorker(*this->db, queue, batchsize, this->workerCancellationToken);
 	connect(runnable, &FileScanWorker::result, this, &Indexer::processFileScanResult);
 	connect(runnable, &FileScanWorker::finished, this, &Indexer::processFinishedWorker);
-	runnable->setFileSaverOptions(this->fileSaverOptions);
 	++this->runningWorkers;
 	QThreadPool::globalInstance()->start(runnable);
 }
@ -114,7 +123,7 @@ void Indexer::processFileScanResult(FileScanResult result)
 	if(isErrorSaveFileResult(result.second))
 	{
 		this->currentIndexResult.results.append(result);
-		if(!this->fileSaverOptions.keepGoing)
+		if(!keepGoing)
 		{
 			this->requestCancellation();
 			emit finished();
@ -123,7 +132,7 @@ void Indexer::processFileScanResult(FileScanResult result)
 	}
 	else
 	{
-		if(this->fileSaverOptions.verbose)
+		if(verbose)
 		{
 			this->currentIndexResult.results.append(result);
 		}
@ -166,8 +175,3 @@ void Indexer::processFinishedWorker()
 		emit finished();
 	}
 }
-
-void Indexer::setFileSaverOptions(FileSaverOptions options)
-{
-	this->fileSaverOptions = options;
-}
--- a/shared/indexer.h
+++ b/shared/indexer.h
@ -52,7 +52,8 @@ class Indexer : public QObject
 {
 	Q_OBJECT
  protected:
-	FileSaverOptions fileSaverOptions;
+	bool verbose = false;
+	bool keepGoing = true;
 	SqliteDbService *db;

 	int progressReportThreshold = 50;
@ -79,8 +80,8 @@ class Indexer : public QObject
 	void beginIndexing();
 	void setIgnorePattern(QStringList ignorePattern);
 	void setTargetPaths(QVector<QString> pathsToScan);
-
-	void setFileSaverOptions(FileSaverOptions options);
+	void setVerbose(bool verbose);
+	void setKeepGoing(bool keepGoing);

 	void requestCancellation();

--- a/shared/indexsyncer.cpp
+++ b/shared/indexsyncer.cpp
@ -7,16 +7,21 @@ IndexSyncer::IndexSyncer(SqliteDbService &dbService)
 	this->dbService = &dbService;
 }

-void IndexSyncer::setFileSaverOptions(FileSaverOptions options)
-{
-	fileSaverOptions = options;
-}
-
 void IndexSyncer::setDryRun(bool dryRun)
 {
 	this->dryRun = dryRun;
 }

+void IndexSyncer::setVerbose(bool verbose)
+{
+	this->verbose = verbose;
+}
+
+void IndexSyncer::setKeepGoing(bool keepGoing)
+{
+	this->keepGoing = keepGoing;
+}
+
 void IndexSyncer::setRemoveDeletedFromIndex(bool removeDeletedFromIndex)
 {
 	this->removeDeletedFromIndex = removeDeletedFromIndex;
@ -30,7 +35,7 @@ void IndexSyncer::setPattern(QString pattern)
 void IndexSyncer::sync()
 {
 	this->stopToken.store(false, std::memory_order_relaxed);
-
+	FileSaver saver(*this->dbService);
 	QVector<FileData> files;
 	int offset = 0;
 	int limit = 10000;
@ -82,7 +87,7 @@ void IndexSyncer::sync()
 						if(!this->dbService->deleteFile(fileData.absPath))
 						{
 							emit error("Error: Failed to delete " + fileData.absPath + " from the index");
-							if(!this->fileSaverOptions.keepGoing)
+							if(!this->keepGoing)
 							{
 								emit finished(totalUpdatesFilesCount, totalDeletedFilesCount, totalErroredFilesCount);
 								return;
@ -99,15 +104,13 @@ void IndexSyncer::sync()
 			}
 		}

-		FileSaver saver(*this->dbService);
-		saver.setFileSaverOptions(this->fileSaverOptions);
-		unsigned int updatedFilesCount = saver.updateFiles(filePathsToUpdate);
+		unsigned int updatedFilesCount = saver.updateFiles(filePathsToUpdate, keepGoing, verbose);
 		unsigned int shouldHaveUpdatedCount = static_cast<unsigned int>(filePathsToUpdate.size());
 		if(updatedFilesCount != shouldHaveUpdatedCount)
 		{

 			totalErroredFilesCount += (shouldHaveUpdatedCount - updatedFilesCount);
-			if(!this->fileSaverOptions.keepGoing)
+			if(!keepGoing)
 			{
 				QString errorMsg = QString("Failed to update all files selected for updating in this batch. Updated") +
 								   updatedFilesCount + "out of" + shouldHaveUpdatedCount + "selected for updating";
--- a/shared/indexsyncer.h
+++ b/shared/indexsyncer.h
@ -1,15 +1,16 @@
 #ifndef INDEXSYNCER_H
 #define INDEXSYNCER_H
 #include "sqlitedbservice.h"
-#include "filesaveroptions.h"
+
 class IndexSyncer : public QObject
 {
 	Q_OBJECT
  private:
 	SqliteDbService *dbService = nullptr;
-	FileSaverOptions fileSaverOptions;
+	bool keepGoing = true;
 	bool removeDeletedFromIndex = true;
 	bool dryRun = false;
+	bool verbose = false;
 	QString pattern;

 	std::atomic<bool> stopToken{false};
@ -17,12 +18,12 @@ class IndexSyncer : public QObject
  public:
 	IndexSyncer(SqliteDbService &dbService);

-	void setFileSaverOptions(FileSaverOptions options);
-
  public slots:
 	void sync();
 	void cancel();
 	void setDryRun(bool dryRun);
+	void setVerbose(bool verbose);
+	void setKeepGoing(bool keepGoing);
 	void setRemoveDeletedFromIndex(bool removeDeletedFromIndex);
 	void setPattern(QString pattern);

--- a/shared/shared.pro
+++ b/shared/shared.pro
@ -74,7 +74,6 @@ HEADERS += sqlitesearch.h \
    encodingdetector.h \
    filedata.h \
    filesaver.h \
-    filesaveroptions.h \
    filescanworker.h \
    indexer.h \
    indexsyncer.h \
--- a/shared/sqlitedbservice.cpp
+++ b/shared/sqlitedbservice.cpp
@ -29,22 +29,6 @@ QVector<SearchResult> SqliteDbService::search(const LooqsQuery &query)
 	return searcher.search(query);
 }

-std::optional<QChar> SqliteDbService::queryFileType(QString absPath)
-{
-	auto query = QSqlQuery(dbFactory->forCurrentThread());
-	query.prepare("SELECT filetype FROM file WHERE path = ?");
-	query.addBindValue(absPath);
-	if(!query.exec())
-	{
-		throw LooqsGeneralException("Error while trying to query for file type: " + query.lastError().text());
-	}
-	if(!query.next())
-	{
-		return {};
-	}
-	return query.value(0).toChar();
-}
-
 bool SqliteDbService::fileExistsInDatabase(QString path)
 {
 	auto query = QSqlQuery(dbFactory->forCurrentThread());
@ -164,15 +148,11 @@ bool SqliteDbService::insertToFTS(bool useTrigrams, QSqlDatabase &db, int fileid
 	return true;
 }

-SaveFileResult SqliteDbService::saveFile(QFileInfo fileInfo, QVector<PageData> &pageData, bool pathsOnly)
+SaveFileResult SqliteDbService::saveFile(QFileInfo fileInfo, QVector<PageData> &pageData)
 {
 	QString absPath = fileInfo.absoluteFilePath();
 	auto mtime = fileInfo.lastModified().toSecsSinceEpoch();
-	QChar fileType = fileInfo.isDir() ? 'd' : 'c';
-	if(pathsOnly)
-	{
-		fileType = 'f';
-	}
+	QChar fileType = fileInfo.isDir() ? 'd' : 'f';

 	QSqlDatabase db = dbFactory->forCurrentThread();
 	QSqlQuery delQuery(db);
@ -206,23 +186,19 @@ SaveFileResult SqliteDbService::saveFile(QFileInfo fileInfo, QVector<PageData> &
 		return DBFAIL;
 	}

-	if(!pathsOnly)
+	int lastid = inserterQuery.lastInsertId().toInt();
+	if(!insertToFTS(false, db, lastid, pageData))
 	{
-		int lastid = inserterQuery.lastInsertId().toInt();
-		if(!insertToFTS(false, db, lastid, pageData))
-		{
-			db.rollback();
-			Logger::error() << "Failed to insert data to FTS index " << Qt::endl;
-			return DBFAIL;
-		}
-		if(!insertToFTS(true, db, lastid, pageData))
-		{
-			db.rollback();
-			Logger::error() << "Failed to insert data to FTS index " << Qt::endl;
-			return DBFAIL;
-		}
+		db.rollback();
+		Logger::error() << "Failed to insert data to FTS index " << Qt::endl;
+		return DBFAIL;
+	}
+	if(!insertToFTS(true, db, lastid, pageData))
+	{
+		db.rollback();
+		Logger::error() << "Failed to insert data to FTS index " << Qt::endl;
+		return DBFAIL;
 	}
-
 	if(!db.commit())
 	{
 		db.rollback();
--- a/shared/sqlitedbservice.h
+++ b/shared/sqlitedbservice.h
@ -1,8 +1,6 @@
 #ifndef SQLITEDBSERVICE_H
 #define SQLITEDBSERVICE_H
 #include <QFileInfo>
-#include <optional>
-
 #include "databasefactory.h"
 #include "utils.h"
 #include "pagedata.h"
@ -19,14 +17,12 @@ class SqliteDbService

  public:
 	SqliteDbService(DatabaseFactory &dbFactory);
-	SaveFileResult saveFile(QFileInfo fileInfo, QVector<PageData> &pageData, bool pathsOnly);
+	SaveFileResult saveFile(QFileInfo fileInfo, QVector<PageData> &pageData);
 	unsigned int getFiles(QVector<FileData> &results, QString wildCardPattern, int offset, int limit);
 	bool deleteFile(QString path);
 	bool fileExistsInDatabase(QString path);
 	bool fileExistsInDatabase(QString path, qint64 mtime);
 	QVector<SearchResult> search(const LooqsQuery &query);
-
-	std::optional<QChar> queryFileType(QString absPath);
 };

 #endif // SQLITEDBSERVICE_H
Author	SHA1	Message	Date
Albert Schwarzkopf	dbe4061c58	gui sandbox: Allow wpath to improve poppler text rendering Apparently poppler or something needs open() with write flags to render pdfs with proper fonts. Landlock guards file system write access, so this is fine.	2022-12-06 11:59:26 +01:00
Albert Schwarzkopf	87e3cc3380	gui: PreviewGeneratorPdf: Enable Text hinting	2022-12-06 11:58:10 +01:00
Albert Schwarzkopf	ffdaa4c0c6	gui: mainwindow: Refactor to use new PreviewCoordinator	2022-12-06 11:57:34 +01:00
Albert Schwarzkopf	fe8da94951	gui: Introduce PreviewCoordinator Move some preview generation logic to PreviewCoordinator	2022-12-06 11:55:16 +01:00