TO REBASE CHANGELOG.md, USAGE.md

update USAGE
update README.md
2022-06-05 14:40:11 +02:00 · 2022-06-05 14:40:11 +02:00 · 2022-06-05 14:40:11 +02:00 · 2022-06-05 14:40:11 +02:00 · 2022-06-05 14:40:11 +02:00 · 2022-06-05 14:40:11 +02:00
--- a/.gitignore
+++ b/.gitignore
@ -1,11 +0,0 @@
-.user
-.o
-*.user
-*.o
-*.a
-moc_*.cpp
-moc_*.h
-Makefile
-cli/looqs
-gui/looqs-gui
-qrc_*
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,61 +1,22 @@
 # looqs: Release notes

-## 2022-06-29 - v0.4
-This release makes several minor improvements and begins prebuilt binaries of looqs that (should) run
-on any recent Linux distribution.
-
- - General: Begin new, experimental distro-agnostic tarball containing prebuilt binaries and libs. See the README for more information.
- - GUI: In the "Previews" tab, allow filtering by file, to only show previews for a specific file.
- - GUI: Add "Show previews" context menu option to files in result (if available)
- - General: Fix build with libquazip 1.X
- - General: Properly report access errors as a failure during indexing
- - GUI: Add button to export a list of all paths that failed
- - General: Improve dir scan threading
- - CLI: Improve helptext
- - General: Add voidlinux build instructions
-
-## 2022-06-14 - v0.3
-CHANGES:
- GUI: Add settings tab to configure various settings
- GUI: Don't render previews for results that do not originate from a content search. This was confusing.
- GUI: Remove 'open config file' menu action
- GUI: Highlight "words" that are actually numbers in preview texts
- search: Search for "words" that are a number, e. g. 23. Previously, those were ignored due to a regression.
- CLI: Minor cleanups.
- sandbox: Improve preview generation sandbox further by restricting it more
- sandbox: Fix case where activiation would fail during indexing in some cases on kernels without landlock.
- Remove 'firstrun' setting
-
-
-## 2022-06-07 - v0.2
-CHANGES:
- Sandboxing: Add environment variable `LOOQS_DISABLE_SANDBOXING` to disable sandboxing. This is intended for troubleshooting
- Sandboxing: Fix issue where activation failed on kernels without landlock
-
-## 2022-06-06 - v0.1
+## 2022-06-XX - v0.1
 The first release comes with basic functionality. It's a start that can be considered useful to some degree.

 looqs is still at an early stage and may exhibit some weirdness and contain bugs.

 Tested architectures: amd64.

-CHANGES:
- CLI command "looqs" to add/update/delete and search
- GUI: "looqs-gui" to search, render previews, and add files to index
+CHANGES: 
+- CLI command "looqs" to add/update/delete and search 
+- GUI: "looqs-gui" to search, render previews, and add files to index 
 - General: Add multi-threaded indexing of all files (paths, mtime)
 - General: Generate sqlite based full-text search index for: .pdf,.odt,.ods, text files
 - General: Sandboxed content processing
 - GUI: Sandboxed IPC sub-process to render previews.
- GUI: Add previews for pdf: Render the page the search keywords were found. Highlight the keywords when rendering the page.
- GUI: Add previews for plaintext files: Extract snippets. Highlight the keywords when rendering the page.
+- GUI: Add previews for pdf: Render the page the search keywords were found. Highlight the keywords when rendering the page. 
+- GUI: Add previews for plaintext files: Extract snippets. Highlight the keywords when rendering the page. 
 - General: Add basic filters for query.
- GUI: Add icon. Special thanks to the following sources:
-	https://www.svgrepo.com/svg/151751/magnifier-with-small-handle
-	https://www.svgrepo.com/svg/52764/open-book
-
-	Thanks!
- General: Documentation.
-
- Add packages: Ubuntu 21.10, 22.04
+- Add packages: Ubuntu 22.04

 Thanks to all those who provided feedback (and endured bugs) at various stages. You know who you are, thx!
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@ -1,26 +0,0 @@
-# looqs - Contributing
-Contributions are welcome, please use the following guidelines. 
-
-## Repository
-The github repository https://github.com/quitesimpleorg/looqs is the primary one. Pull-Requests and Issues go there, but you can also submit your feedback there. 
-
-Those who prefer a more classical approach can mail their patches etc. to looqs at quitesimple org. Ideally git-format patch and git send-email. 
-
-The repository at https://gitea.quitesimple.org/crtxcr/looqs was supposed to be the main one, but these
-plans are on hold for the time being. Just ignore it. 
-
-## Pull-Requests & Rebasing
-Your merge requests should be submitted against the dev branch. master branch won't be rebased. I'll try to avoid in the dev branch. I definitly rebase WIP/feature branches. 
-
-
-## Commit messages
-Commit messages begin with the component your change affects, e. g.  "gui:", "cli:", "shared:", followed by the class. 
-Then choose an appropriate verb in present tense. Wrong: Fixed, Fixes. Correct: Fix. Make sure lines are not too long, 
-I personally go by gut feeling in this matter. 
-
-If your change has an issue, link it at the end: Closes: https://github.com/quitesimpleorg/looqs/issues/1
-
-Example: "shared: Indexer: Use WildcardMatcher to ignore paths"
-
-## License
-You license your changes under the GPLv3 by contributing.
--- a/HACKING.md
+++ b/HACKING.md
@ -1,33 +0,0 @@
-# looqs - Hacking
-
-## Introduction
-Without elaborating here, I hacked looqs because I was not satisfied with the state of desktop search on Linux.
-
-Originally a set of CLI python  scripts, it is now written in C++ and offers a GUI made using Qt. While a "web app" would have been an option, I prefer a desktop application for something like looqs. I chose Qt because I am more familiar with it than with any other GUI framework. To my knowledge, potential alternatives like GTK do not include as many "batteries" as Qt anyway, so the job presumably would have been harder there,
-at least for me.
-
-If you are interested in how to contribute, please see the file [CONTRIBUTING.md](CONTRIBUTING.md) which contains the instructions on how to submit patches etc.
-
-## Security
-The architecture ensures that the parsing of documents and the preview generation is sandboxed by [exile.h](https://github.com/quitesimpleorg/exile.h). looqs uses a multi-process architecture to achieve this.
-
-Qt code is considered trusted in this model. While one may critize this, it was the only practical solution. looqs uses Qt's serialization mechanism and other classes to communicate between the non-sandboxed GUI process and the sandboxed processes.
-
-Set the enviornment variable `LOOQS_DISABLE_SANDBOX=1` to disable sandboxing. It's intended for troublehshooting.
-
-## Database
-The heart is sqlite, with the FTS5 extensions behind the full-text search. While FTS may not be sqlite's strong suit, I definitly did not want to run one of those oftenly recommended heavy (Java based) solutions. I explored other options like Postgresql, I've discard them due to some limitations back then.
-
-Down the road, alternatives will be explored of course if sqlite should not suffice anymore.
-
-## File format support
-The pdf library is libpoppler. Files such as .odt or .docx documents are opened with libquazip. The XML files in there are not parsed,
-looqs simply strips the tags and that seems to work fine so far. Naturally, this is not the "proper way", so there is room for improvement maybe here. However, those file formats are not a huge priortiy for me personally. libuchardet does encoding detection and conversion.
-
-Naturally, looqs won't be able to index and render previews for everything. Such approach would create a huge bloated binary. In the future, there will be some plugin system of some sorts, either we will load .so objects or use subprocesses.
-
-## Name
-looqs looks for files. You as the user can also look inside them. The 'k' in "looks" was replaced by a 'q'. Originally, I wanted my projects to have "qs" (for quitesimple) in their name. While abandoned now, this got us to looqs.
-
-
-
--- a/1119
+++ b/1119
--- a/README.md
+++ b/README.md
@ -2,34 +2,20 @@
 looqs is a tool that creates a full-text search index for your files. It allows you to look at previews where your
 search terms have been found, as shown in the screenshots below.

-## Screenshots
-### Preview
-looqs allow you to look inside files. It marks what you have searched for.

+## Screenshots
+The screenshots in this section may occasionally be slightly outdated, but they are usually recent enough to get an overall impression of the current state.
+
+### List
+![Screenshot looqs results](https://garage.quitesimple.org/assets/looqs/opearting_systems_looqs.png)
+
+### Preview
 ![Screenshot looqs](https://garage.quitesimple.org/assets/looqs/orwell.png)
 ![Screenshot looqs search fstream](https://garage.quitesimple.org/assets/looqs/fstream_write.png)

-### Results list
-#### Classic results list
-Just enter what you want to find, it will search paths and file content.
-![Screenshot looqs results](https://garage.quitesimple.org/assets/looqs/looqs_diary.png)
-
-#### Searching with filters
-You can be more specific to get what you want with filters
-
-**Filters (long form)**
-![Screenshot looqs results](https://garage.quitesimple.org/assets/looqs/opearting_systems_looqs.png)
-
-**Filters (short form)**
-
-There is no need to write the long form of filters. There are also booleans available
-
-![Screenshot looqs results](https://garage.quitesimple.org/assets/looqs/looqs_beatles_marley.png)
-
-The screenshots in this section may occasionally be slightly outdated, but they are usually recent enough to get an overall impression of the current state of the GUI.

 ## Current status
-Latest version: 2022-06-29, v0.4
+Last version: 2022-0X-XX, v0.1

 Please see [Changelog](CHANGELOG.md) for a human readable list of changes.

@ -37,40 +23,26 @@ Please see [Changelog](CHANGELOG.md) for a human readable list of changes.
 ## Goals and principles
 * **Find & Preview**. Instead of merely telling you where your search phrase has been found, it should also render the corresponding portion/pages of the documents and highlight the searched words.
 * **No daemons**. As some other desktop search projects are prone to have annoying daemons running that eat system resources away, this solution should make do without daemons where possible.
- * **Easy setup**. Similarly, there should be no need for heavy-weight databases. Instead, looqs tries to squeeze out the most from simple approaches. In particular, it relies on sqlite.
+ * **Easy setup**. Similiarly, there should be no need for heavy-weight databases. Instead, this solution tries to squeeze out the most from simple approaches. In particular, it relies on sqlite.
 * **GUI & CLI**. Provide CLI interfaces and GUI interfaces
 * **Sandboxing**. As reading and rendering lots of formats naturally opens the door for security bugs, those tasks are offloaded to small, sandboxed sub-processes to mitigate the effect of exploited vulnerabilities.

-
-## Features
- GUI, CLI interface
- Indexing of file path and some metadata.
- Indexing of file file content for FTS search. Currently: .pdf, odt, docx, plaintext.
- Preview of file formats: Currently: .pdf, plaintext
- Highlight searched terms.
- Quickly open PDF viewer or text editor at location of preview
- Search filters
-
 ## Supported platforms
 Linux (on amd64) is currently the main focus. Currently, I don't plan on supporting anything else and the sandboxing architecture does not make it likely. I suppose a version without sandboxing might be conceivable for other platforms, but I have no plans or resources to actively target anything but Linux at this point.

 ### Licence
 GPLv3.

-For the dependencies/third-party libraries, see: LICENSE-3RD-PARTY
-
 ### Contributing
-Please see the [Contribution guidelines](CONTRIBUTING.md) file.
+For now, github issues and pull-requests are preferred, but you can also just email
+your patches or issues to: looqs at quitesimple.org

-## Documentation
-Please see [USAGE.md](USAGE.md) for the user manual. There is also [HACKING.md](HACKING.md) with more technical information.
+Please target the 'dev' branch in your pull request. 


 ## Build

 ### Ubuntu 21.10/22.04
-
-To build on Ubuntu and Debian, clone the repo and then run:
 ```
 git submodule init
 git submodule update
@ -79,63 +51,11 @@ qmake
 make
 ```

-### Void
-```
-# as root
-xbps-install qt5-devel poppler-qt5-devel quazip-qt5-devel uchardet-devel gcc make
-# as user
-git submodule init
-git submodule update
-qmake
-make
-```
-
 The GUI is located in `gui/looqs-gui`, the binary for the CLI is in `cli/looqs`

+
+## Documentation
+Please see [USAGE.md](USAGE.md) for the user manual.
+
 ## Packages
-At this point, looqs is not in any official distro package repo, but I maintain some packages.
-
-### Ubuntu 21.10/22.04
-Latest release can be installed using apt from the repo.
-```
-# First, obtain key, assume it's trusted.
-wget -O- https://repo.quitesimple.org/repo.quitesimple.org.asc  | gpg --dearmor > repo.quitesimple.org-keyring.gpg
-cat repo.quitesimple.org-keyring.gpg | sudo tee -a /usr/share/keyrings/repo.quitesimple.org.gpg > /dev/null
-
-echo "deb [arch=amd64 signed-by=/usr/share/keyrings/repo.quitesimple.org.gpg] https://repo.quitesimple.org/debian/ $(lsb_release -sc) main" | sudo tee /etc/apt/sources.list.d/quitesimple.list
-sudo apt-get update
-sudo apt-get install looqs
-```
-
-### Prebuilt tarball (distro-agnostic) (EXPERIMENTAL)
-looqs is also distributed as a tarball containing prebuilt binaries and its library dependencies. The tarball is
-built using the Gentoo Hardened toolchain and the Qt version is smaller than what distributions usually
-include. It does not include libraries that should mess with fontrendering or the graphics stack. The binaries should run on any recent Linux distribution (requires glibc 2.34 or newer at least) and expects
-dependencies such as libGL to be provided by your distribution already (should be the case).
-
-It's considered experimental for two reasons. Firstly, looqs has no updater (yet). You will have to manually check for updates. Secondly, I can't guarantee that I'll be quick with updates of the tarball specifically if the library versions become outdated between looqs updates.
-
-You are therefore encouraged to use distro-native packages or to build it yourself if possible.
-
-The tarball can be obtained here: https://repo.quitesimple.org/tarball/looqs
-
-Quick start:
-
-```
-# Verify sig, see the end of this document: gpg --verify looqs-v0.4.tar.xz.sig
-tar xf looqs-v0.4.tar.xz # Replace with the actual version you have obtained
-cd looqs-v0.4
-./looqs-gui # or ./looqs for the CLI
-```
-
-An AppImage may accompany the tarball in the future.
-
-
-### Other distros
-I'll probably add a package for voidlinux at some point and maybe will provide a Gentoo ebuild. However, I would appreciate help for others distros. If you create a package, let me know!
-
-
-### Signature verification
-Release tags can be verified with  [my PGP public key](https://quitesimple.org/share/pubkey). For what little it's worth, its fingerprint is: `C342 CA02 D2EC 2E14 F3C3  D5FF 7F7B 4C08 02CD 02F2`
-
-Packages can be verified with the [repo-specific public key](https://repo.quitesimple.org/repo.quitesimple.org.asc). For what little it's worth, its fingerprint is: `1B49 45B3 16B2 468A 3DAC  C1E0 75EF 3FE8 D753 C8F9`
+Coming soon™
--- a/USAGE.md
+++ b/USAGE.md
@ -20,12 +20,15 @@ To give you some idea: At the time this section was written, 167874 files were i
 has changed. 

 ## Config
-The config file is in `$HOME/.config/quitesimple.org/looqs.conf`. It will be created on first execution of the CLI or GUI interface. Generally, you should not edit this file directly. Instead, use the "Settings" tab in the GUI.
+The config file is in `$HOME/.config/quitesimple.org/looqs.conf`. It will be created on first execution of the CLI or GUI
+interface. The GUI has a menu entry to quickly open this config file. This is to be considered temporary and will be removed once the GUI itself can edit all settings.

-Database default path: `$HOME/.local/share/quitesimple.org/looqs/looqs.sqlite`. If you prefer a different path, move it and adjust the path.
+Database default path: `$HOME/.local/share/quitesimple.org/looqs/looqs.sqlite`. If this does not work for
+you, move it and adjust adjust the path in the config file.


 ## GUI
+The GUI is minimal at this point. Depending on what you want to do, you may need to open the config file and change the settings there. Chances are that you may not need to do that. 

 ### First run
 You will be presented with an empty list. Go to the **"Index"** tab, add some directories and click **"Start indexing"**.
@ -44,7 +47,8 @@ see this document at the end. By default, both the full path and the content are
 ### Configuring PDF viewer
 It's most convenient if, when you click on a preview, the PDF reader opens the page you clicked. For that, looqs needs to know which viewer you want to launch.

-It tries to auto detect some common viewers. You must set the value in the "Settings" tab yourself if it doesn't do something you like, such as not opening your favorite viewer. In the command line options, "%f" represents the filepath, "%p" the page number.
+It tries to auto detect some common viewers. You must set the value of the ```pdfviewer=``` config entry yourself if it doesn't do something you
+like, such as not opening your favorite viewer. In the command line options, "%f" represents the filepath, "%p" the page number.

 ### Preview tab
 The preview tab shows previews. It marks your search keywords too. Click on a preview to open the file.
--- a/cli/cli.pro
+++ b/cli/cli.pro
@ -37,12 +37,6 @@ else:unix: LIBS += -L$$OUT_PWD/../shared/ -lshared

 LIBS += -luchardet -lpoppler-qt5 -lquazip5

-packagesExist(quazip1-qt5) {
-	PKGCONFIG += quazip1-qt5
-	CONFIG += link_pkgconfig
-	LIBS -= -lquazip5
-}
-
 INCLUDEPATH += $$PWD/../shared
 DEPENDPATH += $$PWD/../shared

--- a/cli/commandadd.cpp
+++ b/cli/commandadd.cpp
@ -29,12 +29,8 @@ void CommandAdd::indexerFinished()
 		}
 	}

-	int ret = 0;
-	if(!keepGoing && failedPathsCount > 0)
-	{
-		ret = 1;
-	}
-	emit finishedCmd(ret);
+	/* TODO maybe not 0 if keepGoing not given */
+	emit finishedCmd(0);
 }

 int CommandAdd::handle(QStringList arguments)
@ -44,14 +40,15 @@ 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. "},
+					   {{"v", "verbose"}, "Print skipped and added files"},
 					   {{"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.addPositionalArgument("add", "Add paths to the index", "add [paths...]");

 	parser.process(arguments);
-	this->keepGoing = parser.isSet("continue");
+	bool keepGoing = parser.isSet("continue");
+	bool verbose = parser.isSet("verbose");
 	if(parser.isSet("threads"))
 	{
 		QString threadsCount = parser.value("threads");
@ -73,15 +70,17 @@ int CommandAdd::handle(QStringList arguments)

 	indexer = new Indexer(*this->dbService);
 	indexer->setTargetPaths(files.toVector());
-	indexer->setKeepGoing(keepGoing);

 	connect(indexer, &Indexer::pathsCountChanged, this,
 			[](int pathsCount) { Logger::info() << "Found paths: " << pathsCount << Qt::endl; });
+
 	connect(indexer, &Indexer::indexProgress, this,
 			[](int pathsCount, unsigned int added, unsigned int skipped, unsigned int failed, unsigned int totalCount)
 			{ Logger::info() << "Processed files: " << pathsCount << Qt::endl; });
 	connect(indexer, &Indexer::finished, this, &CommandAdd::indexerFinished);

+	/* TODO: keepGoing, verbose */
+
 	this->autoFinish = false;
 	indexer->beginIndexing();

--- a/cli/commandadd.h
+++ b/cli/commandadd.h
@ -10,7 +10,6 @@ class CommandAdd : public Command
  private:
 	SaveFileResult addFile(QString path);
 	Indexer *indexer;
-	bool keepGoing = true;

  protected:
  public:
--- a/cli/main.cpp
+++ b/cli/main.cpp
@ -30,7 +30,6 @@
 void printUsage(QString argv0)
 {
 	qInfo() << "Usage:" << argv0 << "command";
-	qInfo() << "Valid commands: add, update, delete, search, list. Each command has a --help option.";
 }

 Command *commandFromName(QString name, SqliteDbService &dbService)
@ -98,7 +97,7 @@ int main(int argc, char *argv[])

 		QString file = args.at(1);
 		SandboxedProcessor processor(file);
-		return static_cast<int>(processor.process());
+		return processor.process();
 	}
 	Command *cmd = commandFromName(commandName, dbService);
 	if(cmd != nullptr)
@ -117,7 +116,7 @@ int main(int argc, char *argv[])
 	}
 	else
 	{
-		printUsage(argv0);
+		Logger::error() << "Unknown command:" << commandName << Qt::endl;
 		return 1;
 	}

--- a/gui/aboutdialog.cpp
+++ b/gui/aboutdialog.cpp
@ -1,74 +0,0 @@
-#include <QTabWidget>
-#include <QVBoxLayout>
-#include <QLabel>
-#include <QTextBrowser>
-#include <QPushButton>
-#include "aboutdialog.h"
-#include "common.h"
-
-AboutDialog::AboutDialog(QWidget *parent) : QDialog(parent)
-{
-	QVBoxLayout *layout = new QVBoxLayout(this);
-	QTabWidget *tabWidget = new QTabWidget(this);
-
-	this->setWindowTitle("About looqs");
-
-	QHBoxLayout *closeLayout = new QHBoxLayout();
-	QPushButton *closeButton = new QPushButton(this);
-	closeButton->setText("Close");
-	closeButton->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
-	connect(closeButton, &QPushButton::clicked, this, &QDialog::close);
-
-	closeLayout->setMargin(10);
-	closeLayout->addStretch(10);
-	closeLayout->addWidget(closeButton);
-
-	layout->addWidget(tabWidget);
-	layout->addLayout(closeLayout);
-	QFrame *frame = new QFrame(this);
-	QVBoxLayout *aboutLayout = new QVBoxLayout(frame);
-	frame->setLayout(aboutLayout);
-
-	QLabel *aboutLooqs = new QLabel(this);
-	QString html = "<h2>looqs</h2>";
-	html += "Full-text search with previews for your files<br><br>";
-	html += "Copyright (c) 2018-2022: Albert Schwarzkopf<br><br>";
-	html += QString("Version: %1<br><br>").arg(Common::versionText());
-	html += "Contact: looqs at quitesimple dot org<br><br>";
-	html += "Website: <a href=\"https://quitesimple.org\">https://quitesimple.org</a><br><br>";
-	html += "Source code: <a "
-			"href=\"https://github.com/quitesimpleorg/looqs\">https://github.com/quitesimpleorg/looqs</a><br><br>";
-	html += "License: GPLv3<br><br>";
-	html += "looqs is open source and free of charge in the hope it will be useful. The author(s) do not "
-			"give any warranty. In the unlikely event of any damage, the author(s) cannot be held responsible. "
-			"You are using looqs at your own risk<br><br>";
-	html += "looqs uses third-party libraries, please see the corresponding tab.";
-	aboutLooqs->setText(html);
-	aboutLooqs->setTextFormat(Qt::RichText);
-
-	QLabel *logo = new QLabel(this);
-	QImage image(QString(":/looqs.svg"));
-	logo->setPixmap(QPixmap::fromImage(image));
-
-	aboutLayout->addWidget(logo);
-	aboutLayout->addWidget(aboutLooqs);
-
-	tabWidget->addTab(frame, "About");
-
-	QFile license(QString(":/LICENSE"));
-	license.open(QIODevice::ReadOnly);
-	QString licenseText = license.readAll();
-
-	QFile thirdPartyLicense(QString(":./LICENSE-3RD-PARTY"));
-	thirdPartyLicense.open(QIODevice::ReadOnly);
-	QString thirdPartyLicenseInfo = thirdPartyLicense.readAll();
-
-	QTextBrowser *licenseTextBrowser = new QTextBrowser(this);
-	licenseTextBrowser->setText(licenseText);
-
-	QTextBrowser *thirdPartyLicenceTextBrowser = new QTextBrowser(this);
-	thirdPartyLicenceTextBrowser->setText(thirdPartyLicenseInfo);
-
-	tabWidget->addTab(licenseTextBrowser, "License");
-	tabWidget->addTab(thirdPartyLicenceTextBrowser, "Third-party libraries");
-}
--- a/gui/aboutdialog.h
+++ b/gui/aboutdialog.h
@ -1,12 +0,0 @@
-#ifndef ABOUTDIALOG_H
-#define ABOUTDIALOG_H
-#include <QDialog>
-
-class AboutDialog : public QDialog
-{
-	Q_OBJECT
-  public:
-	AboutDialog(QWidget *parent = nullptr);
-};
-
-#endif // ABOUTDIALOG_H
--- a/gui/gui.pro
+++ b/gui/gui.pro
@ -7,11 +7,7 @@
 QT       += core concurrent gui network

 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
-
 CONFIG += c++17
-
-
-
 TARGET = looqs-gui
 TEMPLATE = app

@ -27,7 +23,6 @@ DEFINES += QT_DEPRECATED_WARNINGS
 #DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000    # disables all the APIs deprecated before Qt 6.0.0

 SOURCES += \
-    aboutdialog.cpp \
    ipcpreviewclient.cpp \
    ipcpreviewworker.cpp \
    ipcserver.cpp \
@ -45,7 +40,6 @@ SOURCES += \
    rendertarget.cpp

 HEADERS += \
-    aboutdialog.h \
    ipc.h \
    ipcpreviewclient.h \
    ipcpreviewworker.h \
@ -75,12 +69,6 @@ else:unix: LIBS += -L$$OUT_PWD/../shared/ -lshared

 LIBS += -luchardet -lpoppler-qt5 -lquazip5

-packagesExist(quazip1-qt5) {
-	PKGCONFIG += quazip1-qt5
-	CONFIG += link_pkgconfig
-	LIBS -= -lquazip5
-}
-
 INCLUDEPATH += $$PWD/../shared
 DEPENDPATH += $$PWD/../shared

@ -90,4 +78,4 @@ else:win32:!win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$OUT_PW
 else:win32:!win32-g++:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../shared/debug/shared.lib
 else:unix: PRE_TARGETDEPS += $$OUT_PWD/../shared/libshared.a

-RESOURCES = ../looqs.svg
+RESOURCES = ../icon.svg
--- a/gui/main.cpp
+++ b/gui/main.cpp
@ -23,51 +23,25 @@ void enableIpcSandbox()
 		qCritical() << "Failed to init policy for sandbox";
 		exit(EXIT_FAILURE);
 	}
-	policy->namespace_options = EXILE_UNSHARE_USER | EXILE_UNSHARE_MOUNT | EXILE_UNSHARE_NETWORK;
+	policy->namespace_options = EXILE_UNSHARE_NETWORK | EXILE_UNSHARE_USER;
 	policy->no_new_privs = 1;
 	policy->drop_caps = 1;
-	policy->vow_promises = exile_vows_from_str("thread cpath rpath unix stdio proc error");
-	policy->mount_path_policies_to_chroot = 1;
+	policy->vow_promises =
+		exile_vows_from_str("thread cpath wpath rpath unix stdio prot_exec proc shm fsnotify ioctl error");

 	QString ipcSocketPath = Common::ipcSocketPath();
 	QFileInfo info{ipcSocketPath};
 	QString ipcSocketPathDir = info.absolutePath();
 	std::string stdIpcSocketPath = ipcSocketPathDir.toStdString();

-	/* we only need the 'server' side of the 'unix' vow (for unix sockets)'. The process
-	 * has no business to connect anywhere.
-	 *
-	 * Maybe this case should be handled by exile at some point, but for now deal with it here */
-	exile_append_syscall_policy(policy, EXILE_SYS(connect), EXILE_SYSCALL_DENY_RET_ERROR, NULL, 0);
-
-	/* ALLOW_EXEC is needed for fallback, not in landlock mode. It does not allow executing anything though here
-	 * due to the vows */
-	exile_append_path_policies(policy, EXILE_FS_ALLOW_ALL_READ | EXILE_FS_ALLOW_EXEC, "/");
-	exile_append_path_policies(policy, EXILE_FS_ALLOW_ALL_READ | EXILE_FS_ALLOW_ALL_WRITE | EXILE_FS_ALLOW_EXEC,
-							   stdIpcSocketPath.c_str());
+	exile_append_path_policies(policy, EXILE_FS_ALLOW_ALL_READ, "/");
+	exile_append_path_policies(policy, EXILE_FS_ALLOW_ALL_READ | EXILE_FS_ALLOW_ALL_WRITE, stdIpcSocketPath.c_str());
 	int ret = exile_enable_policy(policy);
 	if(ret != 0)
 	{
-		qDebug() << "Failed to establish sandbox" << Qt::endl;
+		qDebug() << "Failed to establish sandbox";
 		exit(EXIT_FAILURE);
 	}
-
-	/* Arguments are irrelevant for sandbox test, just want to silence analyzer/compiler warnings */
-	ret = socket(AF_INET, SOCK_STREAM, 0);
-	if(ret != -1 || errno != EACCES)
-	{
-		qCritical() << "Sandbox sanity check failed" << Qt::endl;
-		exit(EXIT_FAILURE);
-	}
-
-	const struct sockaddr *addr = {};
-	ret = connect(3, addr, sizeof(*addr));
-	if(ret != -1 || errno != EACCES)
-	{
-		qCritical() << "Sandbox sanity check failed" << Qt::endl;
-		exit(EXIT_FAILURE);
-	}
-
 	exile_free_policy(policy);
 }

@ -80,21 +54,14 @@ int main(int argc, char *argv[])
 		if(arg == "ipc")
 		{
 			Common::setupAppInfo();
-			if(Common::noSandboxModeRequested())
-			{
-				qInfo() << "Launching with no sandbox!" << Qt::endl;
-			}
-			else
-			{
-				enableIpcSandbox();
-			}
-			QCoreApplication a(argc, argv);
+			enableIpcSandbox();
+			QApplication a(argc, argv);

 			IpcServer *ipcserver = new IpcServer();
 			qDebug() << "Launching IPC Server";
 			if(!ipcserver->startSpawner(socketPath))
 			{
-				qCritical() << "Error failed to spawn" << Qt::endl;
+				qCritical() << "Error failed to spawn";
 				return 1;
 			}
 			qDebug() << "Launched IPC Server";
@ -114,7 +81,7 @@ int main(int argc, char *argv[])

 			QString file = args.at(2);
 			SandboxedProcessor processor(file);
-			return static_cast<int>(processor.process());
+			return processor.process();
 		}
 	}
 	QString ipcSocketPath = Common::ipcSocketPath();
@ -142,6 +109,7 @@ int main(int argc, char *argv[])
 	}
 	Common::setupAppInfo();
 	QCommandLineParser parser;
+	parser.addOption({{"s", "no-sandbox"}, "Disable sandboxing"});
 	QStringList appArgs;
 	for(int i = 0; i < argc; i++)
 	{
@ -149,7 +117,6 @@ int main(int argc, char *argv[])
 	}
 	parser.parse(appArgs);

-	QApplication a(argc, argv);
 	try
 	{
 		Common::ensureConfigured();
@ -160,7 +127,8 @@ int main(int argc, char *argv[])
 		QMessageBox::critical(nullptr, "Error", e.message);
 		return 1;
 	}
-	a.setWindowIcon(QIcon(":/looqs.svg"));
+	QApplication a(argc, argv);
+	a.setWindowIcon(QIcon(":/icon.svg"));
 	QObject::connect(&a, &QApplication::aboutToQuit, &process, &QProcess::kill);

 	qRegisterMetaType<QVector<SearchResult>>("QVector<SearchResult>");
--- a/gui/mainwindow.cpp
+++ b/gui/mainwindow.cpp
@ -23,7 +23,6 @@
 #include "../shared/common.h"
 #include "ipcpreviewclient.h"
 #include "previewgenerator.h"
-#include "aboutdialog.h"

 MainWindow::MainWindow(QWidget *parent, QString socketPath)
 	: QMainWindow(parent), ui(new Ui::MainWindow), progressDialog(this)
@ -41,7 +40,6 @@ MainWindow::MainWindow(QWidget *parent, QString socketPath)
 			{
 				this->ui->previewProcessBar->setValue(this->ui->previewProcessBar->maximum());
 				this->ui->spinPreviewPage->setEnabled(true);
-				this->ui->comboPreviewFiles->setEnabled(true);
 			});
 	connect(&ipcPreviewClient, &IPCPreviewClient::error, this,
 			[this](QString msg)
@ -84,13 +82,6 @@ MainWindow::MainWindow(QWidget *parent, QString socketPath)

 	ui->spinPreviewPage->setValue(1);
 	ui->spinPreviewPage->setMinimum(1);
-
-	ui->btnOpenFailed->setVisible(false);
-	ui->comboPreviewFiles->setVisible(false);
-
-	auto policy = ui->btnOpenFailed->sizePolicy();
-	policy.setRetainSizeWhenHidden(true);
-	ui->btnOpenFailed->setSizePolicy(policy);
 }

 void MainWindow::addPathToIndex()
@ -181,12 +172,31 @@ void MainWindow::connectSignals()
 					}
 				}
 			});
-	connect(ui->menuAboutAction, &QAction::triggered, this,
+	connect(
+		ui->menuAboutAction, &QAction::triggered, this,
+		[this](bool checked)
+		{
+			QString html = "<h2>looqs</h2>";
+			html += "Full-text search with previews for your files<br><br>";
+			html += "Copyright (c) 2018-2022: Albert Schwarzkopf<br><br>";
+			html += QString("Version: %1<br><br>").arg(Common::versionText());
+			html += "Contact: looqs at quitesimple dot org<br><br>";
+			html += "Website: <a href=\"https://quitesimple.org\">https://quitesimple.org</a><br><br>";
+			html +=
+				"Source code: <a "
+				"href=\"https://github.com/quitesimpleorg/looqs\">https://github.com/quitesimpleorg/looqs</a><br><br>";
+			html += "License: GPLv3<br><br><br>";
+			html += "looqs is open source and free of charge in the hope it will be useful. The author(s) do not "
+					"give any warranty. In the unlikely event of any damage, the author(s) cannot be held responsible. "
+					"You are using looqs at your own risk";
+
+			QMessageBox::about(this, "About looqs", html);
+		});
+	connect(ui->menuOpenConfigInTextEditorAction, &QAction::triggered, this,
 			[this](bool checked)
 			{
-				AboutDialog aboutDialog(this);
-
-				aboutDialog.exec();
+				QSettings setting;
+				QDesktopServices::openUrl(setting.fileName());
 			});
 	connect(ui->menuAboutQtAction, &QAction::triggered, this,
 			[this](bool checked) { QMessageBox::aboutQt(this, "About Qt"); });
@ -205,36 +215,6 @@ void MainWindow::connectSignals()
 			});
 	connect(this, &MainWindow::beginIndexSync, indexSyncer, &IndexSyncer::sync);
 	connect(&this->progressDialog, &QProgressDialog::canceled, indexSyncer, &IndexSyncer::cancel);
-	connect(ui->btnSaveSettings, &QPushButton::clicked, this, &MainWindow::saveSettings);
-	connect(ui->btnOpenFailed, &QPushButton::clicked, this, &MainWindow::exportFailedPaths);
-	connect(
-		ui->comboPreviewFiles, qOverload<int>(&QComboBox::currentIndexChanged), this, [&]() { makePreviews(1); },
-		Qt::QueuedConnection);
-}
-
-void MainWindow::exportFailedPaths()
-{
-
-	QString filename =
-		QString("/tmp/looqs_indexresult_failed_%1").arg(QDateTime::currentDateTime().toString("yyyy-MM-dd_hhmmss"));
-	QFile outFile(filename);
-	if(!outFile.open(QIODevice::WriteOnly | QIODevice::Text))
-	{
-		QMessageBox::critical(this, "Failed to write log file", "An error occured while trying to create log file");
-		return;
-	}
-
-	QTextStream stream(&outFile);
-
-	IndexResult result = this->indexer->getResult();
-
-	stream << "Failed to index the following paths:\n";
-	for(FileScanResult &fsr : result.failedResults())
-	{
-		stream << fsr.first << " " << SaveFileResultToString(fsr.second) << '\n';
-	}
-
-	QDesktopServices::openUrl(filename);
 }

 void MainWindow::startIndexSync()
@ -256,7 +236,6 @@ void MainWindow::startIndexSync()

 	emit beginIndexSync();
 }
-
 void MainWindow::spinPreviewPageValueChanged(int val)
 {
 	makePreviews(val);
@ -274,12 +253,10 @@ void MainWindow::startIndexing()

 	ui->previewsTab->setEnabled(false);
 	ui->resultsTab->setEnabled(false);
-	ui->settingsTab->setEnabled(false);
 	ui->txtPathScanAdd->setEnabled(false);
 	ui->txtSearch->setEnabled(false);
 	ui->previewProcessBar->setValue(0);
 	ui->previewProcessBar->setVisible(true);
-	ui->btnOpenFailed->setVisible(false);

 	QVector<QString> paths;
 	QStringList pathSettingsValue;
@ -312,13 +289,8 @@ void MainWindow::finishIndexing()
 	ui->btnStartIndexing->setText("Start indexing");
 	ui->previewsTab->setEnabled(true);
 	ui->resultsTab->setEnabled(true);
-	ui->settingsTab->setEnabled(true);
 	ui->txtPathScanAdd->setEnabled(true);
 	ui->txtSearch->setEnabled(true);
-	if(result.erroredPaths > 0)
-	{
-		ui->btnOpenFailed->setVisible(true);
-	}
 }

 void MainWindow::comboScaleChanged(int i)
@ -379,49 +351,6 @@ void MainWindow::tabChanged()
 			makePreviews(ui->spinPreviewPage->value());
 		}
 	}
-	/* Settings tab active */
-	if(ui->tabWidget->currentIndex() == 3)
-	{
-		initSettingsTabs();
-	}
-}
-
-void MainWindow::initSettingsTabs()
-{
-	QSettings settings;
-
-	QString pdfViewerCmd = settings.value(SETTINGS_KEY_PDFVIEWER).toString();
-	QString excludedPaths = Common::excludedPaths().join(';');
-	QString mountPaths = Common::mountPaths().join(';');
-	QString databasePath = Common::databasePath();
-	int numPagesPerPreview = settings.value(SETTINGS_KEY_PREVIEWSPERPAGE, 20).toInt();
-
-	ui->txtSettingPdfPreviewerCmd->setText(pdfViewerCmd);
-	ui->txtSettingIgnoredPaths->setText(excludedPaths);
-	ui->txtSettingMountPaths->setText(mountPaths);
-	ui->spinSettingNumerPerPages->setValue(numPagesPerPreview);
-	ui->txtSettingDatabasePath->setText(databasePath);
-}
-
-void MainWindow::saveSettings()
-{
-	QSettings settings;
-
-	QString pdfViewerCmd = ui->txtSettingPdfPreviewerCmd->text();
-	QStringList excludedPaths = ui->txtSettingIgnoredPaths->text().split(';');
-	QStringList mountPaths = ui->txtSettingMountPaths->text().split(';');
-	QString databasePath = ui->txtSettingDatabasePath->text();
-
-	settings.setValue(SETTINGS_KEY_PDFVIEWER, pdfViewerCmd);
-	settings.setValue(SETTINGS_KEY_EXCLUDEDPATHS, excludedPaths);
-	settings.setValue(SETTINGS_KEY_MOUNTPATHS, mountPaths);
-	settings.setValue(SETTINGS_KEY_PREVIEWSPERPAGE, ui->spinSettingNumerPerPages->value());
-	settings.setValue(SETTINGS_KEY_DBPATH, databasePath);
-
-	settings.sync();
-
-	QProcess::startDetached(qApp->arguments()[0], qApp->arguments().mid(1));
-	qApp->quit();
 }

 void MainWindow::previewReceived(QSharedPointer<PreviewResult> preview, unsigned int previewGeneration)
@ -460,7 +389,7 @@ void MainWindow::lineEditReturnPressed()
 		ui->lblSearchResults->setText("Invalid paranthesis");
 		return;
 	}
-	if(ui->tabWidget->currentIndex() > 1)
+	if(indexerTabActive())
 	{
 		ui->tabWidget->setCurrentIndex(0);
 	}
@ -507,9 +436,6 @@ void MainWindow::handleSearchResults(const QVector<SearchResult> &results)
 {
 	this->previewableSearchResults.clear();
 	ui->treeResultsList->clear();
-	ui->comboPreviewFiles->clear();
-	ui->comboPreviewFiles->addItem("All previews");
-	ui->comboPreviewFiles->setVisible(true);

 	bool hasDeleted = false;
 	for(const SearchResult &result : results)
@ -528,17 +454,11 @@ void MainWindow::handleSearchResults(const QVector<SearchResult> &results)
 		bool exists = pathInfo.exists();
 		if(exists)
 		{
-			if(!result.wasContentSearch)
-			{
-				continue;
-			}
-
 			if(!pathInfo.suffix().contains("htm")) // hack until we can preview them properly...
 			{
 				if(PreviewGenerator::get(pathInfo) != nullptr)
 				{
 					this->previewableSearchResults.append(result);
-					ui->comboPreviewFiles->addItem(result.fileData.absPath);
 				}
 			}
 		}
@ -582,7 +502,7 @@ void MainWindow::makePreviews(int page)
 	scaleText.chop(1);

 	QVector<QString> wordsToHighlight;
-	QRegularExpression extractor(R"#("([^"]*)"|((\p{L}|\p{N})+))#");
+	QRegularExpression extractor(R"#("([^"]*)"|(\w+))#");
 	for(const Token &token : this->contentSearchQuery.getTokens())
 	{
 		if(token.type == FILTER_CONTENT_CONTAINS)
@ -616,13 +536,6 @@ void MainWindow::makePreviews(int page)
 	QVector<RenderTarget> targets;
 	for(SearchResult &sr : this->previewableSearchResults)
 	{
-		if(ui->comboPreviewFiles->currentIndex() != 0)
-		{
-			if(sr.fileData.absPath != ui->comboPreviewFiles->currentText())
-			{
-				continue;
-			}
-		}
 		RenderTarget renderTarget;
 		renderTarget.path = sr.fileData.absPath;

@ -643,7 +556,6 @@ void MainWindow::makePreviews(int page)
 	ui->previewProcessBar->setVisible(this->previewableSearchResults.size() > 0);
 	++this->currentPreviewGeneration;
 	this->ui->spinPreviewPage->setEnabled(false);
-	this->ui->comboPreviewFiles->setEnabled(false);
 	emit startIpcPreviews(renderConfig, targets);
 }

@ -659,20 +571,6 @@ void MainWindow::createSearchResutlMenu(QMenu &menu, const QFileInfo &fileInfo)
 	menu.addAction("Copy full path to clipboard",
 				   [&fileInfo] { QGuiApplication::clipboard()->setText(fileInfo.absoluteFilePath()); });
 	menu.addAction("Open containing folder", [this, &fileInfo] { this->openFile(fileInfo.absolutePath()); });
-
-	auto result =
-		std::find_if(this->previewableSearchResults.begin(), this->previewableSearchResults.end(),
-					 [this, &fileInfo](SearchResult &a) { return fileInfo.absoluteFilePath() == a.fileData.absPath; });
-
-	if(result != this->previewableSearchResults.end())
-	{
-		menu.addAction("Show previews for this file",
-					   [this, &fileInfo]
-					   {
-						   ui->tabWidget->setCurrentIndex(1);
-						   this->ui->comboPreviewFiles->setCurrentText(fileInfo.absoluteFilePath());
-					   });
-	}
 }

 void MainWindow::openDocument(QString path, int num)
--- a/gui/mainwindow.h
+++ b/gui/mainwindow.h
@ -61,7 +61,6 @@ class MainWindow : public QMainWindow
 	void openDocument(QString path, int num);
 	void openFile(QString path);
 	unsigned int currentPreviewGeneration = 1;
-	void initSettingsTabs();
  private slots:
 	void lineEditReturnPressed();
 	void treeSearchItemActivated(QTreeWidgetItem *item, int i);
@ -74,8 +73,6 @@ class MainWindow : public QMainWindow
 	void finishIndexing();
 	void addPathToIndex();
 	void startIndexSync();
-	void saveSettings();
-	void exportFailedPaths();

  signals:
 	void startIpcPreviews(RenderConfig config, const QVector<RenderTarget> &targets);
--- a/gui/mainwindow.ui
+++ b/gui/mainwindow.ui
@ -6,8 +6,8 @@
   <rect>
    <x>0</x>
    <y>0</y>
-    <width>1280</width>
-    <height>855</height>
+    <width>1221</width>
+    <height>709</height>
   </rect>
  </property>
  <property name="windowTitle">
@ -27,7 +27,7 @@
       <enum>QTabWidget::South</enum>
      </property>
      <property name="currentIndex">
-       <number>1</number>
+       <number>0</number>
      </property>
      <widget class="QWidget" name="resultsTab">
       <attribute name="title">
@ -81,8 +81,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-             <width>1244</width>
-             <height>565</height>
+             <width>1185</width>
+             <height>419</height>
            </rect>
           </property>
           <layout class="QHBoxLayout" name="horizontalLayout"/>
@ -162,16 +162,6 @@
            </property>
           </widget>
          </item>
-          <item>
-           <widget class="QComboBox" name="comboPreviewFiles">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-           </widget>
-          </item>
          <item>
           <spacer name="horizontalSpacer">
            <property name="orientation">
@ -194,16 +184,6 @@
        <string>Index</string>
       </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">
@ -263,12 +243,6 @@
            <layout class="QHBoxLayout" name="horizontalLayout_7">
             <item>
              <widget class="QLabel" name="lblPathsFound">
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
               <property name="text">
                <string>Paths found:</string>
               </property>
@ -276,42 +250,17 @@
             </item>
             <item>
              <widget class="QLabel" name="lblPathsFoundValue">
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
               <property name="text">
                <string/>
               </property>
              </widget>
             </item>
-             <item>
-              <spacer name="horizontalSpacer_5">
-               <property name="orientation">
-                <enum>Qt::Horizontal</enum>
-               </property>
-               <property name="sizeHint" stdset="0">
-                <size>
-                 <width>40</width>
-                 <height>20</height>
-                </size>
-               </property>
-              </spacer>
-             </item>
            </layout>
           </item>
           <item>
            <layout class="QHBoxLayout" name="horizontalLayout_4">
             <item>
              <widget class="QLabel" name="lblAdded">
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
               <property name="font">
                <font>
                 <weight>50</weight>
@ -325,42 +274,17 @@
             </item>
             <item>
              <widget class="QLabel" name="lblAddedValue">
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
               <property name="text">
                <string/>
               </property>
              </widget>
             </item>
-             <item>
-              <spacer name="horizontalSpacer_4">
-               <property name="orientation">
-                <enum>Qt::Horizontal</enum>
-               </property>
-               <property name="sizeHint" stdset="0">
-                <size>
-                 <width>40</width>
-                 <height>20</height>
-                </size>
-               </property>
-              </spacer>
-             </item>
            </layout>
           </item>
           <item>
            <layout class="QHBoxLayout" name="horizontalLayout_5">
             <item>
              <widget class="QLabel" name="lblSkipped">
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
               <property name="font">
                <font>
                 <weight>50</weight>
@ -374,42 +298,17 @@
             </item>
             <item>
              <widget class="QLabel" name="lblSkippedValue">
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
               <property name="text">
                <string/>
               </property>
              </widget>
             </item>
-             <item>
-              <spacer name="horizontalSpacer_3">
-               <property name="orientation">
-                <enum>Qt::Horizontal</enum>
-               </property>
-               <property name="sizeHint" stdset="0">
-                <size>
-                 <width>40</width>
-                 <height>20</height>
-                </size>
-               </property>
-              </spacer>
-             </item>
            </layout>
           </item>
           <item>
            <layout class="QHBoxLayout" name="horizontalLayout_6">
             <item>
              <widget class="QLabel" name="lblFailed">
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
               <property name="font">
                <font>
                 <weight>50</weight>
@ -423,171 +322,23 @@
             </item>
             <item>
              <widget class="QLabel" name="lblFailedValue">
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
               <property name="text">
                <string/>
               </property>
              </widget>
             </item>
-             <item>
-              <widget class="QPushButton" name="btnOpenFailed">
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
-               <property name="text">
-                <string>Open log of failed paths</string>
-               </property>
-              </widget>
-             </item>
            </layout>
           </item>
          </layout>
         </widget>
        </item>
-       </layout>
-      </widget>
-      <widget class="QWidget" name="settingsTab">
-       <attribute name="title">
-        <string>Settings</string>
-       </attribute>
-       <layout class="QVBoxLayout" name="verticalLayout_6">
-        <item>
-         <widget class="QGroupBox" name="groupPdfSettings">
-          <property name="title">
-           <string>PDF Viewer</string>
-          </property>
-          <layout class="QVBoxLayout" name="verticalLayout_5">
-           <item>
-            <widget class="QLabel" name="label_2">
-             <property name="text">
-              <string>Command to open PDF pages in (%f = file path; %p = page number)</string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QLineEdit" name="txtSettingPdfPreviewerCmd"/>
-           </item>
-          </layout>
-         </widget>
+        <item row="6" column="0">
+         <widget class="QLineEdit" name="txtIgnorePatterns"/>
        </item>
-        <item>
-         <widget class="QGroupBox" name="groupMountPaths">
-          <property name="title">
-           <string>Mount paths</string>
-          </property>
-          <layout class="QVBoxLayout" name="verticalLayout_7">
-           <item>
-            <widget class="QLabel" name="lblMountPaths">
-             <property name="text">
-              <string>Path prefixes of files that should not be removed during sync, even if they cannot be accessed (e . g. files indexed on external disks) . Separated by ;</string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QLineEdit" name="txtSettingMountPaths"/>
-           </item>
-          </layout>
-         </widget>
-        </item>
-        <item>
-         <widget class="QGroupBox" name="groupBox">
-          <property name="title">
-           <string>Ignored paths</string>
-          </property>
-          <layout class="QVBoxLayout" name="verticalLayout_8">
-           <item>
-            <widget class="QLabel" name="label_3">
-             <property name="text">
-              <string>Path prefixes that should always be ignored during indexing (will be applied before the ignore patterns). Separated by ;</string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QLineEdit" name="txtSettingIgnoredPaths"/>
-           </item>
-          </layout>
-         </widget>
-        </item>
-        <item>
-         <widget class="QGroupBox" name="groupSettingDatabasePath">
-          <property name="title">
-           <string>Database path</string>
-          </property>
-          <layout class="QVBoxLayout" name="verticalLayout_10">
-           <item>
-            <widget class="QLabel" name="lblSettingDatabasePath">
-             <property name="text">
-              <string>Path of the database. Note: Changing it here will create an empty, new database. The old will not be moved.  </string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QLineEdit" name="txtSettingDatabasePath"/>
-           </item>
-          </layout>
-         </widget>
-        </item>
-        <item>
-         <widget class="QGroupBox" name="Misc">
-          <property name="title">
-           <string>Misc</string>
-          </property>
-          <layout class="QVBoxLayout" name="verticalLayout_9">
-           <item>
-            <layout class="QHBoxLayout" name="horizontalLayout_9">
-             <item>
-              <widget class="QLabel" name="label_4">
-               <property name="text">
-                <string>Max number of previews per 'page' in 'Previews' tab: </string>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="QSpinBox" name="spinSettingNumerPerPages"/>
-             </item>
-             <item>
-              <spacer name="horizontalSpacer_2">
-               <property name="orientation">
-                <enum>Qt::Horizontal</enum>
-               </property>
-               <property name="sizeHint" stdset="0">
-                <size>
-                 <width>40</width>
-                 <height>20</height>
-                </size>
-               </property>
-              </spacer>
-             </item>
-            </layout>
-           </item>
-          </layout>
-         </widget>
-        </item>
-        <item>
-         <spacer name="verticalSpacer">
-          <property name="orientation">
-           <enum>Qt::Vertical</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>20</width>
-            <height>40</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-        <item>
-         <widget class="QPushButton" name="btnSaveSettings">
+        <item row="10" column="0">
+         <widget class="QPushButton" name="btnStartIndexing">
          <property name="text">
-           <string>Save settings and restart</string>
+           <string>Start indexing</string>
          </property>
         </widget>
        </item>
@ -617,7 +368,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-     <width>1280</width>
+     <width>1221</width>
     <height>35</height>
    </rect>
   </property>
@ -625,6 +376,7 @@
    <property name="title">
     <string>looqs</string>
    </property>
+    <addaction name="menuOpenConfigInTextEditorAction"/>
    <addaction name="menuSyncIndexAction"/>
    <addaction name="menuAboutAction"/>
    <addaction name="menuAboutQtAction"/>
@ -637,6 +389,11 @@
    <string>About</string>
   </property>
  </action>
+  <action name="menuOpenConfigInTextEditorAction">
+   <property name="text">
+    <string>Open config in text editor</string>
+   </property>
+  </action>
  <action name="menuAboutQtAction">
   <property name="text">
    <string>About Qt</string>
--- a/looqs.svg
+++ b/looqs.svg
--- a/looqs.desktop
+++ b/looqs.desktop
@ -1,6 +1,6 @@
 [Desktop Entry]
 Name=looqs
-Exec=looqs-gui
+Exec=/usr/bin/looqs-gui
 Terminal=false
 Type=Application
 Icon=looqs
--- a/shared/common.cpp
+++ b/shared/common.cpp
@ -14,10 +14,15 @@
 #include "databasefactory.h"
 #include "logger.h"

+#define SETTINGS_KEY_DBPATH "dbpath"
+#define SETTINGS_KEY_FIRSTRUN "firstrun"
+#define SETTINGS_KEY_IPCSOCKETPATH "ipcsocketpath"
+#define SETTINGS_KEY_PDFVIEWER "pdfviewer"
+#define SETTINGS_KEY_EXCLUDEDPATHS "excludedpaths"
+
 inline void initResources()
 {
 	Q_INIT_RESOURCE(migrations);
-	Q_INIT_RESOURCE(plaintexts);
 }

 bool Common::initSqliteDatabase(QString path)
@ -69,11 +74,11 @@ void Common::setPdfViewer()
 	}
 	else if(evincePath != "")
 	{
-		value = evincePath + " -i %p %f";
+		value = evincePath + "-i %p %f";
 	}
 	else if(qpdfviewPath != "")
 	{
-		value = qpdfviewPath + " %f#%p";
+		value = qpdfviewPath + "%f#%p";
 	}

 	QSettings settings;
@ -85,10 +90,10 @@ void Common::setPdfViewer()
 void Common::ensureConfigured()
 {
 	QSettings settings;
-	QString dbpath = databasePath();
-	if(dbpath == "")
+	QVariant firstRun = settings.value(SETTINGS_KEY_FIRSTRUN);
+	if(!firstRun.isValid())
 	{
-		dbpath = QStandardPaths::writableLocation(QStandardPaths::AppLocalDataLocation);
+		QString dbpath = QStandardPaths::writableLocation(QStandardPaths::AppLocalDataLocation);
 		QDir dir;
 		if(!dir.exists(dbpath))
 		{
@ -98,35 +103,39 @@ void Common::ensureConfigured()
 			}
 		}
 		dbpath += "/looqs.sqlite";
-	}
-	if(!QFile::exists(dbpath))
-	{
 		if(!initSqliteDatabase(dbpath))
 		{
 			throw LooqsGeneralException("Failed to initialize sqlite database");
 		}
+
+		settings.setValue(SETTINGS_KEY_FIRSTRUN, false);
 		settings.setValue(SETTINGS_KEY_DBPATH, dbpath);
-	}
-	DatabaseFactory factory{dbpath};
-	auto db = factory.forCurrentThread();
-	DBMigrator migrator{db};
-	if(migrator.migrationNeeded())
-	{
-		QFile out;
-		out.open(stderr, QIODevice::WriteOnly);
-		Logger migrationLogger{&out};
-		migrationLogger << "Database is being upgraded, please be patient..." << Qt::endl;
-		QObject::connect(&migrator, &DBMigrator::migrationDone,
-						 [&migrationLogger](uint32_t migration)
-						 { migrationLogger << "Progress: Successfully migrated to: " << migration << Qt::endl; });
-		migrator.performMigrations();
-		migrationLogger << "Database upgraded successfully" << Qt::endl;
-	}
-	QVariant pdfViewer = settings.value(SETTINGS_KEY_PDFVIEWER);
-	if(!pdfViewer.isValid())
-	{
 		setPdfViewer();
 	}
+	else
+	{
+
+		QString dbpath = databasePath();
+		if(!QFile::exists(dbpath))
+		{
+			throw LooqsGeneralException("Database " + dbpath + " was not found");
+		}
+		DatabaseFactory factory{dbpath};
+		auto db = factory.forCurrentThread();
+		DBMigrator migrator{db};
+		if(migrator.migrationNeeded())
+		{
+			QFile out;
+			out.open(stderr, QIODevice::WriteOnly);
+			Logger migrationLogger{&out};
+			migrationLogger << "Database is being upgraded, please be patient..." << Qt::endl;
+			QObject::connect(&migrator, &DBMigrator::migrationDone,
+							 [&migrationLogger](uint32_t migration)
+							 { migrationLogger << "Progress: Successfully migrated to: " << migration << Qt::endl; });
+			migrator.performMigrations();
+			migrationLogger << "Database upgraded successfully" << Qt::endl;
+		}
+	}
 }

 void Common::setupAppInfo()
@ -147,16 +156,6 @@ QString Common::databasePath()
 	return env;
 }

-bool Common::noSandboxModeRequested()
-{
-	QString env = getenv("LOOQS_DISABLE_SANDBOX");
-	if(env == "1")
-	{
-		return true;
-	}
-	return false;
-}
-
 QString Common::ipcSocketPath()
 {
 	return "/tmp/.looqs/looqs-ipc-socket";
@ -166,44 +165,19 @@ QString Common::ipcSocketPath()
 	// return settings.value(SETTINGS_KEY_IPCSOCKETPATH, "/tmp/.looqs/looqs-ipc-socket").toString();
 }

+static QStringList excludedPaths = {"/proc", "/sys", "/dev", "/tmp", "/var/run", "/run"};
+
 QStringList Common::excludedPaths()
 {
 	static int ran = false;
-	static QStringList excludedPaths;
 	if(!ran)
 	{
 		QSettings settings;
-		QStringList defaults{"/proc", "/sys", "/dev", "/tmp", "/var/run", "/run"};
-		excludedPaths = settings.value(SETTINGS_KEY_EXCLUDEDPATHS, defaults).toStringList();
+		QStringList userExcludedPaths = settings.value(SETTINGS_KEY_EXCLUDEDPATHS).toStringList();
 		ran = true;
+		::excludedPaths.append(userExcludedPaths);
 	}
-	return excludedPaths;
-}
-
-QStringList Common::mountPaths()
-{
-	static int ran = false;
-	static QStringList mountPaths;
-	if(!ran)
-	{
-		QSettings settings;
-		mountPaths = settings.value(SETTINGS_KEY_MOUNTPATHS, QStringList{"/media", "/mnt"}).toStringList();
-		ran = true;
-	}
-	return mountPaths;
-}
-
-bool Common::isMountPath(QString path)
-{
-	QStringList mountPaths = Common::mountPaths();
-	for(QString &mountPath : mountPaths)
-	{
-		if(path.startsWith(mountPath))
-		{
-			return true;
-		}
-	}
-	return false;
+	return ::excludedPaths;
 }

 bool Common::isTextFile(QFileInfo fileInfo)
--- a/shared/common.h
+++ b/shared/common.h
@ -2,14 +2,6 @@
 #define COMMON_H
 #include <QCoreApplication>
 #include <QFileInfo>
-
-#define SETTINGS_KEY_DBPATH "dbpath"
-#define SETTINGS_KEY_IPCSOCKETPATH "ipcsocketpath"
-#define SETTINGS_KEY_PDFVIEWER "pdfviewer"
-#define SETTINGS_KEY_EXCLUDEDPATHS "excludedpaths"
-#define SETTINGS_KEY_MOUNTPATHS "mountpaths"
-#define SETTINGS_KEY_PREVIEWSPERPAGE "previewsPerPage"
-
 namespace Common
 {
 void setupAppInfo();
@ -20,10 +12,7 @@ QString findInPath(QString needle);
 bool initSqliteDatabase(QString path);
 void ensureConfigured();
 QStringList excludedPaths();
-QStringList mountPaths();
 bool isTextFile(QFileInfo fileInfo);
-bool isMountPath(QString path);
-bool noSandboxModeRequested();
 QString versionText();
 } // namespace Common
 #endif
--- a/shared/dirscanworker.cpp
+++ b/shared/dirscanworker.cpp
@ -19,12 +19,9 @@ void DirScanWorker::run()
 	QString path;
 	/* TODO: if we have e. g. only one path, then only one thread will scan this path.
 		 *
-		 * Thus, we must submit new directory paths to the queue so other threads can help
-		the current one.
-
-		It also may not be guaranteed enqueuing new paths is faster than just scanning them,
-		at least not for dirs with a small number of files
-		*/
+		 * Thus, we must resubmit to the queue directories so other threads can help
+		the current one (requires a new logic for threads in ParallelDirScanner). Alterantively,
+		start new DirScanWorkers ourselves here... */
 	while(queue->dequeue(path))
 	{
 		if(wildcardMatcher.match(path))
--- a/shared/filesaver.cpp
+++ b/shared/filesaver.cpp
@ -87,10 +87,6 @@ int FileSaver::processFiles(const QVector<QString> paths, std::function<SaveFile
 										  {
 											  Logger::info() << "Saved" << path << Qt::endl;
 										  }
-										  else if(result == OK_WASEMPTY)
-										  {
-											  Logger::info() << "Saved (but content was empty)" << path << Qt::endl;
-										  }
 									  }
 								  }
 							  });
@ -102,12 +98,7 @@ SaveFileResult FileSaver::saveFile(const QFileInfo &fileInfo)
 	QVector<PageData> pageData;
 	QString canonicalPath = fileInfo.canonicalFilePath();

-	int processorReturnCode = -1;
-
-	if(!fileInfo.isReadable())
-	{
-		return NOACCESS;
-	}
+	int status = -1;

 	if(!fileInfo.exists())
 	{
@ -124,45 +115,44 @@ SaveFileResult FileSaver::saveFile(const QFileInfo &fileInfo)
 			}
 		}

-		if(fileInfo.size() > 0)
+		QProcess process;
+		QStringList args;
+		args << "process" << canonicalPath;
+		process.setProcessChannelMode(QProcess::ForwardedErrorChannel);
+		process.start("/proc/self/exe", args);
+		process.waitForStarted();
+		process.waitForFinished();
+
+		/* TODO: This is suboptimal as it eats lots of mem
+		 * but avoids a weird QDataStream/QProcess behaviour
+		 * where it thinks the process has ended when it has not...
+		 *
+		 * Also, there seem to be issues with reads not being blocked, so
+		 * the only reliable way appears to be waiting until the process
+		 * finishes.
+		 */
+		QDataStream in(process.readAllStandardOutput());
+		while(!in.atEnd())
 		{
-			QProcess process;
-			QStringList args;
-			args << "process" << canonicalPath;
-			process.setProcessChannelMode(QProcess::ForwardedErrorChannel);
-			process.start("/proc/self/exe", args);
-			process.waitForStarted();
-			process.waitForFinished();
+			PageData pd;
+			in >> pd;
+			pageData.append(pd);
+		}
+		status = process.exitCode();
+		if(status != 0 && status != NOTHING_PROCESSED)
+		{
+			Logger::error() << "FileSaver::saveFile(): Error while processing" << canonicalPath << ":"
+							<< "Exit code " << status << Qt::endl;

-			/* TODO: This is suboptimal as it eats lots of mem
-			 * but avoids a weird QDataStream/QProcess behaviour
-			 * where it thinks the process has ended when it has not...
-			 *
-			 * Also, there seem to be issues with reads not being blocked, so
-			 * the only reliable way appears to be waiting until the process
-			 * finishes.
-			 */
-			QDataStream in(process.readAllStandardOutput());
-			while(!in.atEnd())
-			{
-				PageData pd;
-				in >> pd;
-				pageData.append(pd);
-			}
-			processorReturnCode = process.exitCode();
-			if(processorReturnCode != OK && processorReturnCode != OK_WASEMPTY)
-			{
-				Logger::error() << "FileSaver::saveFile(): Error while processing" << canonicalPath << ":"
-								<< "Exit code " << processorReturnCode << Qt::endl;
-
-				return static_cast<SaveFileResult>(processorReturnCode);
-			}
+			return PROCESSFAIL;
 		}
 	}
-	SaveFileResult result = this->dbService->saveFile(fileInfo, pageData);
-	if(result == OK && processorReturnCode == OK_WASEMPTY)
+
+	// Could happen if a file corrupted for example
+	if(pageData.isEmpty() && status != NOTHING_PROCESSED)
 	{
-		return OK_WASEMPTY;
+		Logger::error() << "Could not get any content for " << canonicalPath << Qt::endl;
 	}
-	return result;
+
+	return this->dbService->saveFile(fileInfo, pageData);
 }
--- a/shared/indexer.cpp
+++ b/shared/indexer.cpp
@ -19,21 +19,7 @@ void Indexer::beginIndexing()
 	QVector<QString> dirs;

 	WildcardMatcher wildcardMatcher;
-
-	QStringList ignoreList = this->ignorePattern;
-
-	for(QString &excludedPath : Common::excludedPaths())
-	{
-		QString pattern = excludedPath;
-		if(!pattern.endsWith("/"))
-		{
-			pattern += "/";
-		}
-		pattern += "*";
-		ignoreList.append(excludedPath);
-	}
-	ignoreList.append(this->ignorePattern);
-	wildcardMatcher.setPatterns(ignoreList);
+	wildcardMatcher.setPatterns(this->ignorePattern);
 	for(QString &path : this->pathsToScan)
 	{
 		if(wildcardMatcher.match(path))
@ -50,14 +36,10 @@ void Indexer::beginIndexing()
 			this->filePathTargetsQueue.enqueue(path);
 		}
 	}
+	this->dirScanner->setPaths(dirs);
+	this->dirScanner->setIgnorePatterns(this->ignorePattern);

-	if(!dirs.empty())
-	{
-		this->dirScanner->setPaths(dirs);
-		this->dirScanner->setIgnorePatterns(ignoreList);
-
-		this->dirScanner->scan();
-	}
+	this->dirScanner->scan();

 	this->workerCancellationToken.store(false, std::memory_order_seq_cst);
 	launchWorker(this->filePathTargetsQueue, this->filePathTargetsQueue.remaining());
@ -73,16 +55,6 @@ 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();
@ -96,7 +68,7 @@ IndexResult Indexer::getResult()

 void Indexer::dirScanFinished()
 {
-	Logger::info() << "Dir scan finished" << Qt::endl;
+	Logger::info() << "Dir scan finished";
 	if(!isRunning())
 	{
 		emit finished();
@ -120,26 +92,18 @@ void Indexer::dirScanProgress(int current, int total)

 void Indexer::processFileScanResult(FileScanResult result)
 {
-	if(result.second != OK || result.second != OK_WASEMPTY || result.second != SKIPPED)
+	if(verbose)
 	{
 		this->currentIndexResult.results.append(result);
-		if(!keepGoing)
-		{
-			this->requestCancellation();
-			emit finished();
-			return;
-		}
 	}
 	else
 	{
-		if(verbose)
+		if(result.second == DBFAIL || result.second == PROCESSFAIL || result.second == NOTFOUND)
 		{
 			this->currentIndexResult.results.append(result);
 		}
 	}
-
-	/* TODO: OK_WASEMPTY might need a special list */
-	if(result.second == OK || result.second == OK_WASEMPTY)
+	if(result.second == OK)
 	{
 		++this->currentIndexResult.addedPaths;
 	}
--- a/shared/indexer.h
+++ b/shared/indexer.h
@ -22,28 +22,17 @@ class IndexResult
 		return addedPaths + skippedPaths + erroredPaths;
 	}

-	QVector<FileScanResult> failedResults() const
-	{
-		QVector<FileScanResult> result;
-		std::for_each(results.begin(), results.end(),
-					  [&result](FileScanResult res)
-					  {
-						  if(res.second == DBFAIL || res.second == PROCESSFAIL || res.second == NOTFOUND ||
-							 res.second == NOACCESS)
-						  {
-							  result.append(res);
-						  }
-					  });
-		return result;
-	}
-
 	QVector<QString> failedPaths() const
 	{
 		QVector<QString> result;
-
-		QVector<FileScanResult> results = failedResults();
-
-		std::for_each(results.begin(), results.end(), [&result](FileScanResult res) { result.append(res.first); });
+		std::for_each(results.begin(), results.end(),
+					  [&result](FileScanResult res)
+					  {
+						  if(res.second == DBFAIL || res.second == PROCESSFAIL || res.second == NOTFOUND)
+						  {
+							  result.append(res.first);
+						  }
+					  });
 		return result;
 	}
 };
@ -78,8 +67,6 @@ class Indexer : public QObject
 	void beginIndexing();
 	void setIgnorePattern(QStringList ignorePattern);
 	void setTargetPaths(QVector<QString> pathsToScan);
-	void setVerbose(bool verbose);
-	void setKeepGoing(bool keepGoing);

 	void requestCancellation();

--- a/shared/indexsyncer.cpp
+++ b/shared/indexsyncer.cpp
@ -55,11 +55,6 @@ void IndexSyncer::sync()
 				emit finished(totalUpdatesFilesCount, totalDeletedFilesCount, totalErroredFilesCount);
 				return;
 			}
-			if(Common::isMountPath(fileData.absPath))
-			{
-				continue;
-			}
-
 			QFileInfo fileInfo(fileData.absPath);
 			if(fileInfo.exists())
 			{
--- a/shared/looqsquery.cpp
+++ b/shared/looqsquery.cpp
@ -23,12 +23,12 @@ QueryType LooqsQuery::getQueryType()
 	return static_cast<QueryType>(tokensMask & COMBINED);
 }

-bool LooqsQuery::hasContentSearch() const
+bool LooqsQuery::hasContentSearch()
 {
 	return (this->getTokensMask() & FILTER_CONTENT) == FILTER_CONTENT;
 }

-bool LooqsQuery::hasPathSearch() const
+bool LooqsQuery::hasPathSearch()
 {
 	return (this->getTokensMask() & FILTER_PATH) == FILTER_PATH;
 }
@ -180,9 +180,8 @@ LooqsQuery LooqsQuery::build(QString expression, TokenType loneWordsTokenType, b

 	QStringList loneWords;
 	LooqsQuery result;
-	QRegularExpression rx(
-		"((?<filtername>(\\.|\\w)+):(?<args>\\((?<innerargs>[^\\)]+)\\)|([\\p{L}\\p{N},])+)|(?<boolean>AND|OR)"
-		"|(?<negation>!)|(?<bracket>\\(|\\))|(?<loneword>[\"\\p{L}\\p{N}]+))");
+	QRegularExpression rx("((?<filtername>(\\.|\\w)+):(?<args>\\((?<innerargs>[^\\)]+)\\)|([\\w,])+)|(?<boolean>AND|OR)"
+						  "|(?<negation>!)|(?<bracket>\\(|\\))|(?<loneword>[\"\\w]+))");
 	QRegularExpressionMatchIterator i = rx.globalMatch(expression);
 	auto previousWasBool = [&result] { return !result.tokens.empty() && ((result.tokens.last().type & BOOL) == BOOL); };
 	auto previousWas = [&result](TokenType t) { return !result.tokens.empty() && (result.tokens.last().type == t); };
--- a/shared/looqsquery.h
+++ b/shared/looqsquery.h
@ -61,8 +61,8 @@ class LooqsQuery
 	{
 		this->limit = limit;
 	}
-	bool hasContentSearch() const;
-	bool hasPathSearch() const;
+	bool hasContentSearch();
+	bool hasPathSearch();

 	void addSortCondition(SortCondition sc);
 	static bool checkParanthesis(QString query);
--- a/shared/odtprocessor.cpp
+++ b/shared/odtprocessor.cpp
@ -1,5 +1,5 @@
-#include <quazip.h>
-#include <quazipfile.h>
+#include <quazip5/quazip.h>
+#include <quazip5/quazipfile.h>
 #include "odtprocessor.h"
 #include "tagstripperprocessor.h"

--- a/shared/paralleldirscanner.cpp
+++ b/shared/paralleldirscanner.cpp
@ -71,35 +71,7 @@ void ParallelDirScanner::scan()
 	this->targetPathsQueue.clear();
 	this->resultPathsQueue.clear();

-	/* First scan without subdirs. This way we collect paths for the threads */
-	WildcardMatcher matcher;
-	matcher.setPatterns(this->ignorePatterns);
-	for(QString &path : this->paths)
-	{
-		QDirIterator iterator(path, QStringList{}, QDir::Dirs | QDir::QDir::Files | QDir::NoDotAndDotDot);
-		while(iterator.hasNext())
-		{
-			QString path = iterator.next();
-			if(matcher.match(path))
-			{
-				continue;
-			}
-			QFileInfo info = iterator.fileInfo();
-			if(!info.isSymLink())
-			{
-				if(info.isDir())
-				{
-					this->targetPathsQueue.enqueue(info.absoluteFilePath());
-				}
-				else
-				{
-					this->resultPathsQueue.enqueue(info.absoluteFilePath());
-					this->processedPaths += 1;
-				}
-			}
-		}
-	}
-	emit this->progress(this->processedPaths, this->processedPaths);
+	this->targetPathsQueue.enqueue(this->paths);
 	int threadsNum = getThreadsNum();
 	if(threadsNum == 0)
 	{
--- a/shared/plaintexts.qrc
+++ b/shared/plaintexts.qrc
@ -1,6 +0,0 @@
-<RCC>
-    <qresource>
-		<file>../LICENSE</file>
-        <file>../LICENSE-3RD-PARTY</file>
-    </qresource>
-</RCC>
--- a/shared/processor.h
+++ b/shared/processor.h
@ -10,6 +10,8 @@ enum DataSource
 	ARRAY
 };

+#define NOTHING_PROCESSED 4
+
 class Processor
 {
  public:
--- a/shared/sandboxedprocessor.cpp
+++ b/shared/sandboxedprocessor.cpp
@ -27,15 +27,10 @@ static QMap<QString, Processor *> processors{

 void SandboxedProcessor::enableSandbox(QString readablePath)
 {
-	if(Common::noSandboxModeRequested())
-	{
-		qInfo() << "Sandbox is disabled!" << Qt::endl;
-		return;
-	}
 	struct exile_policy *policy = exile_init_policy();
 	if(policy == NULL)
 	{
-		qCritical() << "Could not init exile" << Qt::endl;
+		qCritical() << "Could not init exile";
 		exit(EXIT_FAILURE);
 	}
 	policy->namespace_options = EXILE_UNSHARE_NETWORK | EXILE_UNSHARE_USER;
@ -43,8 +38,6 @@ void SandboxedProcessor::enableSandbox(QString readablePath)
 	std::string readablePathLocation;
 	if(!readablePath.isEmpty())
 	{
-		policy->namespace_options |= EXILE_UNSHARE_MOUNT;
-		policy->mount_path_policies_to_chroot = 1;
 		readablePathLocation = readablePath.toStdString();
 		if(exile_append_path_policies(policy, EXILE_FS_ALLOW_ALL_READ, readablePathLocation.c_str()) != 0)
 		{
@ -80,7 +73,7 @@ void SandboxedProcessor::printResults(const QVector<PageData> &pageData)
 	fsstdout.close();
 }

-SaveFileResult SandboxedProcessor::process()
+int SandboxedProcessor::process()
 {
 	QFileInfo fileInfo(this->filePath);
 	Processor *processor = processors.value(fileInfo.suffix(), nullptr);
@ -92,14 +85,10 @@ SaveFileResult SandboxedProcessor::process()
 			processor = defaultTextProcessor;
 		}
 	}
-	if(!fileInfo.isReadable())
-	{
-		return NOACCESS;
-	}
 	if(processor == nullptr || processor == nothingProcessor)
 	{
 		/* Nothing to do */
-		return OK;
+		return NOTHING_PROCESSED;
 	}

 	QVector<PageData> pageData;
@ -123,9 +112,9 @@ SaveFileResult SandboxedProcessor::process()
 	catch(LooqsGeneralException &e)
 	{
 		Logger::error() << "SandboxedProcessor: Error while processing" << absPath << ":" << e.message << Qt::endl;
-		return PROCESSFAIL;
+		return 3 /* PROCESSFAIL */;
 	}

 	printResults(pageData);
-	return pageData.isEmpty() ? OK_WASEMPTY : OK;
+	return 0;
 }
--- a/shared/sandboxedprocessor.h
+++ b/shared/sandboxedprocessor.h
@ -3,7 +3,6 @@
 #include <QString>
 #include <QMimeDatabase>
 #include "pagedata.h"
-#include "savefileresult.h"

 class SandboxedProcessor
 {
@ -20,7 +19,7 @@ class SandboxedProcessor
 		this->filePath = filepath;
 	}

-	SaveFileResult process();
+	int process();
 };

 #endif // SANDBOXEDPROCESSOR_H
--- a/shared/savefileresult.h
+++ b/shared/savefileresult.h
@ -1,33 +0,0 @@
-#ifndef SAVEFILERESULT_H
-#define SAVEFILERESULT_H
-
-#include <QStringList>
-
-enum SaveFileResult
-{
-	OK,
-	OK_WASEMPTY, /* The file was successfully read but no content could be extracted. Might be just an empty document or
-					so*/
-	SKIPPED,	 /* The file was not processed/saved, because it has not changed */
-	DBFAIL,		 /* A database error occured */
-	PROCESSFAIL, /* General processor failure */
-	NOTFOUND,	 /* The file was not found */
-	NOACCESS	 /* The process can't read the file */
-};
-
-static inline QString SaveFileResultToString(SaveFileResult sfr)
-{
-	QStringList SaveFileResultStr;
-
-	SaveFileResultStr << "OK"
-					  << "OK_WASEMPTY"
-					  << "SKIPPED"
-					  << "DBFAIL"
-					  << "PROCESSFAIL"
-					  << "NOTFOUND"
-					  << "NOACCESS";
-
-	return SaveFileResultStr[(int)sfr];
-}
-
-#endif // SAVEFILERESULT_H
--- a/shared/searchresult.h
+++ b/shared/searchresult.h
@ -7,7 +7,6 @@ class SearchResult
  public:
 	FileData fileData;
 	QVector<unsigned int> pages;
-	bool wasContentSearch = false;
 };

 #endif // SEARCHRESULT_H
--- a/shared/shared.pro
+++ b/shared/shared.pro
@ -16,11 +16,7 @@ CONFIG += c++17
 INCLUDEPATH += $$PWD/../sandbox/exile.h/
 INCLUDEPATH += /usr/include/poppler/qt5/ /usr/include/quazip5

-# Dirty, we only need the includes here but well this magic works, so...
-packagesExist(quazip1-qt5) {
-       PKGCONFIG += quazip1-qt5
-       CONFIG += link_pkgconfig
-}
+

 # The following define makes your compiler emit warnings if you use
 # any feature of Qt which has been marked as deprecated (the exact warnings
@ -88,7 +84,6 @@ HEADERS += sqlitesearch.h \
    pdfprocessor.h \
    processor.h \
    sandboxedprocessor.h \
-    savefileresult.h \
    searchresult.h \
    sqlitedbservice.h \
    tagstripperprocessor.h \
@ -101,4 +96,3 @@ unix {
    INSTALLS += target
 }
 RESOURCES = migrations/migrations.qrc
-RESOURCES += plaintexts.qrc
--- a/shared/sqlitedbservice.h
+++ b/shared/sqlitedbservice.h
@ -7,7 +7,14 @@
 #include "filedata.h"
 #include "../shared/sqlitesearch.h"
 #include "../shared/token.h"
-#include "savefileresult.h"
+enum SaveFileResult
+{
+	OK,
+	SKIPPED,
+	DBFAIL,
+	PROCESSFAIL,
+	NOTFOUND
+};

 class SqliteDbService
 {
--- a/shared/sqlitesearch.cpp
+++ b/shared/sqlitesearch.cpp
@ -213,7 +213,6 @@ QVector<SearchResult> SqliteSearch::search(const LooqsQuery &query)
 		throw LooqsGeneralException("SQL Error: " + dbQuery.lastError().text());
 	}

-	bool contentSearch = query.hasContentSearch();
 	while(dbQuery.next())
 	{
 		SearchResult result;
@ -230,7 +229,6 @@ QVector<SearchResult> SqliteSearch::search(const LooqsQuery &query)
 				result.pages.append(page.toUInt());
 			}
 		}
-		result.wasContentSearch = contentSearch;
 		results.append(result);
 	}
 	return results;
--- a/submodules/exile.h
+++ b/submodules/exile.h
Autore	SHA1	Messaggio	Data
Albert S	82cb6f76fa	TO REBASE CHANGELOG.md, USAGE.md	2022-06-05 14:40:11 +02:00
Albert S	4aef3c42c2	update USAGE	2022-06-05 14:40:11 +02:00
Albert S	c5cf04049f	update README.md	2022-06-05 14:40:11 +02:00
Albert S	dca7fc6665	USAGE: Update	2022-06-05 14:40:11 +02:00
Albert S	97c7ed13ab	update CHANGELOG.md	2022-06-05 14:40:11 +02:00
Albert S	690e3ede27	update README	2022-06-05 14:40:11 +02:00
Albert S	894e478a29	Begin USAGE.md, CHANGELOG.md	2022-06-05 14:40:11 +02:00