Порівняти коміти
7 Коміти
| Автор | SHA1 | Дата |
|---|---|---|
 Albert S.
|
82cb6f76fa | |
|
Albert S.
|
4aef3c42c2 | |
|
Albert S.
|
c5cf04049f | |
|
Albert S.
|
dca7fc6665 | |
|
Albert S.
|
97c7ed13ab | |
|
Albert S.
|
690e3ede27 | |
|
Albert S.
|
894e478a29 |
|
|
@ -1,11 +0,0 @@
|
|||
.user
|
||||
.o
|
||||
*.user
|
||||
*.o
|
||||
*.a
|
||||
moc_*.cpp
|
||||
moc_*.h
|
||||
Makefile
|
||||
cli/looqs
|
||||
gui/looqs-gui
|
||||
qrc_*
|
||||
151
CHANGELOG.md
151
CHANGELOG.md
|
|
@ -1,159 +1,22 @@
|
|||
# looqs: Release notes
|
||||
|
||||
## 2023-05-07 - v0.9
|
||||
Highlights: Tag support. Also begin new index mode to only index metadata (currently only path + file size, more to come).
|
||||
|
||||
Note: Upgrading can take some time as new column indexes will be added
|
||||
|
||||
CHANGES:
|
||||
|
||||
- gui: Improve font rendering in previews
|
||||
- gui: Allow indexing only metadata
|
||||
- gui: Allow adding content for files which only had metadata indexed before
|
||||
- gui: Allow assigning tags by right clicking on paths
|
||||
- cli: "add" command: Implement --verbose (-v)
|
||||
- cli: "add" command: Implement --no-content and --fill-content
|
||||
- cli: Add "tag" command which allows managing tags for paths.
|
||||
- search: Add "tag:()", "t:()" filters
|
||||
- Minor improvements and refactorings under the hood
|
||||
- Add packages: Ubuntu 23.04.
|
||||
|
||||
|
||||
## 2022-11-19 - v0.8.1
|
||||
|
||||
CHANGES:
|
||||
- Fix regression causing previews in second (and higher) result page to not render
|
||||
- Minor improvements
|
||||
|
||||
## 2022-10-22 - v0.8
|
||||
|
||||
CHANGES:
|
||||
- For new, not previously indexed files, start creating an additional index using sqlite's experimental trigram tokenizer. Thanks to that, we can now match substrings >= 3 of an unicode sequence. Results of the usual index are prioritized.
|
||||
- GUI: Ensure order of previews matches ranking exactly. Previously, it depended simply on the time preview generators took, i. e. it was more or less a race.
|
||||
- Report progress more often during indexing, so users don't get the impression that it's stuck when processing dirs with large documents.
|
||||
- Fix a regression that caused phrase queries to be broken
|
||||
- Minor improvements
|
||||
- Add packages: Ubuntu 22.10.
|
||||
|
||||
## 2022-09-10 - v0.7
|
||||
|
||||
CHANGES:
|
||||
|
||||
- GUI: Add vertical scroll option, default to it. Most feedback considered horizontal scrolling unnatural.
|
||||
- GUI: Previews: Improve plaintext preview snippet selection by prioritizing those which contain the most search terms
|
||||
- GUI: Previews: Only highlight whole words, not parts in words.
|
||||
- GUI: Previews: Don't treat text wrapped inside '<' '>' in plaintext files as HTMl tags which caused such text to get lost in previews.
|
||||
- GUI: Avoid triggering preview generation in some cases even when previews tab is not the active one
|
||||
- GUI: Implement a search history. Allow going up/down with arrow keys in the search field.
|
||||
- GUI: Previews: Allow CTRL + mouse wheel to zoom in on previews
|
||||
- General: Fix an incorrect sqlite query which caused the ranking information of search results to be lost. "All files" filter in the previews tab therefore now orders by the seemingly most relevant pages, across all documents.
|
||||
- General: Fix handling of content search queries with prefix terms (those ending in '*').
|
||||
- GUI: Show how many results are previewable.
|
||||
- GUI: Refactor to improve stability of sandboxed IPC worker in order to avoid rare segfaults.
|
||||
|
||||
## 2022-08-14 - v0.6
|
||||
This release features multiple fixes and enhancements.
|
||||
|
||||
Bad news first: It drops a trivial trigger that appeared to work quite fine, but silently may cause "unpredictability" of the sqlite FTS5 index ( [9422a5b494](https://github.com/quitesimpleorg/looqs/commit/9422a5b494dabd0f1324dc2f92a34c3036137414) ). As a result, FTS queries may return weird and unexplainable results. This is not reasonably automatically recoverable by looqs. I strongly recommend creating a clean, new database. All previous versions are affected. To do that, go to "Settings" -> checking "Remove old database on save" -> "Save settings and restart". Alternatively, specify a new path to keep the old database.
|
||||
|
||||
CHANGES:
|
||||
|
||||
- GUI: Add line numbers and context lines to plaintext previews
|
||||
- GUI: Fix case where previews for old queries would have still been visible if new query would not create previews
|
||||
- GUI: Add CTRL + F, CTRL+W, CTRL+Tab, CTRL+Shift+Tab shortcuts (see user manual)
|
||||
- GUI: Add checkbox in "Settings" tab allowing to delete database.
|
||||
- General: Fix wrong regexes that caused query errors with chars like -
|
||||
- General: Drop trigger sending incomplete sqlite fts5 deletion command, causing undefined index behaviour
|
||||
|
||||
## 2022-07-30 - v0.5.1
|
||||
|
||||
CHANGES:
|
||||
|
||||
- gui: Fix regression in implicit paths queries introduced in previous version
|
||||
|
||||
## 2022-07-29 - v0.5
|
||||
This release features multiple fixes and enhancements.
|
||||
|
||||
It changes the database to drop an unused content column. Dropping it allows us
|
||||
to change to a contentless sqlite FTS index which frees up space.
|
||||
|
||||
Upgrading might take a few seconds to a few minutes as looqs will recreate the whole index.
|
||||
How long this will take depends on the size of your database.
|
||||
|
||||
The other major highlight is preview support for .odt files (unformatted, like plaintext).
|
||||
|
||||
List of changes:
|
||||
|
||||
- General: As Ubuntu 21.10 is EOL, no looqs package will be provided for it any longer
|
||||
- General: Update database scheme to drop unused content column and free up space
|
||||
- General: Properly escape FTS arguments passed to sqlite to avoid query errors on some terms
|
||||
- GUI: Fix double searches and results when explicit content search filters are provided
|
||||
- GUI: Previews: Plaintext previews now obey scale selection too
|
||||
- GUI: Previews: Begin basic, unformatted previews of .odt files
|
||||
- GUI: Previews: Add file path below every preview for convenience (hovering unnecessary now).
|
||||
- GUI: Previews: Fix bug causing an empty preview if a plaintext file started with a searched word
|
||||
- GUI: Add menu option to open user manual
|
||||
- GUI: Show progress dialog during database upgrade
|
||||
- General: Correct error count in some conditions for failed paths
|
||||
- General: Update user manual
|
||||
- Minor improvements
|
||||
|
||||
## 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!
|
||||
|
|
|
|||
|
|
@ -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.
|
||||
29
HACKING.md
29
HACKING.md
|
|
@ -1,29 +0,0 @@
|
|||
# looqs - Hacking
|
||||
|
||||
## Introduction
|
||||
If you are interested on 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 definitely 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. It's also natural to use sqlite as it's
|
||||
used for metadata in general.
|
||||
|
||||
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 that quirk is abandoned now, this got us to looqs.
|
||||
|
||||
|
||||
|
||||
2
LICENSE
2
LICENSE
|
|
@ -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:
|
||||
|
||||
|
|
|
|||
1119
LICENSE-3RD-PARTY
1119
LICENSE-3RD-PARTY
Різницю між файлами не показано, бо вона завелика
Завантажити різницю
128
README.md
128
README.md
|
|
@ -1,147 +1,61 @@
|
|||
# looqs - Full-text search with previews for your files
|
||||
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.
|
||||
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 allows you to look inside files. It highlights what you have searched for.
|
||||
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
|
||||
|
||||
|
||||
### Preview
|
||||
|
||||
|
||||
|
||||
### Results list
|
||||
#### Classic results list
|
||||
Just enter what you want to find, it will search paths and file content.
|
||||
|
||||
|
||||
#### Searching with filters
|
||||
You can be more specific to get what you want with filters
|
||||
|
||||
**Filters (long form)**
|
||||
|
||||
|
||||
**Filters (short form)**
|
||||
|
||||
There is no need to write the long form of filters. There are also booleans available
|
||||
|
||||
|
||||
|
||||
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: 2023-05-07, v0.9
|
||||
Last version: 2022-0X-XX, v0.1
|
||||
|
||||
Please keep in mind: looqs is still at an early stage and may exhibit some weirdness and contain bugs.
|
||||
|
||||
Please see [Changelog](CHANGELOG.md) for a human readable list of changes. For download instructions, see
|
||||
further down this document.
|
||||
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, .odt, 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
|
||||
|
||||
### Debian/Ubuntu
|
||||
|
||||
To build on Ubuntu and Debian, clone the repo and then run:
|
||||
### Ubuntu 21.10/22.04
|
||||
```
|
||||
git submodule init
|
||||
git submodule update
|
||||
sudo apt install build-essential qtbase5-dev libqt5sql5-sqlite libpoppler-qt5-dev libuchardet-dev libquazip5-dev
|
||||
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
|
||||
sudo apt install build-essential qtbase5-dev libpoppler-qt5-dev libuchardet-dev libquazip5-dev
|
||||
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 23.04, 22.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
|
||||
```
|
||||
### Gentoo (EXPERIMENTAL)
|
||||
Available in this overlay: https://github.com/quitesimpleorg/quitesimple-overlay
|
||||
|
||||
### 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 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™
|
||||
|
|
|
|||
81
USAGE.md
81
USAGE.md
|
|
@ -9,60 +9,50 @@ looqs is still at an early stage and may exhibit some weirdness and contain bugs
|
|||
## Current Limitations and things to know
|
||||
You should be aware of the following:
|
||||
|
||||
- Lags are to be expected for networked mount points such as SMB and NFS etc.
|
||||
|
||||
- It may seem natural, but the GUI and CLI operate on the same database, so if you add files using the CLI, the GUI will know about them too.
|
||||
- It may seem natural, but the GUI and CLI operate on the same database, so if you add files using the CLI, the GUI will search them too.
|
||||
|
||||
- If a file is listed in the "Search results" tab, it does not imply that a preview will be available in the "Previews" tab, as looqs can search more file formats than it can generate previews for currently.
|
||||
|
||||
- Existing files are considered modified when the modification time has changed. looqs currently does not check whether the content has changed.
|
||||
- Database paths are stored inefficiently, not deduplicated to simplify queries. This may add up quickly. Also, each PDF text is stored twice. Each page separately + the whole document to simplify queries.
|
||||
To give you some idea: At the time this section was written, 167874 files were in my index. A FTS index was built for 14280 of those, of which 4146 were PDF documents. The PDFs take around 10GB storage space on the filesystem. All files for which an FTS has been built are around 7GB in size on the filesystem. The looqs database had a size of 1.6 GB.
|
||||
|
||||
- Existing files are considered modified when the mtime has changed. looqs currently does not check whether the content
|
||||
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"**.
|
||||
|
||||
### Indexing
|
||||
For large directories the progress bar is essentially just decoration. As long as you see the counters
|
||||
increase, everything is fine even if it seems the progress bar is stuck.
|
||||
|
||||
The indexing can be stopped. If you run it again you do not start from scratch, because looqs knows
|
||||
which files have been modified since they have been added to the index. Thus, files will
|
||||
only be reprocessed when necessary. Note that cancellation itself may take a moment as files finish processing.
|
||||
|
||||
The counters increase in batches, therefore it's normal that it seems no progress is being made, particularly when processing lots of large documents. This aspect will be improved in a future version.
|
||||
which files have been modified or not since they have been added to the index. Thus, files will
|
||||
only be reprocedded when necessary. Note that cancellation itself may take a moment as files finish processing.
|
||||
|
||||
### Search
|
||||
The text field at the top is where you type your query. It can be selected quickly using **CTRL + L**. Filters are available, see this document at the end. By default, both the full path and the content are searched. Path names take precedence, i. e. they will appear the top of the list.
|
||||
|
||||
**CTRL + F**: This is helpful shortcut if you want to perform several searches. Consider the following
|
||||
query: "p:(docs) c:(invoice credit card)". Press CTRL+F to highlight 'invoice credit card'. This way
|
||||
you can quickly perform content searches in paths containing 'docs'.
|
||||
|
||||
**CTRL + W**: Removes the last filter. If we take above's example "p:(docs) c:(invoice credit card)" again, then CTRL + W kills "c:(invoice credit card)".
|
||||
|
||||
The arrow keys (up and down) can be used to go back and forward in the search history.
|
||||
The text field at the top is where you type your query. It can be selected quickly using **CTRL + L**. Filters are avalable,
|
||||
see this document at the end. By default, both the full path and the content are searched. Path names take precedence.
|
||||
|
||||
### 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 the
|
||||
default does not work for you. 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.
|
||||
|
||||
### Previews tab
|
||||
The 'previews' tab shows previews. It marks your search keywords too. Click on a preview to open the file.
|
||||
A right click on a preview allows you to copy the file path, or to open the containing folder.
|
||||
|
||||
When the combobox is set to "All previews", the previews are ordered by relevance from all documents/pages.
|
||||
|
||||
By default, a vertical scrolling is active. In the settings, it can be changed to horizontal scroll, which may be
|
||||
preferred by users of (larger) wide screen monitors.
|
||||
### Preview tab
|
||||
The preview tab shows previews. It marks your search keywords too. Click on a preview to open the file.
|
||||
A right click on a preview allows you to copy the file path, or to open the containing folder. Hovering tells you which file the preview originates from.
|
||||
|
||||
### Syncing index
|
||||
Over time, files get deleted or their content changes. Go to **looqs** -> **Sync index**. looqs will reindex the content of files which have been changed. Files that cannot be found anymore will be removed from the index.
|
||||
|
|
@ -95,11 +85,12 @@ There is an implicit "AND" condition, meaning if you search for "photo" and "mou
|
|||
will be shown containing both terms, but not either alone.
|
||||
|
||||
### Deletion and Fixing Out of sync index
|
||||
To get rid of deleted files from the index, run:
|
||||
You sometimes delete files, to get rid of those from the index too, run:
|
||||
|
||||
```
|
||||
looqs delete --deleted --dry-run
|
||||
```
|
||||
|
||||
This commands lists all files which are indexed, but which cannot be found anymore.
|
||||
|
||||
Remove them using:
|
||||
|
|
@ -135,13 +126,13 @@ looqs update
|
|||
```
|
||||
|
||||
This will not add new files, you must run ```looqs add``` for this. For this reason, most users
|
||||
will probably seldom use the 'update' command alone.
|
||||
will probably seldomly use the 'update' command alone.
|
||||
|
||||
|
||||
## Tips
|
||||
|
||||
### Keeping index up to date
|
||||
The most obvious way is to use the GUI to add your favorite paths in the "Index" tab. Then occasionally, just rescan. This works for me personally, looqs quickly picks up new files. This however may not be good enough for some users.
|
||||
The most obvious way is to use the GUI and add your favorite paths in the "Index" tab. Then occasionally, just rescan. This works for me personally, looqs quickly picks up new files. This however may not be good enough for some users.
|
||||
|
||||
Some users may prefer setting up cronjobs or wire up the CLI interface with file system monitoring tools such as [adhocify](https://github.com/quitesimpleorg/adhocify).
|
||||
|
||||
|
|
@ -153,22 +144,20 @@ are indexed by looqs, you may find the lh (look here) alias useful:
|
|||
alias lh='looqs search $(pwd)'
|
||||
```
|
||||
|
||||
So typing "lh recipes" searches the current dir and its subdirs for a file containing 'recipes'. Alternatively, a "lh c:(rice)" may be a quick grep alternative.
|
||||
So typing "lh recipes" searchs the current dir and its subdirs for a file containing 'recipes'.
|
||||
|
||||
## Query syntax / Search filters
|
||||
A number of search filters are available.
|
||||
|
||||
| Filter (long) | Filter (short) | Explanation |
|
||||
| ----------- | ----------- |----------- |
|
||||
| path.contains:(term) | p:(term) | Pretty much a SQL LIKE '%term%' condition, just searches the path string |
|
||||
| path.contains:(term) | p:(term) | Pretty much a SQL LIKE '%term%' conditions, just searches the path string |
|
||||
| path.ends:(term) | pe:(term) | Filters path ending with the specified term, e. g.: pe:(.ogg) |
|
||||
| path.begins:(term) | pb:(term) | Filters path beginning with the specified term |
|
||||
| contains:(terms) | c:(terms) | Full-text search, also understands quotes |
|
||||
| limit:(integer) | - | Limits the number of results. The default is 1000. Say "limit:0" to see all results |
|
||||
| tag:(tagname) | t:(tagname) | Filter for files that have been tagged with the corresponding tag |
|
||||
| contains:(terms) | c:(terms) | ull-text search, also understands quotes |
|
||||
|
||||
Filters can be combined. The booleans AND and OR are supported. Negations can be applied too, except for c:(). Negations are specified with "!".
|
||||
The AND boolean is implicit and thus entering it strictly optional.
|
||||
Filters can be combined. The booleans AND and OR are supported. Negations can be applied too, except for c:().
|
||||
The AND boolean is implicit and thus entering it strictly optional.
|
||||
|
||||
Examples:
|
||||
|
||||
|
|
@ -177,7 +166,11 @@ Examples:
|
|||
|pe:(.ogg) p:(marley)| Finds paths that end with .ogg and contain 'marley' (case-insensitive)
|
||||
|p:(slides) support vector machine |Performs a content search for 'support vector machine' in all paths containing 'slides'|
|
||||
|p:(notes) (pe:(odt) OR pe:(docx)) |Finds files such as notes.docx, notes.odt but also any .docs and .odt when the path contains the string 'notes'|
|
||||
|memcpy !(pe:(.c) OR pe:(.cpp))| Performs a FTS search for 'memcpy' but excludes .cpp and .c files.|
|
||||
|c:("I think, therefore")|Performs a FTS search for the phrase "I think, therefore".|
|
||||
|c:("invoice") Downloads|Equivalent to c:("invoice") p:("Downloads")|
|
||||
|p:(Downloads) invoice|Equivalent to c:("invoice") p:("Downloads")|
|
||||
|memcpy !(pe:(.c) OR pe:(.cpp))| Performs a FTS search for 'memcpy' but excludes .cpp and .c files.
|
||||
|c:("I think, therefore")|Performs a FTS search for the phrase "I think, therefore".
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -15,7 +15,6 @@ DEFINES += QT_DEPRECATED_WARNINGS
|
|||
# You can also select to disable deprecated APIs only up to a certain version of Qt.
|
||||
#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0
|
||||
SOURCES += \
|
||||
commandtag.cpp \
|
||||
main.cpp \
|
||||
commandadd.cpp \
|
||||
commanddelete.cpp \
|
||||
|
|
@ -28,7 +27,6 @@ HEADERS += \
|
|||
command.h \
|
||||
commandadd.h \
|
||||
commanddelete.h \
|
||||
commandtag.h \
|
||||
commandupdate.h \
|
||||
commandsearch.h \
|
||||
commandlist.h
|
||||
|
|
@ -39,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
|
||||
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
#include <QThread>
|
||||
#include <QDebug>
|
||||
#include "command.h"
|
||||
#include "looqsgeneralexception.h"
|
||||
|
||||
void Command::execute()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -23,54 +23,38 @@ void CommandAdd::indexerFinished()
|
|||
if(failedPathsCount > 0)
|
||||
{
|
||||
Logger::info() << "Failed paths: " << Qt::endl;
|
||||
for(const QString &paths : result.failedPaths())
|
||||
for(QString paths : result.failedPaths())
|
||||
{
|
||||
Logger::info() << paths << Qt::endl;
|
||||
}
|
||||
}
|
||||
|
||||
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)
|
||||
{
|
||||
QCommandLineParser parser;
|
||||
parser.addOptions({{{"c", "continue"},
|
||||
"Continue adding files, don't exit on first error. Exit code will be 0. If this option is not "
|
||||
"given, looqs will "
|
||||
"exit asap, but it's possible that a few files will still be processed."
|
||||
"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"},
|
||||
{{"v", "verbose"}, "Print paths of files being processed"},
|
||||
{{"f", "fill-content"}, "Index content for files previously indexed with -n"},
|
||||
{{"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 pathsOnly = parser.isSet("no-content");
|
||||
bool fillContent = parser.isSet("fill-content");
|
||||
bool keepGoing = parser.isSet("continue");
|
||||
bool verbose = parser.isSet("verbose");
|
||||
|
||||
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)
|
||||
|
|
@ -84,49 +68,19 @@ int CommandAdd::handle(QStringList arguments)
|
|||
}
|
||||
}
|
||||
|
||||
FileSaverOptions fileSaverOptions;
|
||||
fileSaverOptions.keepGoing = keepGoing;
|
||||
fileSaverOptions.fillExistingContentless = fillContent;
|
||||
fileSaverOptions.metadataOnly = pathsOnly;
|
||||
fileSaverOptions.verbose = verbose;
|
||||
|
||||
indexer = new Indexer(*this->dbService);
|
||||
indexer->setFileSaverOptions(fileSaverOptions);
|
||||
|
||||
indexer->setTargetPaths(files.toVector());
|
||||
|
||||
if(verbose)
|
||||
{
|
||||
indexer->setProgressReportThreshold(1);
|
||||
}
|
||||
|
||||
connect(indexer, &Indexer::pathsCountChanged, this,
|
||||
[](int pathsCount) { Logger::info() << "Found paths: " << pathsCount << Qt::endl; });
|
||||
connect(indexer, &Indexer::indexProgress, this,
|
||||
[verbose, this](int pathsCount, unsigned int /*added*/, unsigned int /*skipped*/, unsigned int /*failed*/,
|
||||
unsigned int /*totalCount*/)
|
||||
{
|
||||
Logger::info() << "Processed files: " << pathsCount << Qt::endl;
|
||||
if(verbose)
|
||||
{
|
||||
IndexResult indexResult = indexer->getResult();
|
||||
int newlyAdded = indexResult.results.count() - currentResult.results.count();
|
||||
if(newlyAdded > 0)
|
||||
{
|
||||
int newOffset = indexResult.results.count() - newlyAdded;
|
||||
for(int i = newOffset; i < indexResult.results.count(); i++)
|
||||
{
|
||||
auto result = indexResult.results.at(i);
|
||||
Logger::info() << SaveFileResultToString(result.second) << result.first << Qt::endl;
|
||||
}
|
||||
}
|
||||
this->currentResult = indexResult;
|
||||
}
|
||||
}
|
||||
|
||||
);
|
||||
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();
|
||||
|
||||
|
|
|
|||
|
|
@ -10,11 +10,8 @@ class CommandAdd : public Command
|
|||
private:
|
||||
SaveFileResult addFile(QString path);
|
||||
Indexer *indexer;
|
||||
bool keepGoing = true;
|
||||
|
||||
protected:
|
||||
IndexResult currentResult;
|
||||
|
||||
public:
|
||||
using Command::Command;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
#include <QCommandLineParser>
|
||||
#include "commandlist.h"
|
||||
#include "databasefactory.h"
|
||||
#include "logger.h"
|
||||
|
||||
int CommandList::handle(QStringList arguments)
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
#include <QCommandLineParser>
|
||||
#include "commandsearch.h"
|
||||
#include "databasefactory.h"
|
||||
#include "logger.h"
|
||||
|
||||
int CommandSearch::handle(QStringList arguments)
|
||||
|
|
@ -32,18 +33,11 @@ int CommandSearch::handle(QStringList arguments)
|
|||
|
||||
try
|
||||
{
|
||||
|
||||
QHash<QString, bool> seenMap;
|
||||
auto results = dbService->search(query);
|
||||
|
||||
for(const SearchResult &result : results)
|
||||
for(SearchResult &result : results)
|
||||
{
|
||||
const QString &absPath = result.fileData.absPath;
|
||||
if(!seenMap.contains(absPath))
|
||||
{
|
||||
seenMap[absPath] = true;
|
||||
Logger::info() << absPath << Qt::endl;
|
||||
}
|
||||
Logger::info() << result.fileData.absPath << Qt::endl;
|
||||
}
|
||||
}
|
||||
catch(LooqsGeneralException &e)
|
||||
|
|
|
|||
|
|
@ -1,153 +0,0 @@
|
|||
#include <QCommandLineParser>
|
||||
#include "commandtag.h"
|
||||
#include "logger.h"
|
||||
#include "tagmanager.h"
|
||||
|
||||
bool CommandTag::ensureAbsolutePaths(const QVector<QString> &paths, QVector<QString> &absolutePaths)
|
||||
{
|
||||
for(const QString &path : paths)
|
||||
{
|
||||
QFileInfo info{path};
|
||||
if(!info.exists())
|
||||
{
|
||||
Logger::error() << "Can't add tag for file " + info.absoluteFilePath() + " because it does not exist"
|
||||
<< Qt::endl;
|
||||
return false;
|
||||
}
|
||||
QString absolutePath = info.absoluteFilePath();
|
||||
if(!this->dbService->fileExistsInDatabase(absolutePath))
|
||||
{
|
||||
Logger::error() << "Only files that have been indexed can be tagged. File not in index: " + absolutePath
|
||||
<< Qt::endl;
|
||||
return false;
|
||||
}
|
||||
absolutePaths.append(absolutePath);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
int CommandTag::handle(QStringList arguments)
|
||||
{
|
||||
QCommandLineParser parser;
|
||||
parser.addPositionalArgument("add", "Adds a tag to a file",
|
||||
"add [tag] [paths...]. Adds the tag to the specified paths");
|
||||
parser.addPositionalArgument("remove", "Removes a path associated to a tag", "remove [tag] [path]");
|
||||
parser.addPositionalArgument("delete", "Deletes a tag", "delete [tag]");
|
||||
parser.addPositionalArgument("list", "Lists paths associated with a tag, or all tags", "list [tag]");
|
||||
parser.addPositionalArgument("show", "Lists tags associated with a path", "show [path]");
|
||||
|
||||
parser.addHelpOption();
|
||||
|
||||
parser.parse(arguments);
|
||||
|
||||
QStringList args = parser.positionalArguments();
|
||||
if(args.length() == 0)
|
||||
{
|
||||
parser.showHelp(EXIT_FAILURE);
|
||||
return EXIT_FAILURE;
|
||||
}
|
||||
TagManager tagManager{*this->dbService};
|
||||
QString cmd = args[0];
|
||||
if(cmd == "add")
|
||||
{
|
||||
if(args.length() < 3)
|
||||
{
|
||||
Logger::error() << "Not enough arguments provided. 'add' requires a tag followed by at least one path"
|
||||
<< Qt::endl;
|
||||
return EXIT_FAILURE;
|
||||
}
|
||||
QString tag = args[1];
|
||||
QVector<QString> paths = args.mid(2).toVector();
|
||||
|
||||
QVector<QString> absolutePaths;
|
||||
if(!ensureAbsolutePaths(paths, absolutePaths))
|
||||
{
|
||||
return EXIT_FAILURE;
|
||||
}
|
||||
bool result = tagManager.addPathsToTag(tag, absolutePaths);
|
||||
if(!result)
|
||||
{
|
||||
Logger::error() << "Failed to assign tags" << Qt::endl;
|
||||
return EXIT_FAILURE;
|
||||
}
|
||||
return EXIT_SUCCESS;
|
||||
}
|
||||
if(cmd == "list")
|
||||
{
|
||||
|
||||
QString tag;
|
||||
if(args.length() >= 2)
|
||||
{
|
||||
tag = args[1];
|
||||
}
|
||||
QVector<QString> entries;
|
||||
if(tag.isEmpty())
|
||||
{
|
||||
entries = tagManager.getTags();
|
||||
}
|
||||
else
|
||||
{
|
||||
entries = tagManager.getPaths(tag);
|
||||
}
|
||||
for(const QString &entry : entries)
|
||||
{
|
||||
Logger::info() << entry << Qt::endl;
|
||||
}
|
||||
}
|
||||
if(cmd == "remove")
|
||||
{
|
||||
if(args.length() < 3)
|
||||
{
|
||||
Logger::error() << "Not enough arguments provided. 'remove' requires a tag followed by at least one path"
|
||||
<< Qt::endl;
|
||||
return EXIT_FAILURE;
|
||||
}
|
||||
QString tag = args[1];
|
||||
QVector<QString> paths = args.mid(2).toVector();
|
||||
|
||||
QVector<QString> absolutePaths;
|
||||
if(!ensureAbsolutePaths(paths, absolutePaths))
|
||||
{
|
||||
return EXIT_FAILURE;
|
||||
}
|
||||
|
||||
if(!tagManager.removePathsForTag(tag, absolutePaths))
|
||||
{
|
||||
Logger::error() << "Failed to remove path assignments" << Qt::endl;
|
||||
return EXIT_FAILURE;
|
||||
}
|
||||
}
|
||||
if(cmd == "delete")
|
||||
{
|
||||
if(args.length() != 2)
|
||||
{
|
||||
Logger::error() << "The 'delete' command requires the tag to delete" << Qt::endl;
|
||||
return EXIT_FAILURE;
|
||||
}
|
||||
if(!tagManager.deleteTag(args[1]))
|
||||
{
|
||||
Logger::error() << "Failed to delete tag" << Qt::endl;
|
||||
return EXIT_FAILURE;
|
||||
}
|
||||
}
|
||||
if(cmd == "show")
|
||||
{
|
||||
if(args.length() != 2)
|
||||
{
|
||||
Logger::error() << "The 'show' command requires a path to show the assigned tags" << Qt::endl;
|
||||
return EXIT_FAILURE;
|
||||
}
|
||||
QString path = args[1];
|
||||
QVector<QString> absolutePaths;
|
||||
if(!ensureAbsolutePaths({path}, absolutePaths))
|
||||
{
|
||||
return EXIT_FAILURE;
|
||||
}
|
||||
QVector<QString> tags = tagManager.getTags(absolutePaths.at(0));
|
||||
for(const QString &entry : tags)
|
||||
{
|
||||
Logger::info() << entry << Qt::endl;
|
||||
}
|
||||
}
|
||||
return EXIT_SUCCESS;
|
||||
}
|
||||
|
|
@ -1,16 +0,0 @@
|
|||
#ifndef COMMANDTAG_H
|
||||
#define COMMANDTAG_H
|
||||
#include "command.h"
|
||||
|
||||
class CommandTag : public Command
|
||||
{
|
||||
protected:
|
||||
bool ensureAbsolutePaths(const QVector<QString> &paths, QVector<QString> &absolutePaths);
|
||||
|
||||
public:
|
||||
using Command::Command;
|
||||
|
||||
int handle(QStringList arguments) override;
|
||||
};
|
||||
|
||||
#endif // COMMANDTAG_H
|
||||
|
|
@ -38,13 +38,10 @@ int CommandUpdate::handle(QStringList arguments)
|
|||
QThreadPool::globalInstance()->setMaxThreadCount(threadsCount.toInt());
|
||||
}
|
||||
|
||||
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);
|
||||
|
|
@ -63,7 +60,7 @@ int CommandUpdate::handle(QStringList arguments)
|
|||
/* TODO: updated not printed, handled be verbose in FileSaver, but this can be improved */
|
||||
}
|
||||
connect(syncer, &IndexSyncer::finished, this,
|
||||
[this, dryRun, keepGoing](unsigned int totalUpdated, unsigned int totalRemoved, unsigned int totalErrors)
|
||||
[&](unsigned int totalUpdated, unsigned int totalRemoved, unsigned int totalErrors)
|
||||
{
|
||||
Logger::info() << "Syncing finished" << Qt::endl;
|
||||
|
||||
|
|
@ -75,7 +72,7 @@ int CommandUpdate::handle(QStringList arguments)
|
|||
}
|
||||
|
||||
int retval = 0;
|
||||
if(this->hasErrors && !keepGoing)
|
||||
if(hasErrors && !keepGoing)
|
||||
{
|
||||
retval = 1;
|
||||
}
|
||||
|
|
@ -85,7 +82,7 @@ int CommandUpdate::handle(QStringList arguments)
|
|||
[&](QString error)
|
||||
{
|
||||
Logger::error() << error << Qt::endl;
|
||||
this->hasErrors = true;
|
||||
hasErrors = true;
|
||||
});
|
||||
|
||||
this->autoFinish = false;
|
||||
|
|
|
|||
|
|
@ -4,9 +4,6 @@
|
|||
#include "filesaver.h"
|
||||
class CommandUpdate : public Command
|
||||
{
|
||||
protected:
|
||||
bool hasErrors = false;
|
||||
|
||||
public:
|
||||
using Command::Command;
|
||||
int handle(QStringList arguments) override;
|
||||
|
|
|
|||
32
cli/main.cpp
32
cli/main.cpp
|
|
@ -21,18 +21,15 @@
|
|||
#include "commandupdate.h"
|
||||
#include "commandsearch.h"
|
||||
#include "commandlist.h"
|
||||
#include "commandtag.h"
|
||||
#include "databasefactory.h"
|
||||
#include "logger.h"
|
||||
#include "sandboxedprocessor.h"
|
||||
#include "../shared/common.h"
|
||||
#include "../shared/filescanworker.h"
|
||||
#include "../shared/dbmigrator.h"
|
||||
|
||||
void printUsage(QString argv0)
|
||||
{
|
||||
qInfo() << "Usage:" << argv0 << "command";
|
||||
qInfo() << "Valid commands: add, update, search, delete, tag, list. Each command has a --help option.";
|
||||
}
|
||||
|
||||
Command *commandFromName(QString name, SqliteDbService &dbService)
|
||||
|
|
@ -57,10 +54,6 @@ Command *commandFromName(QString name, SqliteDbService &dbService)
|
|||
{
|
||||
return new CommandList(dbService);
|
||||
}
|
||||
if(name == "tag")
|
||||
{
|
||||
return new CommandTag(dbService);
|
||||
}
|
||||
|
||||
return nullptr;
|
||||
}
|
||||
|
|
@ -81,27 +74,6 @@ int main(int argc, char *argv[])
|
|||
try
|
||||
{
|
||||
Common::ensureConfigured();
|
||||
|
||||
DatabaseFactory factory{Common::databasePath()};
|
||||
DBMigrator migrator{factory};
|
||||
if(migrator.migrationNeeded())
|
||||
{
|
||||
Logger::info() << "Database is being upgraded, please be patient..." << Qt::endl;
|
||||
|
||||
QObject::connect(&migrator, &DBMigrator::migrationDone,
|
||||
[&](uint32_t migration)
|
||||
{ Logger::info() << "Progress: Successfully migrated to: " << migration << Qt::endl; });
|
||||
QObject::connect(&migrator, &DBMigrator::done,
|
||||
[]() { Logger::info() << "Database upgrade successful" << Qt::endl; });
|
||||
QObject::connect(&migrator, &DBMigrator::error,
|
||||
[&](QString error)
|
||||
{
|
||||
Logger::error() << error << Qt::endl;
|
||||
qApp->quit();
|
||||
});
|
||||
|
||||
migrator.performMigrations();
|
||||
}
|
||||
}
|
||||
catch(LooqsGeneralException &e)
|
||||
{
|
||||
|
|
@ -125,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)
|
||||
|
|
@ -144,7 +116,7 @@ int main(int argc, char *argv[])
|
|||
}
|
||||
else
|
||||
{
|
||||
printUsage(argv0);
|
||||
Logger::error() << "Unknown command:" << commandName << Qt::endl;
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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");
|
||||
}
|
||||
|
|
@ -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
|
||||
21
gui/gui.pro
21
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,42 +23,34 @@ 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 \
|
||||
main.cpp \
|
||||
mainwindow.cpp \
|
||||
clicklabel.cpp \
|
||||
previewcoordinator.cpp \
|
||||
previewgenerator.cpp \
|
||||
previewgeneratormapfunctor.cpp \
|
||||
previewgeneratorodt.cpp \
|
||||
previewgeneratorpdf.cpp \
|
||||
previewgeneratorplaintext.cpp \
|
||||
previewresult.cpp \
|
||||
previewresultodt.cpp \
|
||||
previewresultpdf.cpp \
|
||||
previewresultplaintext.cpp \
|
||||
renderconfig.cpp \
|
||||
rendertarget.cpp
|
||||
|
||||
HEADERS += \
|
||||
aboutdialog.h \
|
||||
ipc.h \
|
||||
ipcpreviewclient.h \
|
||||
ipcpreviewworker.h \
|
||||
ipcserver.h \
|
||||
mainwindow.h \
|
||||
clicklabel.h \
|
||||
previewcoordinator.h \
|
||||
previewgenerator.h \
|
||||
previewgeneratormapfunctor.h \
|
||||
previewgeneratorodt.h \
|
||||
previewgeneratorpdf.h \
|
||||
previewgeneratorplaintext.h \
|
||||
previewresult.h \
|
||||
previewresultodt.h \
|
||||
previewresultpdf.h \
|
||||
previewresultplaintext.h \
|
||||
renderconfig.h \
|
||||
|
|
@ -72,7 +60,6 @@ FORMS += \
|
|||
mainwindow.ui
|
||||
|
||||
INCLUDEPATH += /usr/include/poppler/qt5/
|
||||
INCLUDEPATH += /usr/include/quazip5
|
||||
|
||||
QT += widgets sql
|
||||
|
||||
|
|
@ -82,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
|
||||
|
||||
|
|
@ -97,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
|
||||
|
|
|
|||
|
|
@ -1,50 +1,16 @@
|
|||
#include <QtConcurrent>
|
||||
#include "ipcpreviewworker.h"
|
||||
#include "previewgeneratormapfunctor.h"
|
||||
IPCPreviewWorker::IPCPreviewWorker(QLocalSocket *peer)
|
||||
IPCPreviewWorker::IPCPreviewWorker()
|
||||
{
|
||||
this->peer = peer;
|
||||
this->connect(&previewWorkerWatcher, &QFutureWatcher<QByteArray>::resultReadyAt, this,
|
||||
[this](int index)
|
||||
{
|
||||
if(this->peer != nullptr)
|
||||
{
|
||||
QDataStream stream{this->peer};
|
||||
stream << previewWorkerWatcher.resultAt(index);
|
||||
this->peer->flush();
|
||||
}
|
||||
});
|
||||
connect(&previewWorkerWatcher, &QFutureWatcher<QByteArray>::finished, this, &IPCPreviewWorker::shutdownSocket);
|
||||
connect(this->peer, &QLocalSocket::disconnected, this, &IPCPreviewWorker::shutdownSocket);
|
||||
[this](int index) { emit previewGenerated(previewWorkerWatcher.resultAt(index)); });
|
||||
connect(&previewWorkerWatcher, &QFutureWatcher<QByteArray>::finished, this, [this] { emit finished(); });
|
||||
}
|
||||
|
||||
void IPCPreviewWorker::shutdownSocket()
|
||||
{
|
||||
if(cleaned)
|
||||
{
|
||||
return;
|
||||
}
|
||||
cleaned = true;
|
||||
if(this->peer != nullptr)
|
||||
{
|
||||
if(this->peer->state() == QLocalSocket::ConnectedState)
|
||||
{
|
||||
this->peer->flush();
|
||||
this->peer->waitForBytesWritten();
|
||||
this->peer->disconnectFromServer();
|
||||
if(this->peer->state() != QLocalSocket::UnconnectedState)
|
||||
{
|
||||
this->peer->waitForDisconnected();
|
||||
}
|
||||
}
|
||||
delete this->peer;
|
||||
this->peer = nullptr;
|
||||
}
|
||||
emit finished();
|
||||
}
|
||||
|
||||
void IPCPreviewWorker::start(RenderConfig config, const QVector<RenderTarget> &targets)
|
||||
void IPCPreviewWorker::start(RenderConfig config, const QVector<RenderTarget> &targets, QLocalSocket *peer)
|
||||
{
|
||||
stop();
|
||||
auto mapFunctor = PreviewGeneratorMapFunctor();
|
||||
mapFunctor.setRenderConfig(config);
|
||||
|
||||
|
|
|
|||
|
|
@ -11,21 +11,13 @@ class IPCPreviewWorker : public QObject
|
|||
Q_OBJECT
|
||||
private:
|
||||
QFutureWatcher<QByteArray> previewWorkerWatcher;
|
||||
QLocalSocket *peer;
|
||||
bool cleaned = false;
|
||||
|
||||
public:
|
||||
IPCPreviewWorker(QLocalSocket *peer);
|
||||
void start(RenderConfig config, const QVector<RenderTarget> &targets);
|
||||
IPCPreviewWorker();
|
||||
void start(RenderConfig config, const QVector<RenderTarget> &targets, QLocalSocket *peer);
|
||||
void stop();
|
||||
~IPCPreviewWorker()
|
||||
{
|
||||
delete this->peer;
|
||||
}
|
||||
private slots:
|
||||
void shutdownSocket();
|
||||
|
||||
signals:
|
||||
void previewGenerated(QByteArray);
|
||||
void finished();
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -18,6 +18,8 @@ IpcServer::IpcServer()
|
|||
/* Only 1, we are doing work for the GUI, not a service for general availability */
|
||||
this->spawningServer.setMaxPendingConnections(1);
|
||||
connect(&this->spawningServer, &QLocalServer::newConnection, this, &IpcServer::spawnerNewConnection);
|
||||
connect(&this->previewWorker, &IPCPreviewWorker::previewGenerated, this, &IpcServer::handlePreviewGenerated);
|
||||
connect(&this->previewWorker, &IPCPreviewWorker::finished, this, [this] { this->currentSocket->flush(); });
|
||||
}
|
||||
|
||||
bool IpcServer::startSpawner(QString socketPath)
|
||||
|
|
@ -29,6 +31,8 @@ bool IpcServer::startSpawner(QString socketPath)
|
|||
void IpcServer::spawnerNewConnection()
|
||||
{
|
||||
QLocalSocket *socket = this->spawningServer.nextPendingConnection();
|
||||
connect(socket, &QLocalSocket::disconnected, socket, &QLocalSocket::deleteLater);
|
||||
this->currentSocket = socket;
|
||||
if(socket != nullptr)
|
||||
{
|
||||
if(!socket->waitForReadyRead())
|
||||
|
|
@ -49,22 +53,21 @@ void IpcServer::spawnerNewConnection()
|
|||
stream.startTransaction();
|
||||
stream >> renderConfig >> targets;
|
||||
} while(!stream.commitTransaction() && socket->state() == QLocalSocket::ConnectedState);
|
||||
if(socket->state() == QLocalSocket::ConnectedState)
|
||||
{
|
||||
stream << targets.count();
|
||||
socket->flush();
|
||||
IPCPreviewWorker *previewWorker = new IPCPreviewWorker(socket);
|
||||
connect(previewWorker, &IPCPreviewWorker::finished, this, [previewWorker] { delete previewWorker; });
|
||||
previewWorker->start(renderConfig, targets);
|
||||
}
|
||||
else
|
||||
{
|
||||
delete socket;
|
||||
}
|
||||
|
||||
stream << targets.count();
|
||||
socket->flush();
|
||||
previewWorker.start(renderConfig, targets, socket);
|
||||
}
|
||||
if(command == StopGeneratePreviews)
|
||||
{
|
||||
/* TODO: implement */
|
||||
previewWorker.stop();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void IpcServer::handlePreviewGenerated(QByteArray ba)
|
||||
{
|
||||
QDataStream stream{this->currentSocket};
|
||||
stream << ba;
|
||||
this->currentSocket->flush();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,10 +10,13 @@ class IpcServer : public QObject
|
|||
{
|
||||
Q_OBJECT
|
||||
private:
|
||||
IPCPreviewWorker previewWorker;
|
||||
QLocalServer spawningServer;
|
||||
QLocalSocket *currentSocket = nullptr;
|
||||
SaveFileResult addFile(QString file);
|
||||
private slots:
|
||||
void spawnerNewConnection();
|
||||
void handlePreviewGenerated(QByteArray ba);
|
||||
|
||||
public:
|
||||
IpcServer();
|
||||
|
|
|
|||
117
gui/main.cpp
117
gui/main.cpp
|
|
@ -12,8 +12,6 @@
|
|||
#include "previewresultpdf.h"
|
||||
#include "../shared/common.h"
|
||||
#include "../shared/sandboxedprocessor.h"
|
||||
#include "../shared/dbmigrator.h"
|
||||
#include "../shared/logger.h"
|
||||
#include "../submodules/exile.h/exile.h"
|
||||
#include "ipcserver.h"
|
||||
|
||||
|
|
@ -25,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 wpath 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);
|
||||
}
|
||||
|
||||
|
|
@ -82,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";
|
||||
|
|
@ -116,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();
|
||||
|
|
@ -144,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++)
|
||||
{
|
||||
|
|
@ -151,67 +117,9 @@ int main(int argc, char *argv[])
|
|||
}
|
||||
parser.parse(appArgs);
|
||||
|
||||
QApplication a(argc, argv);
|
||||
try
|
||||
{
|
||||
Common::ensureConfigured();
|
||||
DatabaseFactory factory{Common::databasePath()};
|
||||
DBMigrator migrator{factory};
|
||||
|
||||
if(migrator.migrationNeeded())
|
||||
{
|
||||
auto answer = QMessageBox::question(nullptr, "Proceed with upgrade?",
|
||||
"A database upgrade is required. This might take a few minutes. Say "
|
||||
"'yes' to start upgrade, 'no' to exit.");
|
||||
|
||||
if(answer == QMessageBox::No)
|
||||
{
|
||||
a.quit();
|
||||
return 0;
|
||||
}
|
||||
|
||||
QFile out;
|
||||
out.open(stderr, QIODevice::WriteOnly);
|
||||
Logger migrationLogger{&out};
|
||||
migrationLogger << "Database is being upgraded, please be patient..." << Qt::endl;
|
||||
QThread migratorThread;
|
||||
migrator.moveToThread(&migratorThread);
|
||||
migratorThread.start();
|
||||
QProgressDialog progressDialog;
|
||||
|
||||
QObject::connect(&migrator, &DBMigrator::migrationDone,
|
||||
[&migrationLogger](uint32_t migration)
|
||||
{ migrationLogger << "Progress: Successfully migrated to: " << migration << Qt::endl; });
|
||||
QObject::connect(&migrator, &DBMigrator::done, &progressDialog, &QProgressDialog::reset);
|
||||
QObject::connect(&migrator, &DBMigrator::error,
|
||||
[&](QString error)
|
||||
{
|
||||
QMetaObject::invokeMethod(qApp,
|
||||
[error]
|
||||
|
||||
{
|
||||
Logger::error() << error << Qt::endl;
|
||||
QMessageBox::critical(nullptr, "Error during upgrade",
|
||||
error);
|
||||
exit(EXIT_FAILURE);
|
||||
}
|
||||
|
||||
);
|
||||
});
|
||||
QTimer::singleShot(0, &migrator, &DBMigrator::start);
|
||||
|
||||
progressDialog.setWindowTitle("Upgrading database");
|
||||
progressDialog.setLabelText("Upgrading database - this might take several minutes, please wait");
|
||||
progressDialog.setWindowModality(Qt::ApplicationModal);
|
||||
progressDialog.setMinimum(0);
|
||||
progressDialog.setMaximum(0);
|
||||
progressDialog.setValue(0);
|
||||
progressDialog.setCancelButton(nullptr);
|
||||
progressDialog.exec();
|
||||
|
||||
migrationLogger << "Database has been successfully upgraded" << Qt::endl;
|
||||
migratorThread.quit();
|
||||
}
|
||||
}
|
||||
catch(LooqsGeneralException &e)
|
||||
{
|
||||
|
|
@ -219,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>");
|
||||
|
|
|
|||
Різницю між файлами не показано, бо вона завелика
Завантажити різницю
112
gui/mainwindow.h
112
gui/mainwindow.h
|
|
@ -12,9 +12,8 @@
|
|||
#include <QProgressDialog>
|
||||
#include "../shared/looqsquery.h"
|
||||
#include "../shared/indexsyncer.h"
|
||||
#include "previewcoordinator.h"
|
||||
#include "ipcpreviewclient.h"
|
||||
#include "indexer.h"
|
||||
#include "tagmanager.h"
|
||||
namespace Ui
|
||||
{
|
||||
class MainWindow;
|
||||
|
|
@ -24,65 +23,6 @@ class MainWindow : public QMainWindow
|
|||
{
|
||||
Q_OBJECT
|
||||
|
||||
private:
|
||||
DatabaseFactory *dbFactory;
|
||||
SqliteDbService *dbService;
|
||||
Ui::MainWindow *ui;
|
||||
|
||||
PreviewCoordinator previewCoordinator;
|
||||
|
||||
QThread syncerThread;
|
||||
Indexer *indexer;
|
||||
IndexSyncer *indexSyncer;
|
||||
QProgressDialog progressDialog;
|
||||
QFileIconProvider iconProvider;
|
||||
QSqlDatabase db;
|
||||
QFutureWatcher<QVector<SearchResult>> searchWatcher;
|
||||
LooqsQuery contentSearchQuery;
|
||||
QVector<QString> searchHistory;
|
||||
|
||||
TagManager *tagManager;
|
||||
|
||||
int currentSearchHistoryIndex = 0;
|
||||
QString currentSavedSearchText;
|
||||
bool previewDirty = false;
|
||||
int previewsPerPage = 20;
|
||||
|
||||
void connectSignals();
|
||||
void makePreviews(int page);
|
||||
bool previewTabActive();
|
||||
bool indexerTabActive();
|
||||
void keyPressEvent(QKeyEvent *event) override;
|
||||
void handleSearchResults(const QVector<SearchResult> &results);
|
||||
void handleSearchError(QString error);
|
||||
void createSearchResultMenu(QMenu &menu, const QFileInfo &fileInfo);
|
||||
void openDocument(QString path, int num);
|
||||
void openFile(QString path);
|
||||
void initSettingsTabs();
|
||||
int currentSelectedScale();
|
||||
void processShortcut(int key);
|
||||
bool eventFilter(QObject *object, QEvent *event) override;
|
||||
|
||||
private slots:
|
||||
void lineEditReturnPressed();
|
||||
void treeSearchItemActivated(QTreeWidgetItem *item, int i);
|
||||
void showSearchResultsContextMenu(const QPoint &point);
|
||||
void tabChanged();
|
||||
void previewReceived();
|
||||
void comboScaleChanged(int i);
|
||||
void spinPreviewPageValueChanged(int val);
|
||||
void startIndexing();
|
||||
void finishIndexing();
|
||||
void addPathToIndex();
|
||||
void startIndexSync();
|
||||
void saveSettings();
|
||||
void exportFailedPaths();
|
||||
|
||||
signals:
|
||||
void startIpcPreviews(RenderConfig config, const QVector<RenderTarget> &targets);
|
||||
void stopIpcPreviews();
|
||||
void beginIndexSync();
|
||||
|
||||
public:
|
||||
explicit MainWindow(QWidget *parent, QString socketPath);
|
||||
~MainWindow();
|
||||
|
|
@ -90,8 +30,54 @@ class MainWindow : public QMainWindow
|
|||
void beginSearch(const QString &query);
|
||||
void startPdfPreviewGeneration(QVector<SearchResult> paths, double scalefactor);
|
||||
|
||||
protected:
|
||||
void closeEvent(QCloseEvent *event) override;
|
||||
private:
|
||||
DatabaseFactory *dbFactory;
|
||||
SqliteDbService *dbService;
|
||||
Ui::MainWindow *ui;
|
||||
IPCPreviewClient ipcPreviewClient;
|
||||
QThread ipcClientThread;
|
||||
QThread syncerThread;
|
||||
IndexSyncer *indexSyncer;
|
||||
QProgressDialog progressDialog;
|
||||
|
||||
Indexer *indexer;
|
||||
QFileIconProvider iconProvider;
|
||||
bool previewDirty;
|
||||
QSqlDatabase db;
|
||||
QFutureWatcher<QVector<SearchResult>> searchWatcher;
|
||||
void add(QString path, unsigned int page);
|
||||
QVector<SearchResult> previewableSearchResults;
|
||||
void connectSignals();
|
||||
void makePreviews(int page);
|
||||
bool previewTabActive();
|
||||
bool indexerTabActive();
|
||||
void keyPressEvent(QKeyEvent *event) override;
|
||||
unsigned int processedPdfPreviews;
|
||||
void handleSearchResults(const QVector<SearchResult> &results);
|
||||
void handleSearchError(QString error);
|
||||
LooqsQuery contentSearchQuery;
|
||||
int previewsPerPage;
|
||||
void createSearchResutlMenu(QMenu &menu, const QFileInfo &fileInfo);
|
||||
void openDocument(QString path, int num);
|
||||
void openFile(QString path);
|
||||
unsigned int currentPreviewGeneration = 1;
|
||||
private slots:
|
||||
void lineEditReturnPressed();
|
||||
void treeSearchItemActivated(QTreeWidgetItem *item, int i);
|
||||
void showSearchResultsContextMenu(const QPoint &point);
|
||||
void tabChanged();
|
||||
void previewReceived(QSharedPointer<PreviewResult> preview, unsigned int previewGeneration);
|
||||
void comboScaleChanged(int i);
|
||||
void spinPreviewPageValueChanged(int val);
|
||||
void startIndexing();
|
||||
void finishIndexing();
|
||||
void addPathToIndex();
|
||||
void startIndexSync();
|
||||
|
||||
signals:
|
||||
void startIpcPreviews(RenderConfig config, const QVector<RenderTarget> &targets);
|
||||
void stopIpcPreviews();
|
||||
void beginIndexSync();
|
||||
};
|
||||
|
||||
#endif // MAINWINDOW_H
|
||||
|
|
|
|||
|
|
@ -6,8 +6,8 @@
|
|||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>1280</width>
|
||||
<height>923</height>
|
||||
<width>1221</width>
|
||||
<height>709</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="windowTitle">
|
||||
|
|
@ -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>0</number>
|
||||
</property>
|
||||
<widget class="QWidget" name="resultsTab">
|
||||
<attribute name="title">
|
||||
|
|
@ -78,8 +81,8 @@
|
|||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>1244</width>
|
||||
<height>641</height>
|
||||
<width>1185</width>
|
||||
<height>419</height>
|
||||
</rect>
|
||||
</property>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout"/>
|
||||
|
|
@ -159,16 +162,6 @@
|
|||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QComboBox" name="comboPreviewFiles">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Maximum" vsizetype="Fixed">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<spacer name="horizontalSpacer">
|
||||
<property name="orientation">
|
||||
|
|
@ -191,271 +184,6 @@
|
|||
<string>Index</string>
|
||||
</attribute>
|
||||
<layout class="QGridLayout" name="gridLayout">
|
||||
<item row="6" column="0">
|
||||
<widget class="QGroupBox" name="groupBoxIndexProgress">
|
||||
<property name="contextMenuPolicy">
|
||||
<enum>Qt::PreventContextMenu</enum>
|
||||
</property>
|
||||
<property name="title">
|
||||
<string>Index Progress</string>
|
||||
</property>
|
||||
<layout class="QVBoxLayout" name="verticalLayout_4">
|
||||
<item>
|
||||
<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>
|
||||
</widget>
|
||||
</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>
|
||||
<bold>false</bold>
|
||||
</font>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Added:</string>
|
||||
</property>
|
||||
</widget>
|
||||
</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>
|
||||
<bold>false</bold>
|
||||
</font>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Skipped:</string>
|
||||
</property>
|
||||
</widget>
|
||||
</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>
|
||||
<bold>false</bold>
|
||||
</font>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Failed:</string>
|
||||
</property>
|
||||
</widget>
|
||||
</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>
|
||||
<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>
|
||||
<property name="checked">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QCheckBox" name="chkFillContentForContentless">
|
||||
<property name="enabled">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Index content for files previously indexed without content</string>
|
||||
</property>
|
||||
<property name="checked">
|
||||
<bool>false</bool>
|
||||
</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">
|
||||
|
|
@ -495,187 +223,122 @@
|
|||
</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>
|
||||
<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>
|
||||
<item>
|
||||
<widget class="QCheckBox" name="chkRemoveOldDb">
|
||||
<property name="text">
|
||||
<string>Remove old database on save</string>
|
||||
</property>
|
||||
</widget>
|
||||
</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="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="lblMaxNumbersPreviewPages">
|
||||
<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>
|
||||
<item>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_8">
|
||||
<item>
|
||||
<widget class="QLabel" name="lblScrollModeForPreviews">
|
||||
<property name="text">
|
||||
<string>Scroll mode for previews:</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QRadioButton" name="radioScrollVertically">
|
||||
<property name="text">
|
||||
<string>Vertically</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QRadioButton" name="radioScrollHorizontally">
|
||||
<property name="text">
|
||||
<string>Horizontally</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<spacer name="horizontalSpacer_6">
|
||||
<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>
|
||||
<widget class="QPushButton" name="btnSaveSettings">
|
||||
<item row="5" column="0">
|
||||
<widget class="QLabel" name="label">
|
||||
<property name="text">
|
||||
<string>Save settings and restart</string>
|
||||
<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>
|
||||
</property>
|
||||
<property name="title">
|
||||
<string>Index Progress</string>
|
||||
</property>
|
||||
<layout class="QVBoxLayout" name="verticalLayout_4">
|
||||
<item>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_7">
|
||||
<item>
|
||||
<widget class="QLabel" name="lblPathsFound">
|
||||
<property name="text">
|
||||
<string>Paths found:</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QLabel" name="lblPathsFoundValue">
|
||||
<property name="text">
|
||||
<string/>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_4">
|
||||
<item>
|
||||
<widget class="QLabel" name="lblAdded">
|
||||
<property name="font">
|
||||
<font>
|
||||
<weight>50</weight>
|
||||
<bold>false</bold>
|
||||
</font>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Added:</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QLabel" name="lblAddedValue">
|
||||
<property name="text">
|
||||
<string/>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_5">
|
||||
<item>
|
||||
<widget class="QLabel" name="lblSkipped">
|
||||
<property name="font">
|
||||
<font>
|
||||
<weight>50</weight>
|
||||
<bold>false</bold>
|
||||
</font>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Skipped:</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QLabel" name="lblSkippedValue">
|
||||
<property name="text">
|
||||
<string/>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_6">
|
||||
<item>
|
||||
<widget class="QLabel" name="lblFailed">
|
||||
<property name="font">
|
||||
<font>
|
||||
<weight>50</weight>
|
||||
<bold>false</bold>
|
||||
</font>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Failed:</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QLabel" name="lblFailedValue">
|
||||
<property name="text">
|
||||
<string/>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="6" column="0">
|
||||
<widget class="QLineEdit" name="txtIgnorePatterns"/>
|
||||
</item>
|
||||
<item row="10" column="0">
|
||||
<widget class="QPushButton" name="btnStartIndexing">
|
||||
<property name="text">
|
||||
<string>Start indexing</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
|
|
@ -705,7 +368,7 @@
|
|||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>1280</width>
|
||||
<width>1221</width>
|
||||
<height>35</height>
|
||||
</rect>
|
||||
</property>
|
||||
|
|
@ -713,8 +376,8 @@
|
|||
<property name="title">
|
||||
<string>looqs</string>
|
||||
</property>
|
||||
<addaction name="menuOpenConfigInTextEditorAction"/>
|
||||
<addaction name="menuSyncIndexAction"/>
|
||||
<addaction name="menuOpenUserManualAction"/>
|
||||
<addaction name="menuAboutAction"/>
|
||||
<addaction name="menuAboutQtAction"/>
|
||||
<addaction name="separator"/>
|
||||
|
|
@ -726,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>
|
||||
|
|
@ -736,30 +404,8 @@
|
|||
<string>Sync index (remove deleted, update existing files)</string>
|
||||
</property>
|
||||
</action>
|
||||
<action name="menuOpenUserManualAction">
|
||||
<property name="text">
|
||||
<string>Open user manual</string>
|
||||
</property>
|
||||
</action>
|
||||
</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>
|
||||
|
|
|
|||
|
|
@ -1,97 +0,0 @@
|
|||
#include "previewcoordinator.h"
|
||||
#include <QFileInfo>
|
||||
|
||||
PreviewCoordinator::PreviewCoordinator()
|
||||
{
|
||||
this->ipcPreviewClient.moveToThread(&this->ipcClientThread);
|
||||
|
||||
connect(&ipcPreviewClient, &IPCPreviewClient::previewReceived, this, &PreviewCoordinator::handleReceivedPreview,
|
||||
Qt::QueuedConnection);
|
||||
connect(&ipcPreviewClient, &IPCPreviewClient::finished, this, [&] { emit completedGeneration(); });
|
||||
connect(this, &PreviewCoordinator::ipcStartGeneration, &ipcPreviewClient, &IPCPreviewClient::startGeneration,
|
||||
Qt::QueuedConnection);
|
||||
|
||||
this->ipcClientThread.start();
|
||||
}
|
||||
|
||||
void PreviewCoordinator::init(const QVector<SearchResult> &searchResults)
|
||||
{
|
||||
this->previewableSearchResults.clear();
|
||||
for(const SearchResult &result : searchResults)
|
||||
{
|
||||
if(result.wasContentSearch)
|
||||
{
|
||||
QString path = result.fileData.absPath;
|
||||
// HACK until we can preview them properly
|
||||
if(path.endsWith(".html") || path.endsWith(".htm"))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
QFileInfo info{path};
|
||||
if(info.exists())
|
||||
{
|
||||
this->previewableSearchResults.append(result);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void PreviewCoordinator::setSocketPath(QString socketPath)
|
||||
{
|
||||
this->socketPath = socketPath;
|
||||
this->ipcPreviewClient.setSocketPath(socketPath);
|
||||
}
|
||||
|
||||
int PreviewCoordinator::previewableCount() const
|
||||
{
|
||||
return this->previewableSearchResults.count();
|
||||
}
|
||||
|
||||
QSharedPointer<PreviewResult> PreviewCoordinator::resultAt(int index)
|
||||
{
|
||||
if(this->previewResults.size() > index)
|
||||
{
|
||||
return {this->previewResults[index]};
|
||||
}
|
||||
return {nullptr};
|
||||
}
|
||||
|
||||
const QVector<SearchResult> &PreviewCoordinator::getPreviewableSearchResults() const
|
||||
{
|
||||
return this->previewableSearchResults;
|
||||
}
|
||||
|
||||
void PreviewCoordinator::handleReceivedPreview(QSharedPointer<PreviewResult> preview, unsigned int previewGeneration)
|
||||
{
|
||||
if(previewGeneration < this->currentPreviewGeneration)
|
||||
{
|
||||
return;
|
||||
}
|
||||
if(!preview.isNull() && preview->hasPreview())
|
||||
{
|
||||
QString docPath = preview->getDocumentPath();
|
||||
auto previewPage = preview->getPage();
|
||||
int pos = previewOrder[docPath + QString::number(previewPage)];
|
||||
this->previewResults[pos] = preview;
|
||||
emit previewReady();
|
||||
}
|
||||
}
|
||||
|
||||
void PreviewCoordinator::startGeneration(RenderConfig config, const QVector<RenderTarget> &targets)
|
||||
{
|
||||
++this->currentPreviewGeneration;
|
||||
|
||||
this->previewOrder.clear();
|
||||
this->previewResults.clear();
|
||||
|
||||
this->previewResults.resize(targets.size());
|
||||
this->previewResults.fill(nullptr);
|
||||
|
||||
int i = 0;
|
||||
for(const RenderTarget &target : targets)
|
||||
{
|
||||
this->previewOrder[target.path + QString::number(target.page)] = i++;
|
||||
}
|
||||
|
||||
emit ipcStartGeneration(config, targets);
|
||||
}
|
||||
|
|
@ -1,48 +0,0 @@
|
|||
#ifndef PREVIEWCOORDINATOR_H
|
||||
#define PREVIEWCOORDINATOR_H
|
||||
#include <QVector>
|
||||
#include <QObject>
|
||||
#include <QThread>
|
||||
#include "searchresult.h"
|
||||
#include "previewresult.h"
|
||||
#include "ipcpreviewclient.h"
|
||||
#include "rendertarget.h"
|
||||
class PreviewCoordinator : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
private:
|
||||
QThread ipcClientThread;
|
||||
IPCPreviewClient ipcPreviewClient;
|
||||
QString socketPath;
|
||||
|
||||
QVector<QSharedPointer<PreviewResult>> previewResults;
|
||||
QVector<SearchResult> previewableSearchResults;
|
||||
|
||||
unsigned int currentPreviewGeneration = 1;
|
||||
|
||||
/* Quick lookup table for the order a preview should have */
|
||||
QHash<QString, int> previewOrder;
|
||||
|
||||
public:
|
||||
PreviewCoordinator();
|
||||
|
||||
void init(const QVector<SearchResult> &searchResults);
|
||||
|
||||
int previewableCount() const;
|
||||
const QVector<SearchResult> &getPreviewableSearchResults() const;
|
||||
|
||||
QSharedPointer<PreviewResult> resultAt(int index);
|
||||
|
||||
void setSocketPath(QString socketPath);
|
||||
public slots:
|
||||
void startGeneration(RenderConfig config, const QVector<RenderTarget> &targets);
|
||||
void handleReceivedPreview(QSharedPointer<PreviewResult> preview, unsigned int previewGeneration);
|
||||
|
||||
signals:
|
||||
void previewReady();
|
||||
void completedGeneration();
|
||||
void error(QString);
|
||||
void ipcStartGeneration(RenderConfig config, const QVector<RenderTarget> &targets);
|
||||
};
|
||||
|
||||
#endif // PREVIEWCOORDINATOR_H
|
||||
|
|
@ -1,24 +1,18 @@
|
|||
#include "../shared/common.h"
|
||||
#include "previewgenerator.h"
|
||||
#include <QMutexLocker>
|
||||
#include "previewgeneratorpdf.h"
|
||||
#include "previewgeneratorplaintext.h"
|
||||
#include "previewgeneratorodt.h"
|
||||
|
||||
static PreviewGenerator *plainTextGenerator = new PreviewGeneratorPlainText();
|
||||
|
||||
static QHash<QString, PreviewGenerator *> generators{
|
||||
static QMap<QString, PreviewGenerator *> generators{
|
||||
{"pdf", new PreviewGeneratorPdf()}, {"txt", plainTextGenerator}, {"md", plainTextGenerator},
|
||||
{"py", plainTextGenerator}, {"java", plainTextGenerator}, {"js", plainTextGenerator},
|
||||
{"cpp", plainTextGenerator}, {"c", plainTextGenerator}, {"sql", plainTextGenerator},
|
||||
{"odt", new PreviewGeneratorOdt()}};
|
||||
{"cpp", plainTextGenerator}, {"c", plainTextGenerator}, {"sql", plainTextGenerator}};
|
||||
|
||||
static QMutex generatorsMutex;
|
||||
PreviewGenerator *PreviewGenerator::get(QFileInfo &info)
|
||||
{
|
||||
QMutexLocker locker(&generatorsMutex);
|
||||
PreviewGenerator *result = generators.value(info.suffix(), nullptr);
|
||||
locker.unlock();
|
||||
if(result == nullptr)
|
||||
{
|
||||
if(Common::isTextFile(info))
|
||||
|
|
|
|||
|
|
@ -1,32 +0,0 @@
|
|||
#include <quazip.h>
|
||||
#include <quazipfile.h>
|
||||
#include "previewgeneratorplaintext.h"
|
||||
#include "previewgeneratorodt.h"
|
||||
#include "previewresultodt.h"
|
||||
#include "../shared/tagstripperprocessor.h"
|
||||
|
||||
QSharedPointer<PreviewResult> PreviewGeneratorOdt::generate(RenderConfig config, QString documentPath,
|
||||
unsigned int page)
|
||||
{
|
||||
PreviewResultOdt *result = new PreviewResultOdt(documentPath, page);
|
||||
|
||||
QFileInfo info{documentPath};
|
||||
|
||||
QuaZipFile zipFile(documentPath);
|
||||
zipFile.setFileName("content.xml");
|
||||
if(!zipFile.open(QIODevice::ReadOnly))
|
||||
{
|
||||
return QSharedPointer<PreviewResult>(result);
|
||||
}
|
||||
QByteArray entireContent = zipFile.readAll();
|
||||
if(entireContent.isEmpty())
|
||||
{
|
||||
throw LooqsGeneralException("Error while reading content.xml of " + documentPath);
|
||||
}
|
||||
TagStripperProcessor tsp;
|
||||
QString content = tsp.process(entireContent).constFirst().content;
|
||||
|
||||
PreviewGeneratorPlainText plainTextGenerator;
|
||||
result->setText(plainTextGenerator.generatePreviewText(content, config, info.fileName()));
|
||||
return QSharedPointer<PreviewResult>(result);
|
||||
}
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
#ifndef PREVIEWGENERATORODT_H
|
||||
#define PREVIEWGENERATORODT_H
|
||||
|
||||
#include "previewgenerator.h"
|
||||
class PreviewGeneratorOdt : public PreviewGenerator
|
||||
{
|
||||
public:
|
||||
using PreviewGenerator::PreviewGenerator;
|
||||
|
||||
QSharedPointer<PreviewResult> generate(RenderConfig config, QString documentPath, unsigned int page);
|
||||
};
|
||||
#endif // PREVIEWGENERATORODT_H
|
||||
|
|
@ -1,18 +1,15 @@
|
|||
#include <QMutexLocker>
|
||||
#include <QPainter>
|
||||
#include <QRegularExpression>
|
||||
#include "previewgeneratorpdf.h"
|
||||
|
||||
static QMutex cacheMutex;
|
||||
|
||||
Poppler::Document *PreviewGeneratorPdf::document(QString path)
|
||||
{
|
||||
QMutexLocker locker(&cacheMutex);
|
||||
if(documentcache.contains(path))
|
||||
{
|
||||
return documentcache.value(path);
|
||||
}
|
||||
locker.unlock();
|
||||
Poppler::Document *result = Poppler::Document::load(path);
|
||||
if(result == nullptr)
|
||||
{
|
||||
|
|
@ -20,10 +17,7 @@ Poppler::Document *PreviewGeneratorPdf::document(QString path)
|
|||
return nullptr;
|
||||
}
|
||||
result->setRenderHint(Poppler::Document::TextAntialiasing);
|
||||
result->setRenderHint(Poppler::Document::TextHinting);
|
||||
result->setRenderHint(Poppler::Document::TextSlightHinting);
|
||||
|
||||
locker.relock();
|
||||
QMutexLocker locker(&cacheMutex);
|
||||
documentcache.insert(path, result);
|
||||
locker.unlock();
|
||||
return result;
|
||||
|
|
@ -51,12 +45,7 @@ QSharedPointer<PreviewResult> PreviewGeneratorPdf::generate(RenderConfig config,
|
|||
QImage img = pdfPage->renderToImage(config.scaleX, config.scaleY);
|
||||
for(QString &word : config.wordsToHighlight)
|
||||
{
|
||||
QList<QRectF> rects =
|
||||
pdfPage->search(word, Poppler::Page::SearchFlag::IgnoreCase | Poppler::Page::SearchFlag::WholeWords);
|
||||
if(rects.empty())
|
||||
{
|
||||
rects = pdfPage->search(word, Poppler::Page::SearchFlag::IgnoreCase);
|
||||
}
|
||||
QList<QRectF> rects = pdfPage->search(word, Poppler::Page::SearchFlag::IgnoreCase);
|
||||
for(QRectF &rect : rects)
|
||||
{
|
||||
QPainter painter(&img);
|
||||
|
|
|
|||
|
|
@ -1,28 +1,36 @@
|
|||
#include <QTextStream>
|
||||
#include <QRegularExpression>
|
||||
|
||||
#include "previewgeneratorplaintext.h"
|
||||
#include "previewresultplaintext.h"
|
||||
#include "../shared/limitqueue.h"
|
||||
|
||||
QString PreviewGeneratorPlainText::generatePreviewText(QString content, RenderConfig config, QString fileName)
|
||||
QSharedPointer<PreviewResult> PreviewGeneratorPlainText::generate(RenderConfig config, QString documentPath,
|
||||
unsigned int page)
|
||||
{
|
||||
QString resulText = "";
|
||||
PreviewResultPlainText *result = new PreviewResultPlainText(documentPath, page);
|
||||
QFile file(documentPath);
|
||||
if(!file.open(QFile::ReadOnly | QFile::Text))
|
||||
{
|
||||
return QSharedPointer<PreviewResultPlainText>(result);
|
||||
}
|
||||
QTextStream in(&file);
|
||||
|
||||
QString resulText = "";
|
||||
QString content = in.readAll();
|
||||
QMap<int, QString> snippet;
|
||||
|
||||
int coveredRange = -1;
|
||||
int lastWordPos = -1;
|
||||
int coveredRange = 0;
|
||||
|
||||
int lastWordPos = 0;
|
||||
QHash<QString, int> countmap;
|
||||
|
||||
const unsigned int maxSnippets = 7;
|
||||
unsigned int currentSnippets = 0;
|
||||
for(QString &word : config.wordsToHighlight)
|
||||
{
|
||||
|
||||
int lastPos = 0;
|
||||
int index = content.indexOf(word, lastPos, Qt::CaseInsensitive);
|
||||
while(index != -1 && currentSnippets < MAX_SNIPPETS)
|
||||
while(index != -1 && currentSnippets < maxSnippets)
|
||||
{
|
||||
countmap[word] = countmap.value(word, 0) + 1;
|
||||
|
||||
|
|
@ -58,222 +66,25 @@ QString PreviewGeneratorPlainText::generatePreviewText(QString content, RenderCo
|
|||
++i;
|
||||
}
|
||||
|
||||
resulText = resulText.toHtmlEscaped();
|
||||
QString header = "<b>" + fileName + "</b> ";
|
||||
for(QString &word : config.wordsToHighlight)
|
||||
{
|
||||
resulText.replace(word, "<span style=\"background-color: yellow;\">" + word + "</span>", Qt::CaseInsensitive);
|
||||
header += word + ": " + QString::number(countmap[word]) + " ";
|
||||
}
|
||||
|
||||
if(currentSnippets == MAX_SNIPPETS)
|
||||
QFileInfo info{documentPath};
|
||||
|
||||
QString header = "<b>" + info.fileName() + "</b> ";
|
||||
for(QString &word : config.wordsToHighlight)
|
||||
{
|
||||
header += word + ": " + QString::number(countmap[word]) + " ";
|
||||
}
|
||||
if(currentSnippets == maxSnippets)
|
||||
{
|
||||
header += "(truncated)";
|
||||
}
|
||||
|
||||
header += "<hr>";
|
||||
|
||||
return header + resulText.replace("\n", "<br>").mid(0, 1000);
|
||||
}
|
||||
|
||||
struct Snippet
|
||||
{
|
||||
/* Contains each line number and line of the snippet*/
|
||||
QString snippetText;
|
||||
|
||||
/* How many times a word occurs in the snippetText */
|
||||
QHash<QString, int> wordCountMap;
|
||||
};
|
||||
|
||||
QString PreviewGeneratorPlainText::generateLineBasedPreviewText(QTextStream &in, RenderConfig config, QString fileName)
|
||||
{
|
||||
QVector<Snippet> snippets;
|
||||
const int contextLinesCount = 2;
|
||||
LimitQueue<QString> queue(contextLinesCount);
|
||||
QString currentLine;
|
||||
currentLine.reserve(512);
|
||||
|
||||
/* How many lines to read after a line with a match (like grep -A ) */
|
||||
int justReadLinesCount = -1;
|
||||
|
||||
struct Snippet currentSnippet;
|
||||
|
||||
auto appendLine = [¤tSnippet, &config](int lineNumber, QString &line)
|
||||
{
|
||||
int foundWordsCount = 0;
|
||||
for(QString &word : config.wordsToHighlight)
|
||||
{
|
||||
QRegularExpression searchRegex("\\b" + QRegularExpression::escape(word) + "\\b");
|
||||
bool containsRegex = line.contains(searchRegex);
|
||||
bool contains = false;
|
||||
if(!containsRegex)
|
||||
{
|
||||
contains = line.contains(word, Qt::CaseInsensitive);
|
||||
}
|
||||
if(containsRegex || contains)
|
||||
{
|
||||
currentSnippet.wordCountMap[word] = currentSnippet.wordCountMap.value(word, 0) + 1;
|
||||
QString replacementString = "<span style=\"background-color: yellow;\">" + word + "</span>";
|
||||
if(containsRegex)
|
||||
{
|
||||
line.replace(searchRegex, replacementString);
|
||||
}
|
||||
else
|
||||
{
|
||||
line.replace(word, replacementString, Qt::CaseInsensitive);
|
||||
}
|
||||
++foundWordsCount;
|
||||
}
|
||||
}
|
||||
currentSnippet.snippetText.append(QString("<b>%1</b>%2<br>").arg(lineNumber).arg(line));
|
||||
return foundWordsCount;
|
||||
};
|
||||
|
||||
unsigned int lineCount = 0;
|
||||
while(in.readLineInto(¤tLine))
|
||||
{
|
||||
currentLine = currentLine.toHtmlEscaped();
|
||||
++lineCount;
|
||||
bool matched = false;
|
||||
if(justReadLinesCount > 0)
|
||||
{
|
||||
|
||||
int result = appendLine(lineCount, currentLine);
|
||||
if(justReadLinesCount == 1 && result > 0)
|
||||
{
|
||||
justReadLinesCount = contextLinesCount;
|
||||
}
|
||||
else
|
||||
{
|
||||
--justReadLinesCount;
|
||||
}
|
||||
|
||||
continue;
|
||||
}
|
||||
if(justReadLinesCount == 0)
|
||||
{
|
||||
currentSnippet.snippetText += "---<br>";
|
||||
justReadLinesCount = -1;
|
||||
snippets.append(currentSnippet);
|
||||
currentSnippet = {};
|
||||
}
|
||||
for(QString &word : config.wordsToHighlight)
|
||||
{
|
||||
if(currentLine.contains(word, Qt::CaseInsensitive))
|
||||
{
|
||||
matched = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if(matched)
|
||||
{
|
||||
while(queue.size() > 0)
|
||||
{
|
||||
int queuedLineCount = lineCount - queue.size();
|
||||
QString queuedLine = queue.dequeue();
|
||||
appendLine(queuedLineCount, queuedLine);
|
||||
}
|
||||
appendLine(lineCount, currentLine);
|
||||
justReadLinesCount = contextLinesCount;
|
||||
}
|
||||
else
|
||||
{
|
||||
queue.enqueue(currentLine);
|
||||
}
|
||||
}
|
||||
|
||||
if(!currentSnippet.snippetText.isEmpty())
|
||||
{
|
||||
currentSnippet.snippetText += "---<br>";
|
||||
snippets.append(currentSnippet);
|
||||
}
|
||||
|
||||
std::sort(snippets.begin(), snippets.end(),
|
||||
[](Snippet &a, Snippet &b)
|
||||
{
|
||||
int differentWordsA = 0;
|
||||
int totalWordsA = 0;
|
||||
int differentWordsB = 0;
|
||||
int totalWordsB = 0;
|
||||
for(int count : qAsConst(a.wordCountMap))
|
||||
{
|
||||
if(count > 0)
|
||||
{
|
||||
++differentWordsA;
|
||||
}
|
||||
totalWordsA += count;
|
||||
}
|
||||
for(int count : qAsConst(b.wordCountMap))
|
||||
{
|
||||
if(count > 0)
|
||||
{
|
||||
++differentWordsB;
|
||||
}
|
||||
totalWordsB += count;
|
||||
}
|
||||
|
||||
if(differentWordsA > differentWordsB)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
if(differentWordsA == differentWordsB)
|
||||
{
|
||||
return totalWordsA > totalWordsB;
|
||||
}
|
||||
return false;
|
||||
});
|
||||
|
||||
QString resultText = "";
|
||||
|
||||
unsigned int snippetsCount = 0;
|
||||
|
||||
QString header = "<b>" + fileName + "</b> ";
|
||||
|
||||
QHash<QString, int> totalWordCountMap;
|
||||
bool isTruncated = false;
|
||||
for(Snippet &snippet : snippets)
|
||||
{
|
||||
if(snippetsCount++ < MAX_SNIPPETS)
|
||||
{
|
||||
resultText += snippet.snippetText;
|
||||
}
|
||||
else
|
||||
{
|
||||
isTruncated = true;
|
||||
}
|
||||
for(auto it = snippet.wordCountMap.keyValueBegin(); it != snippet.wordCountMap.keyValueEnd(); it++)
|
||||
{
|
||||
totalWordCountMap[it->first] = totalWordCountMap.value(it->first, 0) + it->second;
|
||||
}
|
||||
}
|
||||
if(!resultText.isEmpty())
|
||||
{
|
||||
if(isTruncated)
|
||||
{
|
||||
header += "(truncated) ";
|
||||
}
|
||||
for(QString &word : config.wordsToHighlight)
|
||||
{
|
||||
header += word + ": " + QString::number(totalWordCountMap[word]) + " ";
|
||||
}
|
||||
header += "<hr>";
|
||||
|
||||
resultText = header + resultText;
|
||||
}
|
||||
return resultText;
|
||||
}
|
||||
|
||||
QSharedPointer<PreviewResult> PreviewGeneratorPlainText::generate(RenderConfig config, QString documentPath,
|
||||
unsigned int page)
|
||||
{
|
||||
PreviewResultPlainText *result = new PreviewResultPlainText(documentPath, page);
|
||||
QFile file(documentPath);
|
||||
if(!file.open(QFile::ReadOnly | QFile::Text))
|
||||
{
|
||||
return QSharedPointer<PreviewResultPlainText>(result);
|
||||
}
|
||||
QTextStream in(&file);
|
||||
QFileInfo info{documentPath};
|
||||
result->setText(generateLineBasedPreviewText(in, config, info.fileName()));
|
||||
result->setText(header + resulText.replace("\n", "<br>").mid(0, 1000));
|
||||
return QSharedPointer<PreviewResultPlainText>(result);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,17 +1,11 @@
|
|||
#ifndef PREVIEWGENERATORPLAINTEXT_H
|
||||
#define PREVIEWGENERATORPLAINTEXT_H
|
||||
#include <QTextStream>
|
||||
#include "previewgenerator.h"
|
||||
|
||||
class PreviewGeneratorPlainText : public PreviewGenerator
|
||||
{
|
||||
protected:
|
||||
const unsigned int MAX_SNIPPETS = 7;
|
||||
|
||||
public:
|
||||
using PreviewGenerator::PreviewGenerator;
|
||||
QString generatePreviewText(QString content, RenderConfig config, QString fileName);
|
||||
QString generateLineBasedPreviewText(QTextStream &in, RenderConfig config, QString fileName);
|
||||
QSharedPointer<PreviewResult> generate(RenderConfig config, QString documentPath, unsigned int page);
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
#include "previewresultodt.h"
|
||||
|
|
@ -1,10 +0,0 @@
|
|||
#ifndef PREVIEWRESULTODT_H
|
||||
#define PREVIEWRESULTODT_H
|
||||
#include "previewresultplaintext.h"
|
||||
|
||||
class PreviewResultOdt : public PreviewResultPlainText
|
||||
{
|
||||
using PreviewResultPlainText::PreviewResultPlainText;
|
||||
};
|
||||
|
||||
#endif // PREVIEWRESULTODT_H
|
||||
|
|
@ -30,7 +30,7 @@ QByteArray PreviewResultPdf::serialize() const
|
|||
|
||||
QSharedPointer<PreviewResultPdf> PreviewResultPdf::deserialize(QByteArray &ba)
|
||||
{
|
||||
QSharedPointer<PreviewResultPdf> result(new PreviewResultPdf());
|
||||
PreviewResultPdf *result = new PreviewResultPdf();
|
||||
PreviewResultType type;
|
||||
|
||||
QDataStream stream{&ba, QIODevice::ReadOnly};
|
||||
|
|
@ -40,5 +40,5 @@ QSharedPointer<PreviewResultPdf> PreviewResultPdf::deserialize(QByteArray &ba)
|
|||
throw std::runtime_error("Invalid byte array: Not a pdf preview");
|
||||
}
|
||||
stream >> result->documentPath >> result->page >> result->previewImage;
|
||||
return result;
|
||||
return QSharedPointer<PreviewResultPdf>(result);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -40,8 +40,7 @@ QByteArray PreviewResultPlainText::serialize() const
|
|||
|
||||
QSharedPointer<PreviewResultPlainText> PreviewResultPlainText::deserialize(QByteArray &ba)
|
||||
{
|
||||
QSharedPointer<PreviewResultPlainText> result(new PreviewResultPlainText());
|
||||
|
||||
PreviewResultPlainText *result = new PreviewResultPlainText();
|
||||
PreviewResultType type;
|
||||
|
||||
QDataStream stream{&ba, QIODevice::ReadOnly};
|
||||
|
|
@ -51,5 +50,5 @@ QSharedPointer<PreviewResultPlainText> PreviewResultPlainText::deserialize(QByte
|
|||
throw std::runtime_error("Invalid byte array: Not a pdf preview");
|
||||
}
|
||||
stream >> result->documentPath >> result->page >> result->text;
|
||||
return result;
|
||||
return QSharedPointer<PreviewResultPlainText>(result);
|
||||
}
|
||||
|
|
|
|||
|
Перед Ширина: | Висота: | Розмір: 13 KiB Після Ширина: | Висота: | Розмір: 13 KiB |
|
|
@ -1,6 +1,6 @@
|
|||
[Desktop Entry]
|
||||
Name=looqs
|
||||
Exec=looqs-gui
|
||||
Exec=/usr/bin/looqs-gui
|
||||
Terminal=false
|
||||
Type=Application
|
||||
Icon=looqs
|
||||
|
|
|
|||
|
|
@ -14,37 +14,59 @@
|
|||
#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)
|
||||
{
|
||||
try
|
||||
QSqlDatabase db = QSqlDatabase::addDatabase("QSQLITE");
|
||||
db.setDatabaseName(path);
|
||||
if(!db.open())
|
||||
{
|
||||
initResources();
|
||||
DatabaseFactory factory(path);
|
||||
DBMigrator migrator{factory};
|
||||
migrator.performMigrations();
|
||||
}
|
||||
catch(std::exception &ex)
|
||||
{
|
||||
Logger::error() << "Failed to init dabase: " << ex.what();
|
||||
qDebug() << "failed to open database: " << path;
|
||||
return false;
|
||||
}
|
||||
initResources();
|
||||
DBMigrator migrator{db};
|
||||
migrator.performMigrations();
|
||||
db.close();
|
||||
return true;
|
||||
}
|
||||
|
||||
QString Common::findInPath(QString needle)
|
||||
{
|
||||
QStringList results;
|
||||
QString pathVar = QProcessEnvironment::systemEnvironment().value("PATH", "/usr/bin/:/bin/:");
|
||||
QStringList paths = pathVar.split(":");
|
||||
for(const QString &path : paths)
|
||||
{
|
||||
// TODO: can pass ../ but so be it for now.
|
||||
|
||||
QFileInfo info{path + "/" + needle};
|
||||
if(info.exists())
|
||||
{
|
||||
return info.absoluteFilePath();
|
||||
}
|
||||
}
|
||||
return "";
|
||||
}
|
||||
|
||||
void Common::setPdfViewer()
|
||||
{
|
||||
QString value;
|
||||
|
||||
/* TODO: well, we should query this probably from xdg*/
|
||||
QString okularPath = QStandardPaths::findExecutable("okular");
|
||||
QString evincePath = QStandardPaths::findExecutable("evince");
|
||||
QString qpdfviewPath = QStandardPaths::findExecutable("qpdfview");
|
||||
QString okularPath = findInPath("okular");
|
||||
QString evincePath = findInPath("evince");
|
||||
QString qpdfviewPath = findInPath("qpdfview");
|
||||
|
||||
if(okularPath != "")
|
||||
{
|
||||
|
|
@ -52,26 +74,26 @@ 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;
|
||||
if(value != "")
|
||||
{
|
||||
QSettings settings;
|
||||
settings.setValue(SETTINGS_KEY_PDFVIEWER, value);
|
||||
}
|
||||
}
|
||||
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))
|
||||
{
|
||||
|
|
@ -81,20 +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);
|
||||
}
|
||||
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()
|
||||
|
|
@ -115,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";
|
||||
|
|
@ -134,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)
|
||||
|
|
@ -202,8 +208,3 @@ QString Common::versionText()
|
|||
QString tag = GIT_TAG;
|
||||
return tag + " (" + commitid + ") built " + __DATE__ + " " + __TIME__;
|
||||
}
|
||||
|
||||
QString Common::userManualUrl()
|
||||
{
|
||||
return QString("https://github.com/quitesimpleorg/looqs/blob/%1/USAGE.md").arg(QString(GIT_COMMIT_ID));
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,30 +2,17 @@
|
|||
#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"
|
||||
#define SETTINGS_KEY_SEARCHHISTORY "searchhistory"
|
||||
#define SETTINGS_KEY_PREVIEWS_SCROLL_HORIZONTALLY "horizontalscroll"
|
||||
|
||||
namespace Common
|
||||
{
|
||||
void setupAppInfo();
|
||||
QString databasePath();
|
||||
QString ipcSocketPath();
|
||||
void setPdfViewer();
|
||||
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();
|
||||
QString userManualUrl();
|
||||
} // namespace Common
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -6,10 +6,10 @@
|
|||
#include "dbmigrator.h"
|
||||
#include "looqsgeneralexception.h"
|
||||
|
||||
DBMigrator::DBMigrator(DatabaseFactory &factory)
|
||||
DBMigrator::DBMigrator(QSqlDatabase &db)
|
||||
{
|
||||
Q_INIT_RESOURCE(migrations);
|
||||
this->dbFactory = &factory;
|
||||
this->db = &db;
|
||||
}
|
||||
|
||||
DBMigrator::~DBMigrator()
|
||||
|
|
@ -30,8 +30,7 @@ QStringList DBMigrator::getMigrationFilenames()
|
|||
|
||||
uint32_t DBMigrator::currentRevision()
|
||||
{
|
||||
QSqlDatabase db = dbFactory->forCurrentThread();
|
||||
QSqlQuery dbquery(db);
|
||||
QSqlQuery dbquery(*db);
|
||||
dbquery.exec("PRAGMA user_version;");
|
||||
if(!dbquery.next())
|
||||
{
|
||||
|
|
@ -49,56 +48,38 @@ bool DBMigrator::migrationNeeded()
|
|||
return currentRev < static_cast<uint32_t>(migrations.size());
|
||||
}
|
||||
|
||||
void DBMigrator::start()
|
||||
{
|
||||
performMigrations();
|
||||
}
|
||||
|
||||
void DBMigrator::performMigrations()
|
||||
{
|
||||
QStringList migrations = getMigrationFilenames();
|
||||
uint32_t currentRev = currentRevision();
|
||||
uint32_t targetRev = (migrations.size());
|
||||
|
||||
QSqlDatabase db = dbFactory->forCurrentThread();
|
||||
|
||||
try
|
||||
for(uint32_t i = currentRev + 1; i <= targetRev; i++)
|
||||
{
|
||||
for(uint32_t i = currentRev + 1; i <= targetRev; i++)
|
||||
QString fileName = QString(":/looqs-migrations/%1.sql").arg(i);
|
||||
QFile file{fileName};
|
||||
if(!file.open(QIODevice::ReadOnly))
|
||||
{
|
||||
QString fileName = QString(":/looqs-migrations/%1.sql").arg(i);
|
||||
QFile file{fileName};
|
||||
if(!file.open(QIODevice::ReadOnly))
|
||||
{
|
||||
throw LooqsGeneralException("Migration: Failed to find required revision file");
|
||||
}
|
||||
QTextStream stream(&file);
|
||||
db.transaction();
|
||||
while(!stream.atEnd())
|
||||
{
|
||||
QString sql = stream.readLine();
|
||||
QSqlQuery sqlQuery{db};
|
||||
if(!sqlQuery.exec(sql))
|
||||
{
|
||||
|
||||
db.rollback();
|
||||
throw LooqsGeneralException("Failed to execute sql statement while initializing database: " +
|
||||
sqlQuery.lastError().text());
|
||||
}
|
||||
}
|
||||
QSqlQuery updateVersion{db};
|
||||
updateVersion.exec(QString("PRAGMA user_version=%1;").arg(i));
|
||||
db.commit();
|
||||
|
||||
QSqlQuery vacuumQuery{db};
|
||||
vacuumQuery.exec("VACUUM;");
|
||||
|
||||
emit migrationDone(i);
|
||||
throw LooqsGeneralException("Migration: Failed to find required revision file");
|
||||
}
|
||||
emit done();
|
||||
}
|
||||
catch(LooqsGeneralException &e)
|
||||
{
|
||||
emit error(e.message);
|
||||
QTextStream stream(&file);
|
||||
db->transaction();
|
||||
while(!stream.atEnd())
|
||||
{
|
||||
QString sql = stream.readLine();
|
||||
QSqlQuery sqlQuery{*db};
|
||||
if(!sqlQuery.exec(sql))
|
||||
{
|
||||
|
||||
db->rollback();
|
||||
throw LooqsGeneralException("Failed to execute sql statement while initializing database: " +
|
||||
sqlQuery.lastError().text());
|
||||
}
|
||||
}
|
||||
QSqlQuery updateVersion{*db};
|
||||
updateVersion.exec(QString("PRAGMA user_version=%1;").arg(i));
|
||||
db->commit();
|
||||
emit migrationDone(i);
|
||||
}
|
||||
emit done();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,15 +3,14 @@
|
|||
#include <QStringList>
|
||||
#include <QSqlDatabase>
|
||||
#include <QObject>
|
||||
#include "databasefactory.h"
|
||||
class DBMigrator : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
private:
|
||||
DatabaseFactory *dbFactory;
|
||||
QSqlDatabase *db;
|
||||
|
||||
public:
|
||||
DBMigrator(DatabaseFactory &dbFactory);
|
||||
DBMigrator(QSqlDatabase &db);
|
||||
~DBMigrator();
|
||||
uint32_t currentRevision();
|
||||
void performMigrations();
|
||||
|
|
@ -20,9 +19,6 @@ class DBMigrator : public QObject
|
|||
signals:
|
||||
void migrationDone(uint32_t);
|
||||
void done();
|
||||
void error(QString e);
|
||||
public slots:
|
||||
void start();
|
||||
};
|
||||
|
||||
#endif // DBMIGRATOR_H
|
||||
|
|
|
|||
|
|
@ -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))
|
||||
|
|
|
|||
|
|
@ -25,22 +25,10 @@ SaveFileResult FileSaver::addFile(QString path)
|
|||
QString absPath = info.absoluteFilePath();
|
||||
|
||||
auto mtime = info.lastModified().toSecsSinceEpoch();
|
||||
|
||||
bool exists = false;
|
||||
if(this->fileSaverOptions.fillExistingContentless)
|
||||
{
|
||||
exists = this->dbService->fileExistsInDatabase(absPath, mtime, 'c');
|
||||
}
|
||||
else
|
||||
{
|
||||
exists = this->dbService->fileExistsInDatabase(absPath, mtime);
|
||||
}
|
||||
|
||||
if(exists)
|
||||
if(this->dbService->fileExistsInDatabase(absPath, mtime))
|
||||
{
|
||||
return SKIPPED;
|
||||
}
|
||||
|
||||
return saveFile(info);
|
||||
}
|
||||
|
||||
|
|
@ -50,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};
|
||||
|
|
@ -71,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;
|
||||
}
|
||||
|
|
@ -79,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;
|
||||
}
|
||||
|
|
@ -87,7 +76,7 @@ int FileSaver::processFiles(const QVector<QString> paths, std::function<SaveFile
|
|||
else
|
||||
{
|
||||
++processedCount;
|
||||
if(this->fileSaverOptions.verbose)
|
||||
if(verbose)
|
||||
{
|
||||
if(result == SKIPPED)
|
||||
{
|
||||
|
|
@ -98,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;
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
|
|
@ -113,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())
|
||||
{
|
||||
|
|
@ -131,64 +111,48 @@ 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)
|
||||
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())
|
||||
{
|
||||
mustFillContent = !this->fileSaverOptions.metadataOnly;
|
||||
if(mustFillContent)
|
||||
{
|
||||
auto filetype = this->dbService->queryFileType(fileInfo.absolutePath());
|
||||
mustFillContent = !filetype.has_value() || filetype.value() == 'c';
|
||||
}
|
||||
PageData pd;
|
||||
in >> pd;
|
||||
pageData.append(pd);
|
||||
}
|
||||
|
||||
if(fileInfo.size() > 0 && mustFillContent)
|
||||
status = process.exitCode();
|
||||
if(status != 0 && status != NOTHING_PROCESSED)
|
||||
{
|
||||
QProcess process;
|
||||
QStringList args;
|
||||
args << "process" << canonicalPath;
|
||||
process.setProcessChannelMode(QProcess::ForwardedErrorChannel);
|
||||
process.start("/proc/self/exe", args);
|
||||
process.waitForStarted();
|
||||
process.waitForFinished();
|
||||
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, this->fileSaverOptions.metadataOnly);
|
||||
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);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
@ -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)
|
||||
{
|
||||
|
|
@ -21,18 +20,11 @@ void FileScanWorker::run()
|
|||
{
|
||||
sfr = saver.addFile(path);
|
||||
}
|
||||
catch(LooqsGeneralException &e)
|
||||
{
|
||||
Logger::error() << e.message << Qt::endl;
|
||||
sfr = PROCESSFAIL;
|
||||
}
|
||||
|
||||
catch(std::exception &e)
|
||||
{
|
||||
Logger::error() << e.what() << Qt::endl;
|
||||
Logger::error() << e.what();
|
||||
sfr = PROCESSFAIL; // well...
|
||||
}
|
||||
|
||||
emit result({path, sfr});
|
||||
if(stopToken->load(std::memory_order_relaxed)) // TODO: relaxed should suffice here, but recheck
|
||||
{
|
||||
|
|
@ -42,8 +34,3 @@ void FileScanWorker::run()
|
|||
}
|
||||
emit finished();
|
||||
}
|
||||
|
||||
void FileScanWorker::setFileSaverOptions(FileSaverOptions options)
|
||||
{
|
||||
this->fileSaverOptions = options;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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();
|
||||
|
|
|
|||
|
|
@ -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());
|
||||
|
|
@ -86,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();
|
||||
|
|
@ -98,7 +80,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);
|
||||
}
|
||||
|
|
@ -111,8 +92,18 @@ void Indexer::dirScanProgress(int current, int total)
|
|||
|
||||
void Indexer::processFileScanResult(FileScanResult result)
|
||||
{
|
||||
/* TODO: OK_WASEMPTY might need a special list */
|
||||
if(result.second == OK || result.second == OK_WASEMPTY)
|
||||
if(verbose)
|
||||
{
|
||||
this->currentIndexResult.results.append(result);
|
||||
}
|
||||
else
|
||||
{
|
||||
if(result.second == DBFAIL || result.second == PROCESSFAIL || result.second == NOTFOUND)
|
||||
{
|
||||
this->currentIndexResult.results.append(result);
|
||||
}
|
||||
}
|
||||
if(result.second == OK)
|
||||
{
|
||||
++this->currentIndexResult.addedPaths;
|
||||
}
|
||||
|
|
@ -125,32 +116,12 @@ void Indexer::processFileScanResult(FileScanResult result)
|
|||
++this->currentIndexResult.erroredPaths;
|
||||
}
|
||||
|
||||
if(isErrorSaveFileResult(result.second))
|
||||
{
|
||||
this->currentIndexResult.results.append(result);
|
||||
if(!this->fileSaverOptions.keepGoing)
|
||||
{
|
||||
this->requestCancellation();
|
||||
emit finished();
|
||||
return;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if(this->fileSaverOptions.verbose)
|
||||
{
|
||||
this->currentIndexResult.results.append(result);
|
||||
}
|
||||
}
|
||||
|
||||
QTime currentTime = QTime::currentTime();
|
||||
if(currentScanProcessedCount++ == progressReportThreshold || this->lastProgressReportTime.secsTo(currentTime) >= 10)
|
||||
if(currentScanProcessedCount++ == progressReportThreshold)
|
||||
{
|
||||
emit indexProgress(this->currentIndexResult.total(), this->currentIndexResult.addedPaths,
|
||||
this->currentIndexResult.skippedPaths, this->currentIndexResult.erroredPaths,
|
||||
this->dirScanner->pathCount());
|
||||
currentScanProcessedCount = 0;
|
||||
this->lastProgressReportTime = currentTime;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -166,13 +137,3 @@ void Indexer::processFinishedWorker()
|
|||
emit finished();
|
||||
}
|
||||
}
|
||||
|
||||
void Indexer::setFileSaverOptions(FileSaverOptions options)
|
||||
{
|
||||
this->fileSaverOptions = options;
|
||||
}
|
||||
|
||||
void Indexer::setProgressReportThreshold(int threshold)
|
||||
{
|
||||
this->progressReportThreshold = threshold;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
};
|
||||
|
|
@ -52,7 +41,8 @@ class Indexer : public QObject
|
|||
{
|
||||
Q_OBJECT
|
||||
protected:
|
||||
FileSaverOptions fileSaverOptions;
|
||||
bool verbose = false;
|
||||
bool keepGoing = true;
|
||||
SqliteDbService *db;
|
||||
|
||||
int progressReportThreshold = 50;
|
||||
|
|
@ -71,8 +61,6 @@ class Indexer : public QObject
|
|||
IndexResult currentIndexResult;
|
||||
void launchWorker(ConcurrentQueue<QString> &queue, int batchsize);
|
||||
|
||||
QTime lastProgressReportTime = QTime::currentTime();
|
||||
|
||||
public:
|
||||
bool isRunning();
|
||||
|
||||
|
|
@ -80,10 +68,6 @@ class Indexer : public QObject
|
|||
void setIgnorePattern(QStringList ignorePattern);
|
||||
void setTargetPaths(QVector<QString> pathsToScan);
|
||||
|
||||
void setFileSaverOptions(FileSaverOptions options);
|
||||
|
||||
void setProgressReportThreshold(int threshold);
|
||||
|
||||
void requestCancellation();
|
||||
|
||||
Indexer(SqliteDbService &db);
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
@ -50,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())
|
||||
{
|
||||
|
|
@ -82,7 +82,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 +99,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";
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
||||
|
|
|
|||
|
|
@ -1,48 +0,0 @@
|
|||
#ifndef LIMITQUEUE_H
|
||||
#define LIMITQUEUE_H
|
||||
#include <QQueue>
|
||||
|
||||
template <class T> class LimitQueue
|
||||
{
|
||||
protected:
|
||||
QQueue<T> queue;
|
||||
int limit = 0;
|
||||
|
||||
public:
|
||||
LimitQueue();
|
||||
LimitQueue(int limit)
|
||||
{
|
||||
this->limit = limit;
|
||||
}
|
||||
|
||||
void enqueue(const T &t)
|
||||
{
|
||||
if(queue.size() == limit)
|
||||
{
|
||||
queue.dequeue();
|
||||
}
|
||||
queue.enqueue(t);
|
||||
}
|
||||
|
||||
int size()
|
||||
{
|
||||
return queue.size();
|
||||
}
|
||||
|
||||
T dequeue()
|
||||
{
|
||||
return queue.dequeue();
|
||||
}
|
||||
|
||||
void setLimit(int limit)
|
||||
{
|
||||
this->limit = limit;
|
||||
}
|
||||
|
||||
void clear()
|
||||
{
|
||||
queue.clear();
|
||||
}
|
||||
};
|
||||
|
||||
#endif // LIMITQUEUE_H
|
||||
|
|
@ -7,7 +7,6 @@
|
|||
#include <optional>
|
||||
#include <algorithm>
|
||||
#include "looqsquery.h"
|
||||
#include "looqsgeneralexception.h"
|
||||
|
||||
const QVector<Token> &LooqsQuery::getTokens() const
|
||||
{
|
||||
|
|
@ -24,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;
|
||||
}
|
||||
|
|
@ -181,9 +180,8 @@ LooqsQuery LooqsQuery::build(QString expression, TokenType loneWordsTokenType, b
|
|||
|
||||
QStringList loneWords;
|
||||
LooqsQuery result;
|
||||
static QRegularExpression rx(
|
||||
"((?<filtername>(\\.|\\w)+):(?<args>\\((?<innerargs>[^\\)]+)\\)|([^\\s])+)|(?<boolean>AND|OR)"
|
||||
"|(?<negation>!)|(?<bracket>\\(|\\))|(?<loneword>[^\\s]+))");
|
||||
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); };
|
||||
|
|
@ -285,10 +283,6 @@ LooqsQuery LooqsQuery::build(QString expression, TokenType loneWordsTokenType, b
|
|||
{
|
||||
tokenType = FILTER_CONTENT_PAGE;
|
||||
}
|
||||
else if(filtername == "t" || filtername == "tag")
|
||||
{
|
||||
tokenType = FILTER_TAG_ASSIGNED;
|
||||
}
|
||||
// TODO: given this is not really a "filter", this feels slightly misplaced here
|
||||
else if(filtername == "sort")
|
||||
{
|
||||
|
|
@ -325,7 +319,7 @@ LooqsQuery LooqsQuery::build(QString expression, TokenType loneWordsTokenType, b
|
|||
QVector<Token> newTokens;
|
||||
|
||||
TokenType prevType = BOOL_AND;
|
||||
int needsBoolean = FILTER_CONTENT | FILTER_PATH | NEGATION | WORD;
|
||||
int needsBoolean = FILTER_CONTENT | FILTER_PATH | NEGATION;
|
||||
for(Token &t : result.tokens)
|
||||
{
|
||||
if(t.type == BRACKET_OPEN || t.type & needsBoolean)
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
#define LOOQSQUERY_H
|
||||
#include <QString>
|
||||
#include <QVector>
|
||||
#include "looqsgeneralexception.h"
|
||||
#include "token.h"
|
||||
/* Fields that can be queried or sorted */
|
||||
enum QueryField
|
||||
|
|
@ -43,13 +44,6 @@ class LooqsQuery
|
|||
QVector<Token> tokens;
|
||||
QVector<SortCondition> sortConditions;
|
||||
void addToken(Token t);
|
||||
void updateTokensMask()
|
||||
{
|
||||
for(const Token &t : qAsConst(tokens))
|
||||
{
|
||||
this->tokensMask |= t.type;
|
||||
}
|
||||
}
|
||||
|
||||
public:
|
||||
const QVector<Token> &getTokens() const;
|
||||
|
|
@ -67,30 +61,12 @@ class LooqsQuery
|
|||
{
|
||||
this->limit = limit;
|
||||
}
|
||||
bool hasContentSearch() const;
|
||||
bool hasPathSearch() const;
|
||||
bool hasContentSearch();
|
||||
bool hasPathSearch();
|
||||
|
||||
void addSortCondition(SortCondition sc);
|
||||
|
||||
void setTokens(const QVector<Token> &tokens)
|
||||
{
|
||||
this->tokens = tokens;
|
||||
updateTokensMask();
|
||||
}
|
||||
|
||||
static bool checkParanthesis(QString query);
|
||||
static LooqsQuery build(QString query, TokenType loneWordsTokenType, bool mergeLoneWords);
|
||||
|
||||
LooqsQuery()
|
||||
{
|
||||
}
|
||||
|
||||
LooqsQuery(const QVector<Token> &tokens, const QVector<SortCondition> &sortConditions)
|
||||
{
|
||||
this->tokens = tokens;
|
||||
this->sortConditions = sortConditions;
|
||||
updateTokensMask();
|
||||
}
|
||||
};
|
||||
|
||||
#endif // LOOQSQUERY_H
|
||||
|
|
|
|||
|
|
@ -1,14 +0,0 @@
|
|||
ALTER TABLE content ADD ftsid integer;
|
||||
CREATE VIRTUAL TABLE fts USING fts5(content, content='');
|
||||
DROP TRIGGER contents_ai;
|
||||
DROP TRIGGER contents_au;
|
||||
DROP TRIGGER contents_ad;
|
||||
CREATE TEMP TABLE contentstemp(id INTEGER PRIMARY KEY, content text);
|
||||
CREATE TRIGGER contentstemp_ai AFTER INSERT ON contentstemp BEGIN INSERT INTO fts(content) VALUES (new.content); UPDATE content SET ftsid=last_insert_rowid() WHERE id = new.id; END;
|
||||
INSERT INTO contentstemp(id, content) SELECT id, content FROM content;
|
||||
DROP TRIGGER contentstemp_ai;
|
||||
DROP TABLE contentstemp;
|
||||
DROP TABLE content_fts;
|
||||
ALTER TABLE content DROP COLUMN content;
|
||||
CREATE INDEX content_ftsid ON content (ftsid);
|
||||
CREATE TRIGGER content_ad AFTER DELETE ON content BEGIN INSERT INTO fts(fts, rowid) VALUES('delete', old.ftsid); END;
|
||||
|
|
@ -1 +0,0 @@
|
|||
DROP trigger content_ad;
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
CREATE VIRTUAL TABLE fts_trigram USING fts5(content, content='',tokenize="trigram");
|
||||
ALTER TABLE content ADD COLUMN fts_trigramid integer;
|
||||
CREATE INDEX content_fts_trigramid ON content (fts_trigramid);
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
CREATE TABLE tag(id integer PRIMARY KEY, name varchar(128) UNIQUE);
|
||||
CREATE TABLE filetag(fileid integer, tagid integer);
|
||||
CREATE INDEX filetag_fileid ON filetag(fileid);
|
||||
CREATE INDEX tag_id ON tag(id);
|
||||
CREATE INDEX file_path ON file ( path );
|
||||
UPDATE file SET filetype='c' WHERE filetype='f';
|
||||
|
|
@ -1,9 +1,5 @@
|
|||
<RCC>
|
||||
<qresource prefix="/looqs-migrations">
|
||||
<file>1.sql</file>
|
||||
<file>2.sql</file>
|
||||
<file>3.sql</file>
|
||||
<file>4.sql</file>
|
||||
<file>5.sql</file>
|
||||
</qresource>
|
||||
</RCC>
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ class NothingProcessor : public Processor
|
|||
NothingProcessor();
|
||||
|
||||
public:
|
||||
QVector<PageData> process(const QByteArray & /*data*/) const override
|
||||
QVector<PageData> process(const QByteArray &data) const override
|
||||
{
|
||||
return {};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
#include <quazip.h>
|
||||
#include <quazipfile.h>
|
||||
#include <quazip5/quazip.h>
|
||||
#include <quazip5/quazipfile.h>
|
||||
#include "odtprocessor.h"
|
||||
#include "tagstripperprocessor.h"
|
||||
|
||||
QVector<PageData> OdtProcessor::process(const QByteArray & /*data*/) const
|
||||
QVector<PageData> OdtProcessor::process(const QByteArray &data) const
|
||||
{
|
||||
throw LooqsGeneralException("Not implemented yet");
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,3 +1,5 @@
|
|||
#include "paralleldirscanner.h"
|
||||
|
||||
#include <QRunnable>
|
||||
#include <QMutex>
|
||||
#include <QDirIterator>
|
||||
|
|
@ -5,7 +7,7 @@
|
|||
#include <QThreadPool>
|
||||
#include <functional>
|
||||
#include "dirscanworker.h"
|
||||
#include "paralleldirscanner.h"
|
||||
#include "logger.h"
|
||||
|
||||
ParallelDirScanner::ParallelDirScanner()
|
||||
{
|
||||
|
|
@ -69,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)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1,6 +0,0 @@
|
|||
<RCC>
|
||||
<qresource>
|
||||
<file>../LICENSE</file>
|
||||
<file>../LICENSE-3RD-PARTY</file>
|
||||
</qresource>
|
||||
</RCC>
|
||||
|
|
@ -10,6 +10,8 @@ enum DataSource
|
|||
ARRAY
|
||||
};
|
||||
|
||||
#define NOTHING_PROCESSED 4
|
||||
|
||||
class Processor
|
||||
{
|
||||
public:
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -1,38 +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];
|
||||
}
|
||||
|
||||
static inline bool isErrorSaveFileResult(SaveFileResult result)
|
||||
{
|
||||
return result == DBFAIL || result == PROCESSFAIL || result == NOTFOUND || result == NOACCESS;
|
||||
}
|
||||
|
||||
#endif // SAVEFILERESULT_H
|
||||
|
|
@ -6,8 +6,7 @@ class SearchResult
|
|||
{
|
||||
public:
|
||||
FileData fileData;
|
||||
unsigned int page;
|
||||
bool wasContentSearch = false;
|
||||
QVector<unsigned int> pages;
|
||||
};
|
||||
|
||||
#endif // SEARCHRESULT_H
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
@ -60,7 +56,6 @@ SOURCES += sqlitesearch.cpp \
|
|||
processor.cpp \
|
||||
sandboxedprocessor.cpp \
|
||||
sqlitedbservice.cpp \
|
||||
tagmanager.cpp \
|
||||
tagstripperprocessor.cpp \
|
||||
utils.cpp \
|
||||
../submodules/exile.h/exile.c \
|
||||
|
|
@ -75,11 +70,9 @@ HEADERS += sqlitesearch.h \
|
|||
encodingdetector.h \
|
||||
filedata.h \
|
||||
filesaver.h \
|
||||
filesaveroptions.h \
|
||||
filescanworker.h \
|
||||
indexer.h \
|
||||
indexsyncer.h \
|
||||
limitqueue.h \
|
||||
logger.h \
|
||||
looqsgeneralexception.h \
|
||||
looqsquery.h \
|
||||
|
|
@ -91,10 +84,8 @@ HEADERS += sqlitesearch.h \
|
|||
pdfprocessor.h \
|
||||
processor.h \
|
||||
sandboxedprocessor.h \
|
||||
savefileresult.h \
|
||||
searchresult.h \
|
||||
sqlitedbservice.h \
|
||||
tagmanager.h \
|
||||
tagstripperprocessor.h \
|
||||
token.h \
|
||||
common.h \
|
||||
|
|
@ -105,4 +96,3 @@ unix {
|
|||
INSTALLS += target
|
||||
}
|
||||
RESOURCES = migrations/migrations.qrc
|
||||
RESOURCES += plaintexts.qrc
|
||||
|
|
|
|||
|
|
@ -2,10 +2,25 @@
|
|||
#include <QFileInfo>
|
||||
#include <QDateTime>
|
||||
#include <QSqlError>
|
||||
#include "looqsgeneralexception.h"
|
||||
#include "sqlitedbservice.h"
|
||||
#include "filedata.h"
|
||||
#include "logger.h"
|
||||
bool SqliteDbService::fileExistsInDatabase(QString path, qint64 mtime)
|
||||
{
|
||||
auto query = QSqlQuery(dbFactory->forCurrentThread());
|
||||
query.prepare("SELECT 1 FROM file WHERE path = ? and mtime = ?");
|
||||
query.addBindValue(path);
|
||||
query.addBindValue(mtime);
|
||||
if(!query.exec())
|
||||
{
|
||||
throw LooqsGeneralException("Error while trying to query for file existance: " + query.lastError().text());
|
||||
}
|
||||
if(!query.next())
|
||||
{
|
||||
return false;
|
||||
}
|
||||
return query.value(0).toBool();
|
||||
}
|
||||
|
||||
QVector<SearchResult> SqliteDbService::search(const LooqsQuery &query)
|
||||
{
|
||||
|
|
@ -14,29 +29,20 @@ QVector<SearchResult> SqliteDbService::search(const LooqsQuery &query)
|
|||
return searcher.search(query);
|
||||
}
|
||||
|
||||
std::optional<QChar> SqliteDbService::queryFileType(QString absPath)
|
||||
{
|
||||
auto query = exec("SELECT filetype FROM file WHERE path = ?", {absPath});
|
||||
if(!query.next())
|
||||
{
|
||||
return {};
|
||||
}
|
||||
return query.value(0).toChar();
|
||||
}
|
||||
|
||||
bool SqliteDbService::fileExistsInDatabase(QString path)
|
||||
{
|
||||
return execBool("SELECT 1 FROM file WHERE path = ?", {path});
|
||||
}
|
||||
|
||||
bool SqliteDbService::fileExistsInDatabase(QString path, qint64 mtime)
|
||||
{
|
||||
return execBool("SELECT 1 FROM file WHERE path = ? AND mtime = ?", {path, mtime});
|
||||
}
|
||||
|
||||
bool SqliteDbService::fileExistsInDatabase(QString path, qint64 mtime, QChar fileType)
|
||||
{
|
||||
return execBool("SELECT 1 FROM file WHERE path = ? AND mtime = ? AND filetype = ?", {path, mtime, fileType});
|
||||
auto query = QSqlQuery(dbFactory->forCurrentThread());
|
||||
query.prepare("SELECT 1 FROM file WHERE path = ?");
|
||||
query.addBindValue(path);
|
||||
if(!query.exec())
|
||||
{
|
||||
throw LooqsGeneralException("Error while trying to query for file existance: " + query.lastError().text());
|
||||
}
|
||||
if(!query.next())
|
||||
{
|
||||
return false;
|
||||
}
|
||||
return query.value(0).toBool();
|
||||
}
|
||||
|
||||
SqliteDbService::SqliteDbService(DatabaseFactory &dbFactory)
|
||||
|
|
@ -104,189 +110,11 @@ unsigned int SqliteDbService::getFiles(QVector<FileData> &results, QString wildC
|
|||
return processedRows;
|
||||
}
|
||||
|
||||
QVector<QString> SqliteDbService::getTags()
|
||||
{
|
||||
QVector<QString> result;
|
||||
auto query = QSqlQuery(dbFactory->forCurrentThread());
|
||||
query.prepare("SELECT name FROM tag ORDER by name ASC");
|
||||
query.setForwardOnly(true);
|
||||
if(!query.exec())
|
||||
{
|
||||
throw LooqsGeneralException("Error while trying to retrieve tags from database: " + query.lastError().text());
|
||||
}
|
||||
while(query.next())
|
||||
{
|
||||
QString tagname = query.value(0).toString();
|
||||
result.append(tagname);
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
QVector<QString> SqliteDbService::getTagsForPath(QString path)
|
||||
{
|
||||
QVector<QString> result;
|
||||
auto query = QSqlQuery(dbFactory->forCurrentThread());
|
||||
query.prepare("SELECT name FROM tag INNER JOIN filetag ON tag.id = filetag.tagid INNER JOIN file ON filetag.fileid "
|
||||
"= file.id WHERE file.path = ? ORDER BY name ASC");
|
||||
query.addBindValue(path);
|
||||
query.setForwardOnly(true);
|
||||
if(!query.exec())
|
||||
{
|
||||
throw LooqsGeneralException("Error while trying to retrieve tags from database: " + query.lastError().text());
|
||||
}
|
||||
while(query.next())
|
||||
{
|
||||
QString tagname = query.value(0).toString();
|
||||
result.append(tagname);
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
QVector<QString> SqliteDbService::getPathsForTag(QString tag)
|
||||
{
|
||||
QVector<QString> result;
|
||||
auto query = QSqlQuery(dbFactory->forCurrentThread());
|
||||
query.prepare(
|
||||
"SELECT file.path FROM tag INNER JOIN filetag ON tag.id = filetag.tagid INNER JOIN file ON filetag.fileid "
|
||||
"= file.id WHERE tag.name = ?");
|
||||
query.addBindValue(tag.toLower());
|
||||
query.setForwardOnly(true);
|
||||
if(!query.exec())
|
||||
{
|
||||
throw LooqsGeneralException("Error while trying to retrieve paths from database: " + query.lastError().text());
|
||||
}
|
||||
while(query.next())
|
||||
{
|
||||
QString path = query.value(0).toString();
|
||||
result.append(path);
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
bool SqliteDbService::setTags(QString path, const QSet<QString> &tags)
|
||||
{
|
||||
QSqlDatabase db = dbFactory->forCurrentThread();
|
||||
if(!db.transaction())
|
||||
{
|
||||
Logger::error() << "Failed to open transaction for " << path << " : " << db.lastError() << Qt::endl;
|
||||
return false;
|
||||
}
|
||||
|
||||
QSqlQuery deletionQuery = QSqlQuery(db);
|
||||
deletionQuery.prepare("DELETE FROM filetag WHERE fileid = (SELECT id FROM file WHERE path = ?)");
|
||||
deletionQuery.addBindValue(path);
|
||||
if(!deletionQuery.exec())
|
||||
{
|
||||
db.rollback();
|
||||
Logger::error() << "Failed to delete existing tags " << deletionQuery.lastError() << Qt::endl;
|
||||
return false;
|
||||
}
|
||||
|
||||
for(const QString &tag : tags)
|
||||
{
|
||||
QSqlQuery tagQuery = QSqlQuery(db);
|
||||
tagQuery.prepare("INSERT OR IGNORE INTO tag (name) VALUES(?)");
|
||||
tagQuery.addBindValue(tag.toLower());
|
||||
if(!tagQuery.exec())
|
||||
{
|
||||
db.rollback();
|
||||
Logger::error() << "Failed to insert tag " << tagQuery.lastError() << Qt::endl;
|
||||
return false;
|
||||
}
|
||||
QSqlQuery fileTagQuery(db);
|
||||
fileTagQuery.prepare(
|
||||
"INSERT INTO filetag(fileid, tagid) VALUES((SELECT id FROM file WHERE path = ?), (SELECT id "
|
||||
"FROM tag WHERE name = ?))");
|
||||
fileTagQuery.bindValue(0, path);
|
||||
fileTagQuery.bindValue(1, tag);
|
||||
if(!fileTagQuery.exec())
|
||||
{
|
||||
db.rollback();
|
||||
Logger::error() << "Failed to assign tag to file" << Qt::endl;
|
||||
return false;
|
||||
}
|
||||
}
|
||||
if(!db.commit())
|
||||
{
|
||||
db.rollback();
|
||||
Logger::error() << "Failed to commit transaction when saving tags" << Qt::endl;
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
bool SqliteDbService::insertToFTS(bool useTrigrams, QSqlDatabase &db, int fileid, QVector<PageData> &pageData)
|
||||
{
|
||||
QString ftsInsertStatement;
|
||||
QString contentInsertStatement;
|
||||
if(useTrigrams)
|
||||
{
|
||||
ftsInsertStatement = "INSERT INTO fts_trigram(content) VALUES(?)";
|
||||
contentInsertStatement = "INSERT INTO content(fileid, page, fts_trigramid) VALUES(?, ?, last_insert_rowid())";
|
||||
}
|
||||
else
|
||||
{
|
||||
ftsInsertStatement = "INSERT INTO fts(content) VALUES(?)";
|
||||
contentInsertStatement = "INSERT INTO content(fileid, page, ftsid) VALUES(?, ?, last_insert_rowid())";
|
||||
}
|
||||
|
||||
for(const PageData &data : pageData)
|
||||
{
|
||||
QSqlQuery ftsQuery(db);
|
||||
ftsQuery.prepare(ftsInsertStatement);
|
||||
ftsQuery.addBindValue(data.content);
|
||||
if(!ftsQuery.exec())
|
||||
{
|
||||
Logger::error() << "Failed fts insertion " << ftsQuery.lastError() << Qt::endl;
|
||||
return false;
|
||||
}
|
||||
QSqlQuery contentQuery(db);
|
||||
contentQuery.prepare(contentInsertStatement);
|
||||
contentQuery.addBindValue(fileid);
|
||||
contentQuery.addBindValue(data.pagenumber);
|
||||
if(!contentQuery.exec())
|
||||
{
|
||||
Logger::error() << "Failed content insertion " << contentQuery.lastError() << Qt::endl;
|
||||
return false;
|
||||
}
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
QSqlQuery SqliteDbService::exec(QString querystr, std::initializer_list<QVariant> args)
|
||||
{
|
||||
auto query = QSqlQuery(dbFactory->forCurrentThread());
|
||||
query.prepare(querystr);
|
||||
for(const QVariant &v : args)
|
||||
{
|
||||
query.addBindValue(v);
|
||||
}
|
||||
if(!query.exec())
|
||||
{
|
||||
throw LooqsGeneralException("Error while exec(): " + query.lastError().text() + " for query: " + querystr);
|
||||
}
|
||||
return query;
|
||||
}
|
||||
|
||||
bool SqliteDbService::execBool(QString querystr, std::initializer_list<QVariant> args)
|
||||
{
|
||||
auto query = exec(querystr, args);
|
||||
if(!query.next())
|
||||
{
|
||||
return false;
|
||||
}
|
||||
return query.value(0).toBool();
|
||||
}
|
||||
|
||||
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);
|
||||
|
|
@ -320,19 +148,18 @@ SaveFileResult SqliteDbService::saveFile(QFileInfo fileInfo, QVector<PageData> &
|
|||
return DBFAIL;
|
||||
}
|
||||
|
||||
if(!pathsOnly)
|
||||
int lastid = inserterQuery.lastInsertId().toInt();
|
||||
for(const PageData &data : pageData)
|
||||
{
|
||||
int lastid = inserterQuery.lastInsertId().toInt();
|
||||
if(!insertToFTS(false, db, lastid, pageData))
|
||||
QSqlQuery contentQuery(db);
|
||||
contentQuery.prepare("INSERT INTO content(fileid, page, content) VALUES(?, ?, ?)");
|
||||
contentQuery.addBindValue(lastid);
|
||||
contentQuery.addBindValue(data.pagenumber);
|
||||
contentQuery.addBindValue(data.content);
|
||||
if(!contentQuery.exec())
|
||||
{
|
||||
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;
|
||||
Logger::error() << "Failed content insertion " << contentQuery.lastError() << Qt::endl;
|
||||
return DBFAIL;
|
||||
}
|
||||
}
|
||||
|
|
@ -345,123 +172,3 @@ SaveFileResult SqliteDbService::saveFile(QFileInfo fileInfo, QVector<PageData> &
|
|||
}
|
||||
return OK;
|
||||
}
|
||||
|
||||
bool SqliteDbService::addTag(QString tag, QString path)
|
||||
{
|
||||
QVector<QString> paths;
|
||||
paths.append(path);
|
||||
return addTag(tag, paths);
|
||||
}
|
||||
|
||||
bool SqliteDbService::addTag(QString tag, const QVector<QString> &paths)
|
||||
{
|
||||
QSqlDatabase db = dbFactory->forCurrentThread();
|
||||
QSqlQuery tagQuery(db);
|
||||
QSqlQuery fileTagQuery(db);
|
||||
|
||||
tag = tag.toLower();
|
||||
|
||||
tagQuery.prepare("INSERT OR IGNORE INTO tag (name) VALUES(?)");
|
||||
tagQuery.addBindValue(tag);
|
||||
|
||||
fileTagQuery.prepare("INSERT INTO filetag(fileid, tagid) VALUES((SELECT id FROM file WHERE path = ?), (SELECT id "
|
||||
"FROM tag WHERE name = ?))");
|
||||
fileTagQuery.bindValue(1, tag);
|
||||
if(!db.transaction())
|
||||
{
|
||||
Logger::error() << "Failed to open transaction to add paths for tag " << tag << " : " << db.lastError()
|
||||
<< Qt::endl;
|
||||
return false;
|
||||
}
|
||||
if(!tagQuery.exec())
|
||||
{
|
||||
db.rollback();
|
||||
Logger::error() << "Failed INSERT query" << tagQuery.lastError() << Qt::endl;
|
||||
return false;
|
||||
}
|
||||
|
||||
for(const QString &path : paths)
|
||||
{
|
||||
fileTagQuery.bindValue(0, path);
|
||||
if(!fileTagQuery.exec())
|
||||
{
|
||||
db.rollback();
|
||||
Logger::error() << "Failed to add paths to tag" << Qt::endl;
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
if(!db.commit())
|
||||
{
|
||||
db.rollback();
|
||||
Logger::error() << "Failed to commit tag insertion transaction" << db.lastError() << Qt::endl;
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
bool SqliteDbService::removePathsForTag(QString tag, const QVector<QString> &paths)
|
||||
{
|
||||
QSqlDatabase db = dbFactory->forCurrentThread();
|
||||
QSqlQuery tagQuery(db);
|
||||
QSqlQuery fileTagQuery(db);
|
||||
|
||||
tag = tag.toLower();
|
||||
|
||||
fileTagQuery.prepare(
|
||||
"DELETE FROM filetag WHERE fileid = (SELECT id FROM file WHERE path = ?) AND tagid = (SELECT id "
|
||||
"FROM tag WHERE name = ?)");
|
||||
|
||||
fileTagQuery.bindValue(1, tag);
|
||||
for(const QString &path : paths)
|
||||
{
|
||||
fileTagQuery.bindValue(0, path);
|
||||
if(!fileTagQuery.exec())
|
||||
{
|
||||
Logger::error() << "An error occured while trying to remove paths from tag assignment" << Qt::endl;
|
||||
return false;
|
||||
}
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
bool SqliteDbService::deleteTag(QString tag)
|
||||
{
|
||||
QSqlDatabase db = dbFactory->forCurrentThread();
|
||||
if(!db.transaction())
|
||||
{
|
||||
Logger::error() << "Failed to open transaction while trying to delete tag " << tag << " : " << db.lastError()
|
||||
<< Qt::endl;
|
||||
return false;
|
||||
}
|
||||
|
||||
tag = tag.toLower();
|
||||
QSqlQuery assignmentDeleteQuery(db);
|
||||
assignmentDeleteQuery.prepare("DELETE FROM filetag WHERE tagid = (SELECT id FROM tag WHERE name = ?)");
|
||||
assignmentDeleteQuery.addBindValue(tag);
|
||||
if(!assignmentDeleteQuery.exec())
|
||||
{
|
||||
db.rollback();
|
||||
Logger::error() << "Error while trying to delete tag: " << db.lastError() << Qt::endl;
|
||||
return false;
|
||||
}
|
||||
|
||||
QSqlQuery deleteTagQuery(db);
|
||||
deleteTagQuery.prepare("DELETE FROM tag WHERE name = ?");
|
||||
deleteTagQuery.addBindValue(tag);
|
||||
if(!deleteTagQuery.exec())
|
||||
{
|
||||
db.rollback();
|
||||
Logger::error() << "Error while trying to delete tag: " << db.lastError() << Qt::endl;
|
||||
return false;
|
||||
}
|
||||
|
||||
if(!db.commit())
|
||||
{
|
||||
db.rollback();
|
||||
Logger::error() << "Error while trying to delete tag: " << db.lastError() << Qt::endl;
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,47 +1,34 @@
|
|||
#ifndef SQLITEDBSERVICE_H
|
||||
#define SQLITEDBSERVICE_H
|
||||
#include <QFileInfo>
|
||||
#include <optional>
|
||||
|
||||
#include "databasefactory.h"
|
||||
#include "utils.h"
|
||||
#include "pagedata.h"
|
||||
#include "filedata.h"
|
||||
#include "../shared/sqlitesearch.h"
|
||||
#include "../shared/token.h"
|
||||
#include "savefileresult.h"
|
||||
enum SaveFileResult
|
||||
{
|
||||
OK,
|
||||
SKIPPED,
|
||||
DBFAIL,
|
||||
PROCESSFAIL,
|
||||
NOTFOUND
|
||||
};
|
||||
|
||||
class SqliteDbService
|
||||
{
|
||||
private:
|
||||
DatabaseFactory *dbFactory = nullptr;
|
||||
bool insertToFTS(bool useTrigrams, QSqlDatabase &db, int fileid, QVector<PageData> &pageData);
|
||||
|
||||
QSqlQuery exec(QString query, std::initializer_list<QVariant> args);
|
||||
bool execBool(QString querystr, std::initializer_list<QVariant> args);
|
||||
|
||||
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);
|
||||
bool fileExistsInDatabase(QString path, qint64 mtime, QChar filetype);
|
||||
unsigned int getFiles(QVector<FileData> &results, QString wildCardPattern, int offset, int limit);
|
||||
|
||||
bool addTag(QString tag, QString path);
|
||||
bool addTag(QString tag, const QVector<QString> &paths);
|
||||
QVector<QString> getTags();
|
||||
QVector<QString> getTagsForPath(QString path);
|
||||
QVector<QString> getPathsForTag(QString path);
|
||||
bool setTags(QString path, const QSet<QString> &tags);
|
||||
bool removePathsForTag(QString tag, const QVector<QString> &paths);
|
||||
bool deleteTag(QString tag);
|
||||
|
||||
QVector<SearchResult> search(const LooqsQuery &query);
|
||||
|
||||
std::optional<QChar> queryFileType(QString absPath);
|
||||
};
|
||||
|
||||
#endif // SQLITEDBSERVICE_H
|
||||
|
|
|
|||
|
|
@ -66,32 +66,6 @@ QString SqliteSearch::createSortSql(const QVector<SortCondition> sortConditions)
|
|||
return "";
|
||||
}
|
||||
|
||||
QString SqliteSearch::escapeFtsArgument(QString ftsArg)
|
||||
{
|
||||
QString result;
|
||||
static QRegularExpression extractor(R"#("([^"]*)"|([^\s]+))#");
|
||||
QRegularExpressionMatchIterator i = extractor.globalMatch(ftsArg);
|
||||
while(i.hasNext())
|
||||
{
|
||||
QRegularExpressionMatch m = i.next();
|
||||
QString value = m.captured(1);
|
||||
if(value.isEmpty())
|
||||
{
|
||||
value = m.captured(2);
|
||||
if(value.endsWith('*'))
|
||||
{
|
||||
value = value.mid(0, value.size() - 1);
|
||||
}
|
||||
result += "\"" + value + "\"* ";
|
||||
}
|
||||
else
|
||||
{
|
||||
result += "\"" + value + "\" ";
|
||||
}
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
QPair<QString, QVector<QString>> createNonArgPair(QString key)
|
||||
{
|
||||
return {" " + key + " ", QVector<QString>()};
|
||||
|
|
@ -141,12 +115,9 @@ QPair<QString, QVector<QString>> SqliteSearch::createSql(const Token &token)
|
|||
}
|
||||
if(token.type == FILTER_CONTENT_CONTAINS)
|
||||
{
|
||||
return {" fts MATCH ? ", {escapeFtsArgument(value)}};
|
||||
}
|
||||
if(token.type == FILTER_TAG_ASSIGNED)
|
||||
{
|
||||
return {" file.id IN (SELECT fileid FROM filetag WHERE tagid = (SELECT id FROM tag WHERE name = ?)) ",
|
||||
{value.toLower()}};
|
||||
return {" content.id IN (SELECT content_fts.ROWID FROM content_fts WHERE content_fts.content MATCH ? ORDER BY "
|
||||
"rank) ",
|
||||
{value}};
|
||||
}
|
||||
throw LooqsGeneralException("Unknown token passed (should not happen)");
|
||||
}
|
||||
|
|
@ -154,6 +125,7 @@ QPair<QString, QVector<QString>> SqliteSearch::createSql(const Token &token)
|
|||
QSqlQuery SqliteSearch::makeSqlQuery(const LooqsQuery &query)
|
||||
{
|
||||
QString whereSql;
|
||||
QString joinSql;
|
||||
QVector<QString> bindValues;
|
||||
bool isContentSearch = (query.getTokensMask() & FILTER_CONTENT) == FILTER_CONTENT;
|
||||
if(query.getTokens().isEmpty())
|
||||
|
|
@ -161,17 +133,30 @@ QSqlQuery SqliteSearch::makeSqlQuery(const LooqsQuery &query)
|
|||
throw LooqsGeneralException("Nothing to search for supplied");
|
||||
}
|
||||
|
||||
bool ftsAlreadyJoined = false;
|
||||
auto tokens = query.getTokens();
|
||||
for(const Token &token : tokens)
|
||||
{
|
||||
auto sql = createSql(token);
|
||||
whereSql += sql.first;
|
||||
bindValues.append(sql.second);
|
||||
if(token.type == FILTER_CONTENT_CONTAINS)
|
||||
{
|
||||
if(!ftsAlreadyJoined)
|
||||
{
|
||||
joinSql += " INNER JOIN content_fts ON content.id = content_fts.ROWID ";
|
||||
ftsAlreadyJoined = true;
|
||||
}
|
||||
whereSql += " content_fts.content MATCH ? ";
|
||||
bindValues.append(token.value);
|
||||
}
|
||||
else
|
||||
{
|
||||
auto sql = createSql(token);
|
||||
whereSql += sql.first;
|
||||
bindValues.append(sql.second);
|
||||
}
|
||||
}
|
||||
|
||||
QString prepSql;
|
||||
QString sortSql = createSortSql(query.getSortConditions());
|
||||
int bindIterations = 1;
|
||||
if(isContentSearch)
|
||||
{
|
||||
if(sortSql.isEmpty())
|
||||
|
|
@ -179,24 +164,13 @@ QSqlQuery SqliteSearch::makeSqlQuery(const LooqsQuery &query)
|
|||
if(std::find_if(tokens.begin(), tokens.end(),
|
||||
[](const Token &t) -> bool { return t.type == FILTER_CONTENT_CONTAINS; }) != tokens.end())
|
||||
{
|
||||
sortSql = "ORDER BY prio, rank";
|
||||
sortSql = "ORDER BY rank";
|
||||
}
|
||||
}
|
||||
QString whereSqlTrigram = whereSql;
|
||||
whereSqlTrigram.replace("fts MATCH", "fts_trigram MATCH"); // A bit dirty...
|
||||
prepSql = "SELECT DISTINCT path, page, mtime, size, filetype FROM ("
|
||||
"SELECT file.path AS path, content.page AS page, file.mtime AS mtime, file.size AS size, "
|
||||
"file.filetype AS filetype, 0 AS prio, fts.rank AS rank FROM file INNER JOIN content ON file.id = "
|
||||
"content.fileid "
|
||||
"INNER JOIN fts ON content.ftsid = fts.ROWID WHERE 1=1 AND " +
|
||||
whereSql +
|
||||
"UNION ALL SELECT file.path AS path, content.page AS page, file.mtime AS mtime, file.size AS size, "
|
||||
"file.filetype AS filetype, 1 as prio, fts_trigram.rank AS rank FROM file INNER JOIN content ON "
|
||||
"file.id = "
|
||||
"content.fileid " +
|
||||
"INNER JOIN fts_trigram ON content.fts_trigramid = fts_trigram.ROWID WHERE 1=1 AND " +
|
||||
whereSqlTrigram + " ) " + sortSql;
|
||||
++bindIterations;
|
||||
prepSql =
|
||||
"SELECT file.path AS path, group_concat(content.page) AS pages, file.mtime AS mtime, file.size AS size, "
|
||||
"file.filetype AS filetype FROM file INNER JOIN content ON file.id = content.fileid " +
|
||||
joinSql + " WHERE 1=1 AND " + whereSql + " GROUP BY file.path " + sortSql;
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -204,7 +178,7 @@ QSqlQuery SqliteSearch::makeSqlQuery(const LooqsQuery &query)
|
|||
{
|
||||
sortSql = "ORDER BY file.mtime DESC";
|
||||
}
|
||||
prepSql = "SELECT file.path AS path, '0' as page, file.mtime AS mtime, file.size AS size, file.filetype AS "
|
||||
prepSql = "SELECT file.path AS path, '0' as pages, file.mtime AS mtime, file.size AS size, file.filetype AS "
|
||||
"filetype FROM file WHERE 1=1 AND " +
|
||||
whereSql + " " + sortSql;
|
||||
}
|
||||
|
|
@ -216,14 +190,11 @@ QSqlQuery SqliteSearch::makeSqlQuery(const LooqsQuery &query)
|
|||
|
||||
QSqlQuery dbquery(*db);
|
||||
dbquery.prepare(prepSql);
|
||||
for(int i = 0; i < bindIterations; i++)
|
||||
for(const QString &value : bindValues)
|
||||
{
|
||||
for(const QString &value : bindValues)
|
||||
if(value != "")
|
||||
{
|
||||
if(value != "")
|
||||
{
|
||||
dbquery.addBindValue(value);
|
||||
}
|
||||
dbquery.addBindValue(value);
|
||||
}
|
||||
}
|
||||
return dbquery;
|
||||
|
|
@ -242,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;
|
||||
|
|
@ -250,8 +220,15 @@ QVector<SearchResult> SqliteSearch::search(const LooqsQuery &query)
|
|||
result.fileData.mtime = dbQuery.value("mtime").toUInt();
|
||||
result.fileData.size = dbQuery.value("size").toUInt();
|
||||
result.fileData.filetype = dbQuery.value("filetype").toChar();
|
||||
result.page = dbQuery.value("page").toUInt();
|
||||
result.wasContentSearch = contentSearch;
|
||||
QString pages = dbQuery.value("pages").toString();
|
||||
QStringList pagesList = pages.split(",");
|
||||
for(QString &page : pagesList)
|
||||
{
|
||||
if(page != "")
|
||||
{
|
||||
result.pages.append(page.toUInt());
|
||||
}
|
||||
}
|
||||
results.append(result);
|
||||
}
|
||||
return results;
|
||||
|
|
|
|||
|
|
@ -18,7 +18,6 @@ class SqliteSearch
|
|||
QString fieldToColumn(QueryField field);
|
||||
QPair<QString, QVector<QString>> createSql(const Token &token);
|
||||
QString createSortSql(const QVector<SortCondition> sortConditions);
|
||||
QString escapeFtsArgument(QString ftsArg);
|
||||
};
|
||||
|
||||
#endif // SQLITESEARCH_H
|
||||
|
|
|
|||
|
|
@ -1,66 +0,0 @@
|
|||
#include "tagmanager.h"
|
||||
|
||||
TagManager::TagManager(SqliteDbService &dbService)
|
||||
{
|
||||
this->dbService = &dbService;
|
||||
}
|
||||
|
||||
bool TagManager::addTagsToPath(QString path, const QSet<QString> &tags)
|
||||
{
|
||||
QVector<QString> currentTags = this->dbService->getTagsForPath(path);
|
||||
for(const QString &tag : tags)
|
||||
{
|
||||
currentTags.append(tag.toLower());
|
||||
}
|
||||
|
||||
QSet<QString> newTags{currentTags.begin(), currentTags.end()};
|
||||
return this->dbService->setTags(path, newTags);
|
||||
}
|
||||
|
||||
bool TagManager::removeTagsForPath(QString path, const QSet<QString> &tags)
|
||||
{
|
||||
QVector<QString> currentTags = this->dbService->getTagsForPath(path);
|
||||
for(const QString &tag : tags)
|
||||
{
|
||||
currentTags.removeAll(tag);
|
||||
}
|
||||
QSet<QString> newTags{currentTags.begin(), currentTags.end()};
|
||||
return this->dbService->setTags(path, newTags);
|
||||
}
|
||||
|
||||
bool TagManager::removePathsForTag(QString tag, const QVector<QString> &paths)
|
||||
{
|
||||
return this->dbService->removePathsForTag(tag, paths);
|
||||
}
|
||||
|
||||
bool TagManager::deleteTag(QString tag)
|
||||
{
|
||||
return this->dbService->deleteTag(tag);
|
||||
}
|
||||
|
||||
QVector<QString> TagManager::getTags(QString path)
|
||||
{
|
||||
return this->dbService->getTagsForPath(path);
|
||||
}
|
||||
|
||||
QVector<QString> TagManager::getTags()
|
||||
{
|
||||
return this->dbService->getTags();
|
||||
}
|
||||
|
||||
QVector<QString> TagManager::getPaths(QString tag)
|
||||
{
|
||||
return this->dbService->getPathsForTag(tag);
|
||||
}
|
||||
|
||||
bool TagManager::addTagsToPath(QString path, QString tagstring, QChar delim)
|
||||
{
|
||||
auto splitted = tagstring.split(delim);
|
||||
|
||||
return addTagsToPath(path, QSet<QString>{splitted.begin(), splitted.end()});
|
||||
}
|
||||
|
||||
bool TagManager::addPathsToTag(QString tag, const QVector<QString> &paths)
|
||||
{
|
||||
return this->dbService->addTag(tag, paths);
|
||||
}
|
||||
|
|
@ -1,28 +0,0 @@
|
|||
#ifndef TAGMANAGER_H
|
||||
#define TAGMANAGER_H
|
||||
#include "sqlitedbservice.h"
|
||||
|
||||
class TagManager
|
||||
{
|
||||
private:
|
||||
SqliteDbService *dbService = nullptr;
|
||||
bool ensurePathOkay(QString inpath);
|
||||
|
||||
public:
|
||||
TagManager(SqliteDbService &dbService);
|
||||
|
||||
bool addTagsToPath(QString path, const QSet<QString> &tags);
|
||||
bool addTagsToPath(QString path, QString tagstring, QChar delim);
|
||||
|
||||
bool addPathsToTag(QString tag, const QVector<QString> &paths);
|
||||
bool removeTagsForPath(QString path, const QSet<QString> &tags);
|
||||
|
||||
bool removePathsForTag(QString tag, const QVector<QString> &paths);
|
||||
bool deleteTag(QString tag);
|
||||
|
||||
QVector<QString> getTags(QString path);
|
||||
QVector<QString> getTags();
|
||||
QVector<QString> getPaths(QString tag);
|
||||
};
|
||||
|
||||
#endif // TAGMANAGER_H
|
||||
|
|
@ -19,8 +19,7 @@ enum TokenType
|
|||
FILTER_PATH_SIZE,
|
||||
FILTER_PATH_ENDS,
|
||||
FILTER_PATH_STARTS,
|
||||
FILTER_TAG_ASSIGNED,
|
||||
FILTER_CONTENT = 512, /* Everything below here is content search (except LIMIT) */
|
||||
FILTER_CONTENT = 512,
|
||||
FILTER_CONTENT_CONTAINS,
|
||||
FILTER_CONTENT_PAGE,
|
||||
LIMIT = 1024
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
Subproject commit 44b9a17becf6882e1b3728cbf885ae9e5a6717af
|
||||
Subproject commit bbbdfc44dabceb41e2e5b9ce18695a37ef8a0288
|
||||
Завантаження…
Посилання в новій задачі