Commits vergleichen
63 Commits
Autor | SHA1 | Datum |
---|---|---|
Albert S. | ef9ab30372 | |
Albert S. | 71f81bb682 | |
Albert S. | 544554ead2 | |
Albert S. | 1365772ba2 | |
Albert S. | f5622ac480 | |
Albert S. | 4d3f10d118 | |
Albert S. | d4868f05fc | |
Albert S. | fc510b4376 | |
Albert S. | d85c0bd2a5 | |
Albert S. | cfc64705e3 | |
Albert S. | 6640504b49 | |
Albert S. | 1e06ec5d69 | |
Albert S. | 1f9c048838 | |
Albert S. | 667ed0cd8b | |
Albert S. | ead4b58aed | |
Albert S. | ff293b8505 | |
Albert S. | fcc3732917 | |
Albert S. | 4728001e7e | |
Albert S. | d36a435195 | |
Albert S. | c5dff41df5 | |
Albert S. | c6c0b09e56 | |
Albert S. | 9a2ef19308 | |
Albert S. | e68706b8d6 | |
Albert S. | c5713f5839 | |
Albert S. | 8550506517 | |
Albert S. | 2b1dc72410 | |
Albert S. | 22fee1d064 | |
Albert S. | 50a5c399c4 | |
Albert S. | 4b3ebb08c2 | |
Albert S. | 4c5643e342 | |
Albert S. | e8d217e191 | |
Albert S. | 4604970f9d | |
Albert S. | 6cd7a92576 | |
Albert S. | 9540f27c95 | |
Albert S. | 244e6aa95e | |
Albert S. | 3e3a4d0cd4 | |
Albert S. | 94fbdb5a92 | |
Albert S. | abd1b94235 | |
Albert S. | d2dcc2f95b | |
Albert S. | f324da0369 | |
Albert S. | a3cfb7ade1 | |
Albert S. | 44b9986166 | |
Albert S. | 4fe745e858 | |
Albert S. | a0b95479e2 | |
Albert S. | 07630c3b36 | |
Albert S. | a7c4ad5e7c | |
Albert S. | 32c2653b0f | |
Albert S. | a869d677a3 | |
Albert S. | 2550af307f | |
Albert S. | 0b829215e5 | |
Albert S. | 566c4a8c58 | |
Albert S. | 3d0c236cb3 | |
Albert S. | 590a8888fc | |
Albert S. | ccc4d09b36 | |
Albert S. | 8298b675aa | |
Albert S. | 71789b5b56 | |
Albert S. | 363d207ccc | |
Albert S. | 4b1522b82a | |
Albert S. | efca45b88a | |
Albert S. | 0cd19b53e4 | |
Albert S. | 889725033a | |
Albert S. | 8485a25b21 | |
Albert S. | 57f0afaf91 |
28
CHANGELOG.md
28
CHANGELOG.md
|
@ -1,4 +1,32 @@
|
|||
# looqs: Release notes
|
||||
## 2024-05-xx - v0.10
|
||||
CHANGES:
|
||||
- Move to Qt6, drop Qt5 support.
|
||||
- Index ToC of PDFs
|
||||
- ToC can be searched with filter: toc:(query). (Basic, more to come).
|
||||
- sqlite: Improvements so rare "database locked" errors don't occur.
|
||||
- Minor fixes
|
||||
- Add packages: Ubuntu 23.10.
|
||||
- Remove packages: Ubuntu 22.10
|
||||
|
||||
## 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
|
||||
|
||||
|
|
|
@ -0,0 +1,681 @@
|
|||
This file lists looqs license and the license of third-party libraries.
|
||||
|
||||
|
||||
Copyright (c) 2018-2024: Albert Schwarzkopf <looqs at quitesimple period org>
|
||||
|
||||
looqs is made available under the following license:
|
||||
|
||||
GNU GENERAL PUBLIC LICENSE
|
||||
Version 3, 29 June 2007
|
||||
|
||||
Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
|
||||
Everyone is permitted to copy and distribute verbatim copies
|
||||
of this license document, but changing it is not allowed.
|
||||
|
||||
Preamble
|
||||
|
||||
The GNU General Public License is a free, copyleft license for
|
||||
software and other kinds of works.
|
||||
|
||||
The licenses for most software and other practical works are designed
|
||||
to take away your freedom to share and change the works. By contrast,
|
||||
the GNU General Public License is intended to guarantee your freedom to
|
||||
share and change all versions of a program--to make sure it remains free
|
||||
software for all its users. We, the Free Software Foundation, use the
|
||||
GNU General Public License for most of our software; it applies also to
|
||||
any other work released this way by its authors. You can apply it to
|
||||
your programs, too.
|
||||
|
||||
When we speak of free software, we are referring to freedom, not
|
||||
price. Our General Public Licenses are designed to make sure that you
|
||||
have the freedom to distribute copies of free software (and charge for
|
||||
them if you wish), that you receive source code or can get it if you
|
||||
want it, that you can change the software or use pieces of it in new
|
||||
free programs, and that you know you can do these things.
|
||||
|
||||
To protect your rights, we need to prevent others from denying you
|
||||
these rights or asking you to surrender the rights. Therefore, you have
|
||||
certain responsibilities if you distribute copies of the software, or if
|
||||
you modify it: responsibilities to respect the freedom of others.
|
||||
|
||||
For example, if you distribute copies of such a program, whether
|
||||
gratis or for a fee, you must pass on to the recipients the same
|
||||
freedoms that you received. You must make sure that they, too, receive
|
||||
or can get the source code. And you must show them these terms so they
|
||||
know their rights.
|
||||
|
||||
Developers that use the GNU GPL protect your rights with two steps:
|
||||
(1) assert copyright on the software, and (2) offer you this License
|
||||
giving you legal permission to copy, distribute and/or modify it.
|
||||
|
||||
For the developers' and authors' protection, the GPL clearly explains
|
||||
that there is no warranty for this free software. For both users' and
|
||||
authors' sake, the GPL requires that modified versions be marked as
|
||||
changed, so that their problems will not be attributed erroneously to
|
||||
authors of previous versions.
|
||||
|
||||
Some devices are designed to deny users access to install or run
|
||||
modified versions of the software inside them, although the manufacturer
|
||||
can do so. This is fundamentally incompatible with the aim of
|
||||
protecting users' freedom to change the software. The systematic
|
||||
pattern of such abuse occurs in the area of products for individuals to
|
||||
use, which is precisely where it is most unacceptable. Therefore, we
|
||||
have designed this version of the GPL to prohibit the practice for those
|
||||
products. If such problems arise substantially in other domains, we
|
||||
stand ready to extend this provision to those domains in future versions
|
||||
of the GPL, as needed to protect the freedom of users.
|
||||
|
||||
Finally, every program is threatened constantly by software patents.
|
||||
States should not allow patents to restrict development and use of
|
||||
software on general-purpose computers, but in those that do, we wish to
|
||||
avoid the special danger that patents applied to a free program could
|
||||
make it effectively proprietary. To prevent this, the GPL assures that
|
||||
patents cannot be used to render the program non-free.
|
||||
|
||||
The precise terms and conditions for copying, distribution and
|
||||
modification follow.
|
||||
|
||||
TERMS AND CONDITIONS
|
||||
|
||||
0. Definitions.
|
||||
|
||||
"This License" refers to version 3 of the GNU General Public License.
|
||||
|
||||
"Copyright" also means copyright-like laws that apply to other kinds of
|
||||
works, such as semiconductor masks.
|
||||
|
||||
"The Program" refers to any copyrightable work licensed under this
|
||||
License. Each licensee is addressed as "you". "Licensees" and
|
||||
"recipients" may be individuals or organizations.
|
||||
|
||||
To "modify" a work means to copy from or adapt all or part of the work
|
||||
in a fashion requiring copyright permission, other than the making of an
|
||||
exact copy. The resulting work is called a "modified version" of the
|
||||
earlier work or a work "based on" the earlier work.
|
||||
|
||||
A "covered work" means either the unmodified Program or a work based
|
||||
on the Program.
|
||||
|
||||
To "propagate" a work means to do anything with it that, without
|
||||
permission, would make you directly or secondarily liable for
|
||||
infringement under applicable copyright law, except executing it on a
|
||||
computer or modifying a private copy. Propagation includes copying,
|
||||
distribution (with or without modification), making available to the
|
||||
public, and in some countries other activities as well.
|
||||
|
||||
To "convey" a work means any kind of propagation that enables other
|
||||
parties to make or receive copies. Mere interaction with a user through
|
||||
a computer network, with no transfer of a copy, is not conveying.
|
||||
|
||||
An interactive user interface displays "Appropriate Legal Notices"
|
||||
to the extent that it includes a convenient and prominently visible
|
||||
feature that (1) displays an appropriate copyright notice, and (2)
|
||||
tells the user that there is no warranty for the work (except to the
|
||||
extent that warranties are provided), that licensees may convey the
|
||||
work under this License, and how to view a copy of this License. If
|
||||
the interface presents a list of user commands or options, such as a
|
||||
menu, a prominent item in the list meets this criterion.
|
||||
|
||||
1. Source Code.
|
||||
|
||||
The "source code" for a work means the preferred form of the work
|
||||
for making modifications to it. "Object code" means any non-source
|
||||
form of a work.
|
||||
|
||||
A "Standard Interface" means an interface that either is an official
|
||||
standard defined by a recognized standards body, or, in the case of
|
||||
interfaces specified for a particular programming language, one that
|
||||
is widely used among developers working in that language.
|
||||
|
||||
The "System Libraries" of an executable work include anything, other
|
||||
than the work as a whole, that (a) is included in the normal form of
|
||||
packaging a Major Component, but which is not part of that Major
|
||||
Component, and (b) serves only to enable use of the work with that
|
||||
Major Component, or to implement a Standard Interface for which an
|
||||
implementation is available to the public in source code form. A
|
||||
"Major Component", in this context, means a major essential component
|
||||
(kernel, window system, and so on) of the specific operating system
|
||||
(if any) on which the executable work runs, or a compiler used to
|
||||
produce the work, or an object code interpreter used to run it.
|
||||
|
||||
The "Corresponding Source" for a work in object code form means all
|
||||
the source code needed to generate, install, and (for an executable
|
||||
work) run the object code and to modify the work, including scripts to
|
||||
control those activities. However, it does not include the work's
|
||||
System Libraries, or general-purpose tools or generally available free
|
||||
programs which are used unmodified in performing those activities but
|
||||
which are not part of the work. For example, Corresponding Source
|
||||
includes interface definition files associated with source files for
|
||||
the work, and the source code for shared libraries and dynamically
|
||||
linked subprograms that the work is specifically designed to require,
|
||||
such as by intimate data communication or control flow between those
|
||||
subprograms and other parts of the work.
|
||||
|
||||
The Corresponding Source need not include anything that users
|
||||
can regenerate automatically from other parts of the Corresponding
|
||||
Source.
|
||||
|
||||
The Corresponding Source for a work in source code form is that
|
||||
same work.
|
||||
|
||||
2. Basic Permissions.
|
||||
|
||||
All rights granted under this License are granted for the term of
|
||||
copyright on the Program, and are irrevocable provided the stated
|
||||
conditions are met. This License explicitly affirms your unlimited
|
||||
permission to run the unmodified Program. The output from running a
|
||||
covered work is covered by this License only if the output, given its
|
||||
content, constitutes a covered work. This License acknowledges your
|
||||
rights of fair use or other equivalent, as provided by copyright law.
|
||||
|
||||
You may make, run and propagate covered works that you do not
|
||||
convey, without conditions so long as your license otherwise remains
|
||||
in force. You may convey covered works to others for the sole purpose
|
||||
of having them make modifications exclusively for you, or provide you
|
||||
with facilities for running those works, provided that you comply with
|
||||
the terms of this License in conveying all material for which you do
|
||||
not control copyright. Those thus making or running the covered works
|
||||
for you must do so exclusively on your behalf, under your direction
|
||||
and control, on terms that prohibit them from making any copies of
|
||||
your copyrighted material outside their relationship with you.
|
||||
|
||||
Conveying under any other circumstances is permitted solely under
|
||||
the conditions stated below. Sublicensing is not allowed; section 10
|
||||
makes it unnecessary.
|
||||
|
||||
3. Protecting Users' Legal Rights From Anti-Circumvention Law.
|
||||
|
||||
No covered work shall be deemed part of an effective technological
|
||||
measure under any applicable law fulfilling obligations under article
|
||||
11 of the WIPO copyright treaty adopted on 20 December 1996, or
|
||||
similar laws prohibiting or restricting circumvention of such
|
||||
measures.
|
||||
|
||||
When you convey a covered work, you waive any legal power to forbid
|
||||
circumvention of technological measures to the extent such circumvention
|
||||
is effected by exercising rights under this License with respect to
|
||||
the covered work, and you disclaim any intention to limit operation or
|
||||
modification of the work as a means of enforcing, against the work's
|
||||
users, your or third parties' legal rights to forbid circumvention of
|
||||
technological measures.
|
||||
|
||||
4. Conveying Verbatim Copies.
|
||||
|
||||
You may convey verbatim copies of the Program's source code as you
|
||||
receive it, in any medium, provided that you conspicuously and
|
||||
appropriately publish on each copy an appropriate copyright notice;
|
||||
keep intact all notices stating that this License and any
|
||||
non-permissive terms added in accord with section 7 apply to the code;
|
||||
keep intact all notices of the absence of any warranty; and give all
|
||||
recipients a copy of this License along with the Program.
|
||||
|
||||
You may charge any price or no price for each copy that you convey,
|
||||
and you may offer support or warranty protection for a fee.
|
||||
|
||||
5. Conveying Modified Source Versions.
|
||||
|
||||
You may convey a work based on the Program, or the modifications to
|
||||
produce it from the Program, in the form of source code under the
|
||||
terms of section 4, provided that you also meet all of these conditions:
|
||||
|
||||
a) The work must carry prominent notices stating that you modified
|
||||
it, and giving a relevant date.
|
||||
|
||||
b) The work must carry prominent notices stating that it is
|
||||
released under this License and any conditions added under section
|
||||
7. This requirement modifies the requirement in section 4 to
|
||||
"keep intact all notices".
|
||||
|
||||
c) You must license the entire work, as a whole, under this
|
||||
License to anyone who comes into possession of a copy. This
|
||||
License will therefore apply, along with any applicable section 7
|
||||
additional terms, to the whole of the work, and all its parts,
|
||||
regardless of how they are packaged. This License gives no
|
||||
permission to license the work in any other way, but it does not
|
||||
invalidate such permission if you have separately received it.
|
||||
|
||||
d) If the work has interactive user interfaces, each must display
|
||||
Appropriate Legal Notices; however, if the Program has interactive
|
||||
interfaces that do not display Appropriate Legal Notices, your
|
||||
work need not make them do so.
|
||||
|
||||
A compilation of a covered work with other separate and independent
|
||||
works, which are not by their nature extensions of the covered work,
|
||||
and which are not combined with it such as to form a larger program,
|
||||
in or on a volume of a storage or distribution medium, is called an
|
||||
"aggregate" if the compilation and its resulting copyright are not
|
||||
used to limit the access or legal rights of the compilation's users
|
||||
beyond what the individual works permit. Inclusion of a covered work
|
||||
in an aggregate does not cause this License to apply to the other
|
||||
parts of the aggregate.
|
||||
|
||||
6. Conveying Non-Source Forms.
|
||||
|
||||
You may convey a covered work in object code form under the terms
|
||||
of sections 4 and 5, provided that you also convey the
|
||||
machine-readable Corresponding Source under the terms of this License,
|
||||
in one of these ways:
|
||||
|
||||
a) Convey the object code in, or embodied in, a physical product
|
||||
(including a physical distribution medium), accompanied by the
|
||||
Corresponding Source fixed on a durable physical medium
|
||||
customarily used for software interchange.
|
||||
|
||||
b) Convey the object code in, or embodied in, a physical product
|
||||
(including a physical distribution medium), accompanied by a
|
||||
written offer, valid for at least three years and valid for as
|
||||
long as you offer spare parts or customer support for that product
|
||||
model, to give anyone who possesses the object code either (1) a
|
||||
copy of the Corresponding Source for all the software in the
|
||||
product that is covered by this License, on a durable physical
|
||||
medium customarily used for software interchange, for a price no
|
||||
more than your reasonable cost of physically performing this
|
||||
conveying of source, or (2) access to copy the
|
||||
Corresponding Source from a network server at no charge.
|
||||
|
||||
c) Convey individual copies of the object code with a copy of the
|
||||
written offer to provide the Corresponding Source. This
|
||||
alternative is allowed only occasionally and noncommercially, and
|
||||
only if you received the object code with such an offer, in accord
|
||||
with subsection 6b.
|
||||
|
||||
d) Convey the object code by offering access from a designated
|
||||
place (gratis or for a charge), and offer equivalent access to the
|
||||
Corresponding Source in the same way through the same place at no
|
||||
further charge. You need not require recipients to copy the
|
||||
Corresponding Source along with the object code. If the place to
|
||||
copy the object code is a network server, the Corresponding Source
|
||||
may be on a different server (operated by you or a third party)
|
||||
that supports equivalent copying facilities, provided you maintain
|
||||
clear directions next to the object code saying where to find the
|
||||
Corresponding Source. Regardless of what server hosts the
|
||||
Corresponding Source, you remain obligated to ensure that it is
|
||||
available for as long as needed to satisfy these requirements.
|
||||
|
||||
e) Convey the object code using peer-to-peer transmission, provided
|
||||
you inform other peers where the object code and Corresponding
|
||||
Source of the work are being offered to the general public at no
|
||||
charge under subsection 6d.
|
||||
|
||||
A separable portion of the object code, whose source code is excluded
|
||||
from the Corresponding Source as a System Library, need not be
|
||||
included in conveying the object code work.
|
||||
|
||||
A "User Product" is either (1) a "consumer product", which means any
|
||||
tangible personal property which is normally used for personal, family,
|
||||
or household purposes, or (2) anything designed or sold for incorporation
|
||||
into a dwelling. In determining whether a product is a consumer product,
|
||||
doubtful cases shall be resolved in favor of coverage. For a particular
|
||||
product received by a particular user, "normally used" refers to a
|
||||
typical or common use of that class of product, regardless of the status
|
||||
of the particular user or of the way in which the particular user
|
||||
actually uses, or expects or is expected to use, the product. A product
|
||||
is a consumer product regardless of whether the product has substantial
|
||||
commercial, industrial or non-consumer uses, unless such uses represent
|
||||
the only significant mode of use of the product.
|
||||
|
||||
"Installation Information" for a User Product means any methods,
|
||||
procedures, authorization keys, or other information required to install
|
||||
and execute modified versions of a covered work in that User Product from
|
||||
a modified version of its Corresponding Source. The information must
|
||||
suffice to ensure that the continued functioning of the modified object
|
||||
code is in no case prevented or interfered with solely because
|
||||
modification has been made.
|
||||
|
||||
If you convey an object code work under this section in, or with, or
|
||||
specifically for use in, a User Product, and the conveying occurs as
|
||||
part of a transaction in which the right of possession and use of the
|
||||
User Product is transferred to the recipient in perpetuity or for a
|
||||
fixed term (regardless of how the transaction is characterized), the
|
||||
Corresponding Source conveyed under this section must be accompanied
|
||||
by the Installation Information. But this requirement does not apply
|
||||
if neither you nor any third party retains the ability to install
|
||||
modified object code on the User Product (for example, the work has
|
||||
been installed in ROM).
|
||||
|
||||
The requirement to provide Installation Information does not include a
|
||||
requirement to continue to provide support service, warranty, or updates
|
||||
for a work that has been modified or installed by the recipient, or for
|
||||
the User Product in which it has been modified or installed. Access to a
|
||||
network may be denied when the modification itself materially and
|
||||
adversely affects the operation of the network or violates the rules and
|
||||
protocols for communication across the network.
|
||||
|
||||
Corresponding Source conveyed, and Installation Information provided,
|
||||
in accord with this section must be in a format that is publicly
|
||||
documented (and with an implementation available to the public in
|
||||
source code form), and must require no special password or key for
|
||||
unpacking, reading or copying.
|
||||
|
||||
7. Additional Terms.
|
||||
|
||||
"Additional permissions" are terms that supplement the terms of this
|
||||
License by making exceptions from one or more of its conditions.
|
||||
Additional permissions that are applicable to the entire Program shall
|
||||
be treated as though they were included in this License, to the extent
|
||||
that they are valid under applicable law. If additional permissions
|
||||
apply only to part of the Program, that part may be used separately
|
||||
under those permissions, but the entire Program remains governed by
|
||||
this License without regard to the additional permissions.
|
||||
|
||||
When you convey a copy of a covered work, you may at your option
|
||||
remove any additional permissions from that copy, or from any part of
|
||||
it. (Additional permissions may be written to require their own
|
||||
removal in certain cases when you modify the work.) You may place
|
||||
additional permissions on material, added by you to a covered work,
|
||||
for which you have or can give appropriate copyright permission.
|
||||
|
||||
Notwithstanding any other provision of this License, for material you
|
||||
add to a covered work, you may (if authorized by the copyright holders of
|
||||
that material) supplement the terms of this License with terms:
|
||||
|
||||
a) Disclaiming warranty or limiting liability differently from the
|
||||
terms of sections 15 and 16 of this License; or
|
||||
|
||||
b) Requiring preservation of specified reasonable legal notices or
|
||||
author attributions in that material or in the Appropriate Legal
|
||||
Notices displayed by works containing it; or
|
||||
|
||||
c) Prohibiting misrepresentation of the origin of that material, or
|
||||
requiring that modified versions of such material be marked in
|
||||
reasonable ways as different from the original version; or
|
||||
|
||||
d) Limiting the use for publicity purposes of names of licensors or
|
||||
authors of the material; or
|
||||
|
||||
e) Declining to grant rights under trademark law for use of some
|
||||
trade names, trademarks, or service marks; or
|
||||
|
||||
f) Requiring indemnification of licensors and authors of that
|
||||
material by anyone who conveys the material (or modified versions of
|
||||
it) with contractual assumptions of liability to the recipient, for
|
||||
any liability that these contractual assumptions directly impose on
|
||||
those licensors and authors.
|
||||
|
||||
All other non-permissive additional terms are considered "further
|
||||
restrictions" within the meaning of section 10. If the Program as you
|
||||
received it, or any part of it, contains a notice stating that it is
|
||||
governed by this License along with a term that is a further
|
||||
restriction, you may remove that term. If a license document contains
|
||||
a further restriction but permits relicensing or conveying under this
|
||||
License, you may add to a covered work material governed by the terms
|
||||
of that license document, provided that the further restriction does
|
||||
not survive such relicensing or conveying.
|
||||
|
||||
If you add terms to a covered work in accord with this section, you
|
||||
must place, in the relevant source files, a statement of the
|
||||
additional terms that apply to those files, or a notice indicating
|
||||
where to find the applicable terms.
|
||||
|
||||
Additional terms, permissive or non-permissive, may be stated in the
|
||||
form of a separately written license, or stated as exceptions;
|
||||
the above requirements apply either way.
|
||||
|
||||
8. Termination.
|
||||
|
||||
You may not propagate or modify a covered work except as expressly
|
||||
provided under this License. Any attempt otherwise to propagate or
|
||||
modify it is void, and will automatically terminate your rights under
|
||||
this License (including any patent licenses granted under the third
|
||||
paragraph of section 11).
|
||||
|
||||
However, if you cease all violation of this License, then your
|
||||
license from a particular copyright holder is reinstated (a)
|
||||
provisionally, unless and until the copyright holder explicitly and
|
||||
finally terminates your license, and (b) permanently, if the copyright
|
||||
holder fails to notify you of the violation by some reasonable means
|
||||
prior to 60 days after the cessation.
|
||||
|
||||
Moreover, your license from a particular copyright holder is
|
||||
reinstated permanently if the copyright holder notifies you of the
|
||||
violation by some reasonable means, this is the first time you have
|
||||
received notice of violation of this License (for any work) from that
|
||||
copyright holder, and you cure the violation prior to 30 days after
|
||||
your receipt of the notice.
|
||||
|
||||
Termination of your rights under this section does not terminate the
|
||||
licenses of parties who have received copies or rights from you under
|
||||
this License. If your rights have been terminated and not permanently
|
||||
reinstated, you do not qualify to receive new licenses for the same
|
||||
material under section 10.
|
||||
|
||||
9. Acceptance Not Required for Having Copies.
|
||||
|
||||
You are not required to accept this License in order to receive or
|
||||
run a copy of the Program. Ancillary propagation of a covered work
|
||||
occurring solely as a consequence of using peer-to-peer transmission
|
||||
to receive a copy likewise does not require acceptance. However,
|
||||
nothing other than this License grants you permission to propagate or
|
||||
modify any covered work. These actions infringe copyright if you do
|
||||
not accept this License. Therefore, by modifying or propagating a
|
||||
covered work, you indicate your acceptance of this License to do so.
|
||||
|
||||
10. Automatic Licensing of Downstream Recipients.
|
||||
|
||||
Each time you convey a covered work, the recipient automatically
|
||||
receives a license from the original licensors, to run, modify and
|
||||
propagate that work, subject to this License. You are not responsible
|
||||
for enforcing compliance by third parties with this License.
|
||||
|
||||
An "entity transaction" is a transaction transferring control of an
|
||||
organization, or substantially all assets of one, or subdividing an
|
||||
organization, or merging organizations. If propagation of a covered
|
||||
work results from an entity transaction, each party to that
|
||||
transaction who receives a copy of the work also receives whatever
|
||||
licenses to the work the party's predecessor in interest had or could
|
||||
give under the previous paragraph, plus a right to possession of the
|
||||
Corresponding Source of the work from the predecessor in interest, if
|
||||
the predecessor has it or can get it with reasonable efforts.
|
||||
|
||||
You may not impose any further restrictions on the exercise of the
|
||||
rights granted or affirmed under this License. For example, you may
|
||||
not impose a license fee, royalty, or other charge for exercise of
|
||||
rights granted under this License, and you may not initiate litigation
|
||||
(including a cross-claim or counterclaim in a lawsuit) alleging that
|
||||
any patent claim is infringed by making, using, selling, offering for
|
||||
sale, or importing the Program or any portion of it.
|
||||
|
||||
11. Patents.
|
||||
|
||||
A "contributor" is a copyright holder who authorizes use under this
|
||||
License of the Program or a work on which the Program is based. The
|
||||
work thus licensed is called the contributor's "contributor version".
|
||||
|
||||
A contributor's "essential patent claims" are all patent claims
|
||||
owned or controlled by the contributor, whether already acquired or
|
||||
hereafter acquired, that would be infringed by some manner, permitted
|
||||
by this License, of making, using, or selling its contributor version,
|
||||
but do not include claims that would be infringed only as a
|
||||
consequence of further modification of the contributor version. For
|
||||
purposes of this definition, "control" includes the right to grant
|
||||
patent sublicenses in a manner consistent with the requirements of
|
||||
this License.
|
||||
|
||||
Each contributor grants you a non-exclusive, worldwide, royalty-free
|
||||
patent license under the contributor's essential patent claims, to
|
||||
make, use, sell, offer for sale, import and otherwise run, modify and
|
||||
propagate the contents of its contributor version.
|
||||
|
||||
In the following three paragraphs, a "patent license" is any express
|
||||
agreement or commitment, however denominated, not to enforce a patent
|
||||
(such as an express permission to practice a patent or covenant not to
|
||||
sue for patent infringement). To "grant" such a patent license to a
|
||||
party means to make such an agreement or commitment not to enforce a
|
||||
patent against the party.
|
||||
|
||||
If you convey a covered work, knowingly relying on a patent license,
|
||||
and the Corresponding Source of the work is not available for anyone
|
||||
to copy, free of charge and under the terms of this License, through a
|
||||
publicly available network server or other readily accessible means,
|
||||
then you must either (1) cause the Corresponding Source to be so
|
||||
available, or (2) arrange to deprive yourself of the benefit of the
|
||||
patent license for this particular work, or (3) arrange, in a manner
|
||||
consistent with the requirements of this License, to extend the patent
|
||||
license to downstream recipients. "Knowingly relying" means you have
|
||||
actual knowledge that, but for the patent license, your conveying the
|
||||
covered work in a country, or your recipient's use of the covered work
|
||||
in a country, would infringe one or more identifiable patents in that
|
||||
country that you have reason to believe are valid.
|
||||
|
||||
If, pursuant to or in connection with a single transaction or
|
||||
arrangement, you convey, or propagate by procuring conveyance of, a
|
||||
covered work, and grant a patent license to some of the parties
|
||||
receiving the covered work authorizing them to use, propagate, modify
|
||||
or convey a specific copy of the covered work, then the patent license
|
||||
you grant is automatically extended to all recipients of the covered
|
||||
work and works based on it.
|
||||
|
||||
A patent license is "discriminatory" if it does not include within
|
||||
the scope of its coverage, prohibits the exercise of, or is
|
||||
conditioned on the non-exercise of one or more of the rights that are
|
||||
specifically granted under this License. You may not convey a covered
|
||||
work if you are a party to an arrangement with a third party that is
|
||||
in the business of distributing software, under which you make payment
|
||||
to the third party based on the extent of your activity of conveying
|
||||
the work, and under which the third party grants, to any of the
|
||||
parties who would receive the covered work from you, a discriminatory
|
||||
patent license (a) in connection with copies of the covered work
|
||||
conveyed by you (or copies made from those copies), or (b) primarily
|
||||
for and in connection with specific products or compilations that
|
||||
contain the covered work, unless you entered into that arrangement,
|
||||
or that patent license was granted, prior to 28 March 2007.
|
||||
|
||||
Nothing in this License shall be construed as excluding or limiting
|
||||
any implied license or other defenses to infringement that may
|
||||
otherwise be available to you under applicable patent law.
|
||||
|
||||
12. No Surrender of Others' Freedom.
|
||||
|
||||
If conditions are imposed on you (whether by court order, agreement or
|
||||
otherwise) that contradict the conditions of this License, they do not
|
||||
excuse you from the conditions of this License. If you cannot convey a
|
||||
covered work so as to satisfy simultaneously your obligations under this
|
||||
License and any other pertinent obligations, then as a consequence you may
|
||||
not convey it at all. For example, if you agree to terms that obligate you
|
||||
to collect a royalty for further conveying from those to whom you convey
|
||||
the Program, the only way you could satisfy both those terms and this
|
||||
License would be to refrain entirely from conveying the Program.
|
||||
|
||||
13. Use with the GNU Affero General Public License.
|
||||
|
||||
Notwithstanding any other provision of this License, you have
|
||||
permission to link or combine any covered work with a work licensed
|
||||
under version 3 of the GNU Affero General Public License into a single
|
||||
combined work, and to convey the resulting work. The terms of this
|
||||
License will continue to apply to the part which is the covered work,
|
||||
but the special requirements of the GNU Affero General Public License,
|
||||
section 13, concerning interaction through a network will apply to the
|
||||
combination as such.
|
||||
|
||||
14. Revised Versions of this License.
|
||||
|
||||
The Free Software Foundation may publish revised and/or new versions of
|
||||
the GNU General Public License from time to time. Such new versions will
|
||||
be similar in spirit to the present version, but may differ in detail to
|
||||
address new problems or concerns.
|
||||
|
||||
Each version is given a distinguishing version number. If the
|
||||
Program specifies that a certain numbered version of the GNU General
|
||||
Public License "or any later version" applies to it, you have the
|
||||
option of following the terms and conditions either of that numbered
|
||||
version or of any later version published by the Free Software
|
||||
Foundation. If the Program does not specify a version number of the
|
||||
GNU General Public License, you may choose any version ever published
|
||||
by the Free Software Foundation.
|
||||
|
||||
If the Program specifies that a proxy can decide which future
|
||||
versions of the GNU General Public License can be used, that proxy's
|
||||
public statement of acceptance of a version permanently authorizes you
|
||||
to choose that version for the Program.
|
||||
|
||||
Later license versions may give you additional or different
|
||||
permissions. However, no additional obligations are imposed on any
|
||||
author or copyright holder as a result of your choosing to follow a
|
||||
later version.
|
||||
|
||||
15. Disclaimer of Warranty.
|
||||
|
||||
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
|
||||
APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
|
||||
HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
|
||||
OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
|
||||
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
||||
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
|
||||
IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
|
||||
ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
|
||||
|
||||
16. Limitation of Liability.
|
||||
|
||||
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
|
||||
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
|
||||
THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
|
||||
GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
|
||||
USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
|
||||
DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
|
||||
PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
|
||||
EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
|
||||
SUCH DAMAGES.
|
||||
|
||||
17. Interpretation of Sections 15 and 16.
|
||||
|
||||
If the disclaimer of warranty and limitation of liability provided
|
||||
above cannot be given local legal effect according to their terms,
|
||||
reviewing courts shall apply local law that most closely approximates
|
||||
an absolute waiver of all civil liability in connection with the
|
||||
Program, unless a warranty or assumption of liability accompanies a
|
||||
copy of the Program in return for a fee.
|
||||
|
||||
END OF TERMS AND CONDITIONS
|
||||
|
||||
How to Apply These Terms to Your New Programs
|
||||
|
||||
If you develop a new program, and you want it to be of the greatest
|
||||
possible use to the public, the best way to achieve this is to make it
|
||||
free software which everyone can redistribute and change under these terms.
|
||||
|
||||
To do so, attach the following notices to the program. It is safest
|
||||
to attach them to the start of each source file to most effectively
|
||||
state the exclusion of warranty; and each file should have at least
|
||||
the "copyright" line and a pointer to where the full notice is found.
|
||||
|
||||
<one line to give the program's name and a brief idea of what it does.>
|
||||
Copyright (C) <year> <name of author>
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
|
||||
Also add information on how to contact you by electronic and paper mail.
|
||||
|
||||
If the program does terminal interaction, make it output a short
|
||||
notice like this when it starts in an interactive mode:
|
||||
|
||||
<program> Copyright (C) <year> <name of author>
|
||||
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
|
||||
This is free software, and you are welcome to redistribute it
|
||||
under certain conditions; type `show c' for details.
|
||||
|
||||
The hypothetical commands `show w' and `show c' should show the appropriate
|
||||
parts of the General Public License. Of course, your program's commands
|
||||
might be different; for a GUI interface, you would use an "about box".
|
||||
|
||||
You should also get your employer (if you work as a programmer) or school,
|
||||
if any, to sign a "copyright disclaimer" for the program, if necessary.
|
||||
For more information on this, and how to apply and follow the GNU GPL, see
|
||||
<https://www.gnu.org/licenses/>.
|
||||
|
||||
The GNU General Public License does not permit incorporating your program
|
||||
into proprietary programs. If your program is a subroutine library, you
|
||||
may consider it more useful to permit linking proprietary applications with
|
||||
the library. If this is what you want to do, use the GNU Lesser General
|
||||
Public License instead of this License. But first, please read
|
||||
<https://www.gnu.org/licenses/why-not-lgpl.html>.
|
2
LICENSE
2
LICENSE
|
@ -1,4 +1,4 @@
|
|||
Copyright (c) 2018-2022: Albert Schwarzkopf <looqs at quitesimple period org>
|
||||
Copyright (c) 2018-2023: Albert Schwarzkopf <looqs at quitesimple period org>
|
||||
|
||||
looqs is made available under the following license:
|
||||
|
||||
|
|
12
README.md
12
README.md
|
@ -28,7 +28,7 @@ There is no need to write the long form of filters. There are also booleans avai
|
|||
The screenshots in this section may occasionally be slightly outdated, but they are usually recent enough to get an overall impression of the current state of the GUI.
|
||||
|
||||
## Current status
|
||||
Latest version: 2022-11-19, v0.8.1
|
||||
Latest version: 2023-05-07, v0.9
|
||||
|
||||
Please keep in mind: looqs is still at an early stage and may exhibit some weirdness and contain bugs.
|
||||
|
||||
|
@ -76,7 +76,7 @@ To build on Ubuntu and Debian, clone the repo and then run:
|
|||
```
|
||||
git submodule init
|
||||
git submodule update
|
||||
sudo apt install build-essential qtbase5-dev libpoppler-qt5-dev libuchardet-dev libquazip5-dev
|
||||
sudo apt install build-essential qtbase5-dev libqt5sql5-sqlite libpoppler-qt5-dev libuchardet-dev libquazip5-dev
|
||||
qmake
|
||||
make
|
||||
```
|
||||
|
@ -97,7 +97,9 @@ The GUI is located in `gui/looqs-gui`, the binary for the CLI is in `cli/looqs`
|
|||
## Packages
|
||||
At this point, looqs is not in any official distro package repo, but I maintain some packages.
|
||||
|
||||
### Ubuntu 22.04, 22.10
|
||||
|
||||
|
||||
### Ubuntu 23.04, 22.10, 22.04
|
||||
Latest release can be installed using apt from the repo.
|
||||
```
|
||||
# First, obtain key, assume it's trusted.
|
||||
|
@ -108,6 +110,8 @@ echo "deb [arch=amd64 signed-by=/usr/share/keyrings/repo.quitesimple.org.gpg] ht
|
|||
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
|
||||
|
@ -134,7 +138,7 @@ An AppImage may accompany the tarball in the future.
|
|||
|
||||
|
||||
### Other distros
|
||||
I'll probably add a package for voidlinux at some point and maybe will provide a Gentoo ebuild. However, I would appreciate help for others distros. If you create a package, let me know!
|
||||
I appreciate help for others distros. If you create a package, let me know!
|
||||
|
||||
|
||||
### Signature verification
|
||||
|
|
12
USAGE.md
12
USAGE.md
|
@ -165,6 +165,8 @@ A number of search filters are available.
|
|||
| 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 |
|
||||
|
||||
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.
|
||||
|
||||
|
@ -177,11 +179,5 @@ Examples:
|
|||
|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|This query is equivalent to c:("invoice") p:("Downloads")|
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|c:("invoice") Downloads|Equivalent to c:("invoice") p:("Downloads")|
|
||||
|p:(Downloads) invoice|Equivalent to c:("invoice") p:("Downloads")|
|
||||
|
|
11
cli/cli.pro
11
cli/cli.pro
|
@ -15,6 +15,7 @@ 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 \
|
||||
|
@ -27,6 +28,7 @@ HEADERS += \
|
|||
command.h \
|
||||
commandadd.h \
|
||||
commanddelete.h \
|
||||
commandtag.h \
|
||||
commandupdate.h \
|
||||
commandsearch.h \
|
||||
commandlist.h
|
||||
|
@ -35,15 +37,16 @@ win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../shared/release/ -ls
|
|||
else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../shared/debug/ -lshared
|
||||
else:unix: LIBS += -L$$OUT_PWD/../shared/ -lshared
|
||||
|
||||
LIBS += -luchardet -lpoppler-qt5 -lquazip5
|
||||
LIBS += -luchardet -lpoppler-qt6
|
||||
|
||||
packagesExist(quazip1-qt5) {
|
||||
PKGCONFIG += quazip1-qt5
|
||||
packagesExist(quazip1-qt6) {
|
||||
PKGCONFIG += quazip1-qt6
|
||||
CONFIG += link_pkgconfig
|
||||
LIBS -= -lquazip5
|
||||
}
|
||||
|
||||
INCLUDEPATH += $$PWD/../shared
|
||||
INCLUDEPATH += /usr/include/poppler/qt6/
|
||||
|
||||
DEPENDPATH += $$PWD/../shared
|
||||
|
||||
win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../shared/release/libshared.a
|
||||
|
|
|
@ -2,7 +2,6 @@
|
|||
#include <QThread>
|
||||
#include <QDebug>
|
||||
#include "command.h"
|
||||
#include "looqsgeneralexception.h"
|
||||
|
||||
void Command::execute()
|
||||
{
|
||||
|
|
|
@ -23,7 +23,7 @@ void CommandAdd::indexerFinished()
|
|||
if(failedPathsCount > 0)
|
||||
{
|
||||
Logger::info() << "Failed paths: " << Qt::endl;
|
||||
for(QString paths : result.failedPaths())
|
||||
for(const QString &paths : result.failedPaths())
|
||||
{
|
||||
Logger::info() << paths << Qt::endl;
|
||||
}
|
||||
|
@ -41,23 +41,36 @@ int CommandAdd::handle(QStringList arguments)
|
|||
{
|
||||
QCommandLineParser parser;
|
||||
parser.addOptions({{{"c", "continue"},
|
||||
"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. "
|
||||
"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."
|
||||
"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"},
|
||||
{{"t", "threads"}, "Number of threads to use.", "threads"}});
|
||||
|
||||
parser.addHelpOption();
|
||||
parser.addPositionalArgument("add", "Add paths to the index",
|
||||
"add [paths...]. If no path is given, read from stdin, one path per line.");
|
||||
|
||||
parser.process(arguments);
|
||||
this->keepGoing = parser.isSet("continue");
|
||||
bool pathsOnly = parser.isSet("no-content");
|
||||
bool fillContent = parser.isSet("fill-content");
|
||||
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)
|
||||
|
@ -71,15 +84,47 @@ 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());
|
||||
indexer->setKeepGoing(keepGoing);
|
||||
|
||||
if(verbose)
|
||||
{
|
||||
indexer->setProgressReportThreshold(1);
|
||||
}
|
||||
|
||||
connect(indexer, &Indexer::pathsCountChanged, this,
|
||||
[](int pathsCount) { Logger::info() << "Found paths: " << pathsCount << Qt::endl; });
|
||||
connect(indexer, &Indexer::indexProgress, this,
|
||||
[](int pathsCount, unsigned int added, unsigned int skipped, unsigned int failed, unsigned int totalCount)
|
||||
{ Logger::info() << "Processed files: " << pathsCount << Qt::endl; });
|
||||
[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::finished, this, &CommandAdd::indexerFinished);
|
||||
|
||||
this->autoFinish = false;
|
||||
|
|
|
@ -13,6 +13,8 @@ class CommandAdd : public Command
|
|||
bool keepGoing = true;
|
||||
|
||||
protected:
|
||||
IndexResult currentResult;
|
||||
|
||||
public:
|
||||
using Command::Command;
|
||||
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
#include <QCommandLineParser>
|
||||
#include "commandlist.h"
|
||||
#include "databasefactory.h"
|
||||
#include "logger.h"
|
||||
|
||||
int CommandList::handle(QStringList arguments)
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
#include <QCommandLineParser>
|
||||
#include "commandsearch.h"
|
||||
#include "databasefactory.h"
|
||||
#include "logger.h"
|
||||
|
||||
int CommandSearch::handle(QStringList arguments)
|
||||
|
|
|
@ -0,0 +1,153 @@
|
|||
#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;
|
||||
}
|
|
@ -0,0 +1,16 @@
|
|||
#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,10 +38,13 @@ int CommandUpdate::handle(QStringList arguments)
|
|||
QThreadPool::globalInstance()->setMaxThreadCount(threadsCount.toInt());
|
||||
}
|
||||
|
||||
bool hasErrors = false;
|
||||
IndexSyncer *syncer = new IndexSyncer(*this->dbService);
|
||||
syncer->setKeepGoing(keepGoing);
|
||||
syncer->setVerbose(verbose);
|
||||
|
||||
FileSaverOptions fileOptions;
|
||||
fileOptions.keepGoing = keepGoing;
|
||||
fileOptions.verbose = verbose;
|
||||
|
||||
syncer->setFileSaverOptions(fileOptions);
|
||||
syncer->setPattern(pattern);
|
||||
syncer->setDryRun(dryRun);
|
||||
syncer->setRemoveDeletedFromIndex(deleteMissing);
|
||||
|
@ -60,7 +63,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,
|
||||
[&](unsigned int totalUpdated, unsigned int totalRemoved, unsigned int totalErrors)
|
||||
[this, dryRun, keepGoing](unsigned int totalUpdated, unsigned int totalRemoved, unsigned int totalErrors)
|
||||
{
|
||||
Logger::info() << "Syncing finished" << Qt::endl;
|
||||
|
||||
|
@ -72,7 +75,7 @@ int CommandUpdate::handle(QStringList arguments)
|
|||
}
|
||||
|
||||
int retval = 0;
|
||||
if(hasErrors && !keepGoing)
|
||||
if(this->hasErrors && !keepGoing)
|
||||
{
|
||||
retval = 1;
|
||||
}
|
||||
|
@ -82,7 +85,7 @@ int CommandUpdate::handle(QStringList arguments)
|
|||
[&](QString error)
|
||||
{
|
||||
Logger::error() << error << Qt::endl;
|
||||
hasErrors = true;
|
||||
this->hasErrors = true;
|
||||
});
|
||||
|
||||
this->autoFinish = false;
|
||||
|
|
|
@ -4,6 +4,9 @@
|
|||
#include "filesaver.h"
|
||||
class CommandUpdate : public Command
|
||||
{
|
||||
protected:
|
||||
bool hasErrors = false;
|
||||
|
||||
public:
|
||||
using Command::Command;
|
||||
int handle(QStringList arguments) override;
|
||||
|
|
|
@ -21,6 +21,7 @@
|
|||
#include "commandupdate.h"
|
||||
#include "commandsearch.h"
|
||||
#include "commandlist.h"
|
||||
#include "commandtag.h"
|
||||
#include "databasefactory.h"
|
||||
#include "logger.h"
|
||||
#include "sandboxedprocessor.h"
|
||||
|
@ -31,7 +32,7 @@
|
|||
void printUsage(QString argv0)
|
||||
{
|
||||
qInfo() << "Usage:" << argv0 << "command";
|
||||
qInfo() << "Valid commands: add, update, delete, search, list. Each command has a --help option.";
|
||||
qInfo() << "Valid commands: add, update, search, delete, tag, list. Each command has a --help option.";
|
||||
}
|
||||
|
||||
Command *commandFromName(QString name, SqliteDbService &dbService)
|
||||
|
@ -56,6 +57,10 @@ Command *commandFromName(QString name, SqliteDbService &dbService)
|
|||
{
|
||||
return new CommandList(dbService);
|
||||
}
|
||||
if(name == "tag")
|
||||
{
|
||||
return new CommandTag(dbService);
|
||||
}
|
||||
|
||||
return nullptr;
|
||||
}
|
||||
|
|
|
@ -19,7 +19,6 @@ AboutDialog::AboutDialog(QWidget *parent) : QDialog(parent)
|
|||
closeButton->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
|
||||
connect(closeButton, &QPushButton::clicked, this, &QDialog::close);
|
||||
|
||||
closeLayout->setMargin(10);
|
||||
closeLayout->addStretch(10);
|
||||
closeLayout->addWidget(closeButton);
|
||||
|
||||
|
@ -32,7 +31,7 @@ AboutDialog::AboutDialog(QWidget *parent) : QDialog(parent)
|
|||
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 += "Copyright (c) 2018-2024: 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>";
|
||||
|
|
14
gui/gui.pro
14
gui/gui.pro
|
@ -34,6 +34,7 @@ SOURCES += \
|
|||
main.cpp \
|
||||
mainwindow.cpp \
|
||||
clicklabel.cpp \
|
||||
previewcoordinator.cpp \
|
||||
previewgenerator.cpp \
|
||||
previewgeneratormapfunctor.cpp \
|
||||
previewgeneratorodt.cpp \
|
||||
|
@ -54,6 +55,7 @@ HEADERS += \
|
|||
ipcserver.h \
|
||||
mainwindow.h \
|
||||
clicklabel.h \
|
||||
previewcoordinator.h \
|
||||
previewgenerator.h \
|
||||
previewgeneratormapfunctor.h \
|
||||
previewgeneratorodt.h \
|
||||
|
@ -69,8 +71,8 @@ HEADERS += \
|
|||
FORMS += \
|
||||
mainwindow.ui
|
||||
|
||||
INCLUDEPATH += /usr/include/poppler/qt5/
|
||||
INCLUDEPATH += /usr/include/quazip5
|
||||
INCLUDEPATH += /usr/include/poppler/qt6/
|
||||
INCLUDEPATH += /usr/include/quazip6
|
||||
|
||||
QT += widgets sql
|
||||
|
||||
|
@ -78,12 +80,12 @@ win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../shared/release/ -ls
|
|||
else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../shared/debug/ -lshared
|
||||
else:unix: LIBS += -L$$OUT_PWD/../shared/ -lshared
|
||||
|
||||
LIBS += -luchardet -lpoppler-qt5 -lquazip5
|
||||
LIBS += -luchardet -lpoppler-qt6 -lquazip6
|
||||
|
||||
packagesExist(quazip1-qt5) {
|
||||
PKGCONFIG += quazip1-qt5
|
||||
packagesExist(quazip1-qt6) {
|
||||
PKGCONFIG += quazip1-qt6
|
||||
CONFIG += link_pkgconfig
|
||||
LIBS -= -lquazip5
|
||||
LIBS -= -lquazip6
|
||||
}
|
||||
|
||||
INCLUDEPATH += $$PWD/../shared
|
||||
|
|
|
@ -68,22 +68,25 @@ void IPCPreviewClient::start(RenderConfig config, const QVector<RenderTarget> &t
|
|||
if(socket->isOpen() && socket->isWritable())
|
||||
{
|
||||
QDataStream stream(socket);
|
||||
stream.startTransaction();
|
||||
stream << GeneratePreviews;
|
||||
stream << config;
|
||||
stream << targets;
|
||||
stream.commitTransaction();
|
||||
socket->flush();
|
||||
|
||||
int numTarget = 0;
|
||||
qsizetype numTarget = 0;
|
||||
if(socket->isOpen() && socket->isReadable() && socket->state() == QLocalSocket::ConnectedState)
|
||||
{
|
||||
do
|
||||
{
|
||||
socket->waitForReadyRead(100);
|
||||
socket->waitForReadyRead(5000);
|
||||
stream.startTransaction();
|
||||
stream >> numTarget;
|
||||
} while(!stream.commitTransaction() && socket->state() == QLocalSocket::ConnectedState);
|
||||
if(numTarget != targets.count())
|
||||
{
|
||||
qDebug() << "Target count mismatch";
|
||||
emit error("IPC Error: Server reports less targets than it should");
|
||||
return;
|
||||
}
|
||||
|
|
|
@ -51,7 +51,9 @@ void IpcServer::spawnerNewConnection()
|
|||
} while(!stream.commitTransaction() && socket->state() == QLocalSocket::ConnectedState);
|
||||
if(socket->state() == QLocalSocket::ConnectedState)
|
||||
{
|
||||
stream.startTransaction();
|
||||
stream << targets.count();
|
||||
stream.commitTransaction();
|
||||
socket->flush();
|
||||
IPCPreviewWorker *previewWorker = new IPCPreviewWorker(socket);
|
||||
connect(previewWorker, &IPCPreviewWorker::finished, this, [previewWorker] { delete previewWorker; });
|
||||
|
@ -59,6 +61,7 @@ void IpcServer::spawnerNewConnection()
|
|||
}
|
||||
else
|
||||
{
|
||||
qDebug() << "Deleting socket...";
|
||||
delete socket;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -28,7 +28,7 @@ void enableIpcSandbox()
|
|||
policy->namespace_options = EXILE_UNSHARE_USER | EXILE_UNSHARE_MOUNT | EXILE_UNSHARE_NETWORK;
|
||||
policy->no_new_privs = 1;
|
||||
policy->drop_caps = 1;
|
||||
policy->vow_promises = exile_vows_from_str("thread cpath rpath unix stdio proc error");
|
||||
policy->vow_promises = exile_vows_from_str("thread cpath rpath wpath unix stdio proc error");
|
||||
policy->mount_path_policies_to_chroot = 1;
|
||||
|
||||
QString ipcSocketPath = Common::ipcSocketPath();
|
||||
|
@ -193,7 +193,7 @@ int main(int argc, char *argv[])
|
|||
Logger::error() << error << Qt::endl;
|
||||
QMessageBox::critical(nullptr, "Error during upgrade",
|
||||
error);
|
||||
qApp->quit();
|
||||
exit(EXIT_FAILURE);
|
||||
}
|
||||
|
||||
);
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
#include <poppler-qt5.h>
|
||||
#include <poppler-qt6.h>
|
||||
#include <QLabel>
|
||||
#include <QtDebug>
|
||||
#include <QFileInfo>
|
||||
|
@ -15,15 +15,14 @@
|
|||
#include <QFileDialog>
|
||||
#include <QScreen>
|
||||
#include <QProgressDialog>
|
||||
#include <QDesktopWidget>
|
||||
#include <QWidgetAction>
|
||||
#include <QInputDialog>
|
||||
#include "mainwindow.h"
|
||||
#include "ui_mainwindow.h"
|
||||
#include "clicklabel.h"
|
||||
#include "../shared/sqlitesearch.h"
|
||||
#include "../shared/looqsgeneralexception.h"
|
||||
#include "../shared/common.h"
|
||||
#include "ipcpreviewclient.h"
|
||||
#include "previewgenerator.h"
|
||||
#include "aboutdialog.h"
|
||||
|
||||
MainWindow::MainWindow(QWidget *parent, QString socketPath)
|
||||
|
@ -32,8 +31,7 @@ MainWindow::MainWindow(QWidget *parent, QString socketPath)
|
|||
this->progressDialog.cancel(); // because constructing it shows it, quite weird
|
||||
ui->setupUi(this);
|
||||
setWindowTitle(QCoreApplication::applicationName());
|
||||
this->ipcPreviewClient.moveToThread(&this->ipcClientThread);
|
||||
this->ipcPreviewClient.setSocketPath(socketPath);
|
||||
|
||||
QSettings settings;
|
||||
|
||||
this->dbFactory = new DatabaseFactory(Common::databasePath());
|
||||
|
@ -45,6 +43,9 @@ MainWindow::MainWindow(QWidget *parent, QString socketPath)
|
|||
|
||||
indexer = new Indexer(*(this->dbService));
|
||||
indexer->setParent(this);
|
||||
|
||||
tagManager = new TagManager(*(this->dbService));
|
||||
|
||||
connectSignals();
|
||||
ui->treeResultsList->setContextMenuPolicy(Qt::ContextMenuPolicy::CustomContextMenu);
|
||||
ui->tabWidget->setCurrentIndex(0);
|
||||
|
@ -78,7 +79,7 @@ MainWindow::MainWindow(QWidget *parent, QString socketPath)
|
|||
ui->txtSearch->installEventFilter(this);
|
||||
ui->scrollArea->viewport()->installEventFilter(this);
|
||||
|
||||
this->ipcClientThread.start();
|
||||
this->previewCoordinator.setSocketPath(socketPath);
|
||||
}
|
||||
|
||||
void MainWindow::addPathToIndex()
|
||||
|
@ -150,7 +151,7 @@ void MainWindow::connectSignals()
|
|||
connect(this->indexer, &Indexer::finished, this, &MainWindow::finishIndexing);
|
||||
|
||||
connect(ui->lstPaths->selectionModel(), &QItemSelectionModel::selectionChanged, this,
|
||||
[&](const QItemSelection &selected, const QItemSelection &deselected)
|
||||
[&](const QItemSelection & /*selected*/, const QItemSelection & /*deselected*/)
|
||||
{ ui->btnDeletePath->setEnabled(this->ui->lstPaths->selectedItems().count() > 0); });
|
||||
|
||||
connect(ui->btnDeletePath, &QPushButton::clicked, this, [&] { qDeleteAll(ui->lstPaths->selectedItems()); });
|
||||
|
@ -170,30 +171,29 @@ void MainWindow::connectSignals()
|
|||
}
|
||||
});
|
||||
connect(ui->menuAboutAction, &QAction::triggered, this,
|
||||
[this](bool checked)
|
||||
[this](bool /*checked*/)
|
||||
{
|
||||
AboutDialog aboutDialog(this);
|
||||
|
||||
aboutDialog.exec();
|
||||
});
|
||||
connect(ui->menuAboutQtAction, &QAction::triggered, this,
|
||||
[this](bool checked) { QMessageBox::aboutQt(this, "About Qt"); });
|
||||
[this](bool /*checked*/) { QMessageBox::aboutQt(this, "About Qt"); });
|
||||
connect(ui->menuSyncIndexAction, &QAction::triggered, this, &MainWindow::startIndexSync);
|
||||
connect(ui->menuOpenUserManualAction, &QAction::triggered, this,
|
||||
[this]() { QDesktopServices::openUrl(Common::userManualUrl()); });
|
||||
[]() { QDesktopServices::openUrl(Common::userManualUrl()); });
|
||||
|
||||
connect(indexSyncer, &IndexSyncer::finished, this,
|
||||
[&](unsigned int totalUpdated, unsigned int totalDeleted, unsigned int totalErrored)
|
||||
{
|
||||
this->progressDialog.cancel();
|
||||
connect(
|
||||
indexSyncer, &IndexSyncer::finished, this,
|
||||
[&](unsigned int totalUpdated, unsigned int totalDeleted, unsigned int totalErrored)
|
||||
{
|
||||
this->progressDialog.cancel();
|
||||
|
||||
QMessageBox::information(
|
||||
this, "Syncing finished",
|
||||
QString("Syncing finished\n\nTotal updated: %1\nTotal deleted: %2\nTotal errors: %3\n")
|
||||
.arg(QString::number(totalUpdated))
|
||||
.arg(QString::number(totalDeleted))
|
||||
.arg(QString::number(totalErrored)));
|
||||
});
|
||||
QMessageBox::information(
|
||||
this, "Syncing finished",
|
||||
QString("Syncing finished\n\nTotal updated: %1\nTotal deleted: %2\nTotal errors: %3\n")
|
||||
.arg(QString::number(totalUpdated), QString::number(totalDeleted), QString::number(totalErrored)));
|
||||
});
|
||||
connect(this, &MainWindow::beginIndexSync, indexSyncer, &IndexSyncer::sync);
|
||||
connect(&this->progressDialog, &QProgressDialog::canceled, indexSyncer, &IndexSyncer::cancel);
|
||||
connect(ui->btnSaveSettings, &QPushButton::clicked, this, &MainWindow::saveSettings);
|
||||
|
@ -208,9 +208,9 @@ void MainWindow::connectSignals()
|
|||
}
|
||||
},
|
||||
Qt::QueuedConnection);
|
||||
connect(&ipcPreviewClient, &IPCPreviewClient::previewReceived, this, &MainWindow::previewReceived,
|
||||
connect(&previewCoordinator, &PreviewCoordinator::previewReady, this, &MainWindow::previewReceived,
|
||||
Qt::QueuedConnection);
|
||||
connect(&ipcPreviewClient, &IPCPreviewClient::finished, this,
|
||||
connect(&previewCoordinator, &PreviewCoordinator::completedGeneration, this,
|
||||
[&]
|
||||
{
|
||||
this->ui->previewProcessBar->setValue(this->ui->previewProcessBar->maximum());
|
||||
|
@ -218,22 +218,24 @@ void MainWindow::connectSignals()
|
|||
this->ui->comboPreviewFiles->setEnabled(true);
|
||||
ui->txtSearch->setEnabled(true);
|
||||
});
|
||||
connect(&ipcPreviewClient, &IPCPreviewClient::error, this,
|
||||
connect(&previewCoordinator, &PreviewCoordinator::error, this,
|
||||
[this](QString msg)
|
||||
{
|
||||
qCritical() << msg << Qt::endl;
|
||||
QMessageBox::critical(this, "IPC error", msg);
|
||||
});
|
||||
|
||||
connect(this, &MainWindow::startIpcPreviews, &ipcPreviewClient, &IPCPreviewClient::startGeneration,
|
||||
Qt::QueuedConnection);
|
||||
connect(this, &MainWindow::stopIpcPreviews, &ipcPreviewClient, &IPCPreviewClient::stopGeneration,
|
||||
Qt::QueuedConnection);
|
||||
connect(ui->radioMetadataOnly, &QRadioButton::toggled, this,
|
||||
[this](bool toggled)
|
||||
{
|
||||
if(toggled)
|
||||
{
|
||||
this->ui->chkFillContentForContentless->setChecked(false);
|
||||
};
|
||||
});
|
||||
}
|
||||
|
||||
void MainWindow::exportFailedPaths()
|
||||
{
|
||||
|
||||
QString filename =
|
||||
QString("/tmp/looqs_indexresult_failed_%1").arg(QDateTime::currentDateTime().toString("yyyy-MM-dd_hhmmss"));
|
||||
QFile outFile(filename);
|
||||
|
@ -266,8 +268,11 @@ void MainWindow::startIndexSync()
|
|||
progressDialog.setValue(0);
|
||||
progressDialog.open();
|
||||
|
||||
indexSyncer->setKeepGoing(true);
|
||||
indexSyncer->setVerbose(false);
|
||||
FileSaverOptions options;
|
||||
options.keepGoing = true;
|
||||
options.verbose = false;
|
||||
|
||||
indexSyncer->setFileSaverOptions(options);
|
||||
indexSyncer->setDryRun(false);
|
||||
indexSyncer->setRemoveDeletedFromIndex(true);
|
||||
|
||||
|
@ -286,6 +291,7 @@ void MainWindow::startIndexing()
|
|||
if(this->indexer->isRunning())
|
||||
{
|
||||
ui->btnStartIndexing->setEnabled(false);
|
||||
|
||||
ui->btnStartIndexing->setText("Start indexing");
|
||||
this->indexer->requestCancellation();
|
||||
return;
|
||||
|
@ -295,6 +301,9 @@ void MainWindow::startIndexing()
|
|||
ui->resultsTab->setEnabled(false);
|
||||
ui->settingsTab->setEnabled(false);
|
||||
ui->txtPathScanAdd->setEnabled(false);
|
||||
ui->btnAddPath->setEnabled(false);
|
||||
ui->btnChoosePath->setEnabled(false);
|
||||
ui->btnDeletePath->setEnabled(false);
|
||||
ui->txtSearch->setEnabled(false);
|
||||
ui->previewProcessBar->setValue(0);
|
||||
ui->previewProcessBar->setVisible(true);
|
||||
|
@ -310,7 +319,18 @@ void MainWindow::startIndexing()
|
|||
}
|
||||
this->indexer->setTargetPaths(paths);
|
||||
QString ignorePatterns = ui->txtIgnorePatterns->text();
|
||||
this->indexer->setIgnorePattern(ignorePatterns.split(";"));
|
||||
QStringList patterns = ignorePatterns.split(";");
|
||||
patterns.removeAll(QString{});
|
||||
this->indexer->setIgnorePattern(patterns);
|
||||
|
||||
FileSaverOptions options;
|
||||
options.fillExistingContentless =
|
||||
ui->chkFillContentForContentless->isEnabled() && ui->chkFillContentForContentless->isChecked();
|
||||
options.metadataOnly = ui->radioMetadataOnly->isChecked();
|
||||
options.verbose = false;
|
||||
options.keepGoing = true;
|
||||
|
||||
this->indexer->setFileSaverOptions(options);
|
||||
this->indexer->beginIndexing();
|
||||
QSettings settings;
|
||||
settings.setValue("indexPaths", pathSettingsValue);
|
||||
|
@ -333,6 +353,9 @@ void MainWindow::finishIndexing()
|
|||
ui->resultsTab->setEnabled(true);
|
||||
ui->settingsTab->setEnabled(true);
|
||||
ui->txtPathScanAdd->setEnabled(true);
|
||||
ui->btnAddPath->setEnabled(true);
|
||||
ui->btnChoosePath->setEnabled(true);
|
||||
ui->btnDeletePath->setEnabled(true);
|
||||
ui->txtSearch->setEnabled(true);
|
||||
if(result.erroredPaths > 0)
|
||||
{
|
||||
|
@ -340,7 +363,7 @@ void MainWindow::finishIndexing()
|
|||
}
|
||||
}
|
||||
|
||||
void MainWindow::comboScaleChanged(int i)
|
||||
void MainWindow::comboScaleChanged(int /*i*/)
|
||||
{
|
||||
QSettings scaleSetting;
|
||||
scaleSetting.setValue("currentScale", ui->comboScale->currentText());
|
||||
|
@ -386,7 +409,8 @@ void MainWindow::processShortcut(int key)
|
|||
{
|
||||
ui->txtSearch->setFocus();
|
||||
QString currentText = ui->txtSearch->text().trimmed();
|
||||
int index = currentText.lastIndexOf(QRegularExpression("[\\s\\)]"));
|
||||
static QRegularExpression separatorRegex("[\\s\\)]");
|
||||
int index = currentText.lastIndexOf(separatorRegex);
|
||||
if(index != -1)
|
||||
{
|
||||
bool isFilter = (index == currentText.length() - 1);
|
||||
|
@ -610,6 +634,8 @@ void MainWindow::saveSettings()
|
|||
"Failed to remove old database. Settings not saved.");
|
||||
return;
|
||||
}
|
||||
QFile::remove(Common::databasePath() + "-shm");
|
||||
QFile::remove(Common::databasePath() + "-wal");
|
||||
}
|
||||
|
||||
QSettings settings;
|
||||
|
@ -632,13 +658,17 @@ void MainWindow::saveSettings()
|
|||
qApp->quit();
|
||||
}
|
||||
|
||||
void MainWindow::previewReceived(QSharedPointer<PreviewResult> preview, unsigned int previewGeneration)
|
||||
void MainWindow::previewReceived()
|
||||
{
|
||||
if(previewGeneration < this->currentPreviewGeneration)
|
||||
{
|
||||
return;
|
||||
}
|
||||
this->ui->previewProcessBar->setValue(this->ui->previewProcessBar->value() + 1);
|
||||
QBoxLayout *layout = static_cast<QBoxLayout *>(ui->scrollAreaWidgetContents->layout());
|
||||
int index = layout->count();
|
||||
if(index > 0)
|
||||
{
|
||||
--index;
|
||||
}
|
||||
QSharedPointer<PreviewResult> preview = this->previewCoordinator.resultAt(index);
|
||||
|
||||
if(!preview.isNull() && preview->hasPreview())
|
||||
{
|
||||
QString docPath = preview->getDocumentPath();
|
||||
|
@ -647,7 +677,7 @@ void MainWindow::previewReceived(QSharedPointer<PreviewResult> preview, unsigned
|
|||
headerLabel->setText(QString("Path: ") + preview->getDocumentPath());
|
||||
|
||||
ClickLabel *label = dynamic_cast<ClickLabel *>(preview->createPreviewWidget());
|
||||
label->setMaximumWidth(QApplication::desktop()->availableGeometry().width() - 200);
|
||||
label->setMaximumWidth(QApplication::primaryScreen()->availableGeometry().width() - 200);
|
||||
|
||||
QVBoxLayout *previewLayout = new QVBoxLayout();
|
||||
|
||||
|
@ -661,8 +691,8 @@ void MainWindow::previewReceived(QSharedPointer<PreviewResult> preview, unsigned
|
|||
{
|
||||
QFileInfo fileInfo{docPath};
|
||||
QMenu menu("labeRightClick", this);
|
||||
createSearchResutlMenu(menu, fileInfo);
|
||||
menu.addAction("Copy page number",
|
||||
createSearchResultMenu(menu, fileInfo);
|
||||
menu.addAction("Copy page number", this,
|
||||
[previewPage] { QGuiApplication::clipboard()->setText(QString::number(previewPage)); });
|
||||
menu.exec(QCursor::pos());
|
||||
};
|
||||
|
@ -676,7 +706,7 @@ void MainWindow::previewReceived(QSharedPointer<PreviewResult> preview, unsigned
|
|||
|
||||
previewLayout->addWidget(headerLabel);
|
||||
|
||||
previewLayout->setMargin(0);
|
||||
previewLayout->setContentsMargins(0, 0, 0, 0);
|
||||
previewLayout->insertStretch(0, 1);
|
||||
previewLayout->insertStretch(-1, 1);
|
||||
previewLayout->setAlignment(Qt::AlignCenter);
|
||||
|
@ -684,24 +714,7 @@ void MainWindow::previewReceived(QSharedPointer<PreviewResult> preview, unsigned
|
|||
|
||||
previewWidget->setLayout(previewLayout);
|
||||
|
||||
QBoxLayout *layout = static_cast<QBoxLayout *>(ui->scrollAreaWidgetContents->layout());
|
||||
int pos = previewOrder[docPath + QString::number(previewPage)];
|
||||
if(pos <= layout->count())
|
||||
{
|
||||
layout->insertWidget(pos, previewWidget);
|
||||
for(auto it = previewWidgetOrderCache.constKeyValueBegin();
|
||||
it != previewWidgetOrderCache.constKeyValueEnd(); it++)
|
||||
{
|
||||
if(it->first <= layout->count())
|
||||
{
|
||||
layout->insertWidget(it->first, it->second);
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
previewWidgetOrderCache[pos] = previewWidget;
|
||||
}
|
||||
layout->insertWidget(index, previewWidget);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -818,7 +831,6 @@ void MainWindow::lineEditReturnPressed()
|
|||
|
||||
void MainWindow::handleSearchResults(const QVector<SearchResult> &results)
|
||||
{
|
||||
this->previewableSearchResults.clear();
|
||||
qDeleteAll(ui->scrollAreaWidgetContents->children());
|
||||
|
||||
ui->treeResultsList->clear();
|
||||
|
@ -827,6 +839,8 @@ void MainWindow::handleSearchResults(const QVector<SearchResult> &results)
|
|||
ui->comboPreviewFiles->setVisible(true);
|
||||
ui->lblTotalPreviewPagesCount->setText("");
|
||||
|
||||
this->previewCoordinator.init(results);
|
||||
|
||||
bool hasDeleted = false;
|
||||
QHash<QString, bool> seenMap;
|
||||
for(const SearchResult &result : results)
|
||||
|
@ -847,34 +861,29 @@ void MainWindow::handleSearchResults(const QVector<SearchResult> &results)
|
|||
item->setText(3, this->locale().formattedDataSize(result.fileData.size));
|
||||
}
|
||||
bool exists = pathInfo.exists();
|
||||
if(exists)
|
||||
{
|
||||
if(result.wasContentSearch)
|
||||
{
|
||||
if(!pathInfo.suffix().contains("htm")) // hack until we can preview them properly...
|
||||
{
|
||||
if(PreviewGenerator::get(pathInfo) != nullptr)
|
||||
{
|
||||
this->previewableSearchResults.append(result);
|
||||
if(!seenMap.contains(result.fileData.absPath))
|
||||
{
|
||||
ui->comboPreviewFiles->addItem(result.fileData.absPath);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
if(!exists)
|
||||
{
|
||||
hasDeleted = true;
|
||||
}
|
||||
seenMap[absPath] = true;
|
||||
}
|
||||
|
||||
seenMap.clear();
|
||||
for(const SearchResult &result : this->previewCoordinator.getPreviewableSearchResults())
|
||||
{
|
||||
const QString &absPath = result.fileData.absPath;
|
||||
if(!seenMap.contains(absPath))
|
||||
{
|
||||
ui->comboPreviewFiles->addItem(absPath);
|
||||
}
|
||||
seenMap[absPath] = true;
|
||||
}
|
||||
|
||||
ui->treeResultsList->resizeColumnToContents(0);
|
||||
ui->treeResultsList->resizeColumnToContents(1);
|
||||
ui->treeResultsList->resizeColumnToContents(2);
|
||||
previewDirty = !this->previewableSearchResults.empty();
|
||||
|
||||
previewDirty = this->previewCoordinator.previewableCount() > 0;
|
||||
|
||||
ui->spinPreviewPage->setValue(1);
|
||||
|
||||
|
@ -883,8 +892,10 @@ void MainWindow::handleSearchResults(const QVector<SearchResult> &results)
|
|||
makePreviews(1);
|
||||
}
|
||||
|
||||
ui->tabWidget->setTabEnabled(1, previewDirty);
|
||||
|
||||
QString statusText = "Results: " + QString::number(results.size()) + " files";
|
||||
statusText += ", previewable: " + QString::number(this->previewableSearchResults.count());
|
||||
statusText += ", previewable: " + QString::number(this->previewCoordinator.previewableCount());
|
||||
if(hasDeleted)
|
||||
{
|
||||
statusText += " WARNING: Some files are inaccessible. No preview available for those. Index may be out of sync";
|
||||
|
@ -901,7 +912,7 @@ int MainWindow::currentSelectedScale()
|
|||
|
||||
void MainWindow::makePreviews(int page)
|
||||
{
|
||||
if(this->previewableSearchResults.empty())
|
||||
if(this->previewCoordinator.previewableCount() == 0)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
@ -918,11 +929,10 @@ void MainWindow::makePreviews(int page)
|
|||
ui->scrollAreaWidgetContents->setLayout(new QVBoxLayout());
|
||||
ui->scrollAreaWidgetContents->layout()->setAlignment(Qt::AlignCenter);
|
||||
}
|
||||
ui->previewProcessBar->setMaximum(this->previewableSearchResults.size());
|
||||
processedPdfPreviews = 0;
|
||||
ui->previewProcessBar->setMaximum(this->previewCoordinator.previewableCount());
|
||||
|
||||
QVector<QString> wordsToHighlight;
|
||||
QRegularExpression extractor(R"#("([^"]*)"|([^\s]+))#");
|
||||
static QRegularExpression extractor(R"#("([^"]*)"|([^\s]+))#");
|
||||
for(const Token &token : this->contentSearchQuery.getTokens())
|
||||
{
|
||||
if(token.type == FILTER_CONTENT_CONTAINS)
|
||||
|
@ -954,12 +964,8 @@ void MainWindow::makePreviews(int page)
|
|||
renderConfig.scaleY = QGuiApplication::primaryScreen()->physicalDotsPerInchY() * (currentScale / 100.);
|
||||
renderConfig.wordsToHighlight = wordsToHighlight;
|
||||
|
||||
this->previewOrder.clear();
|
||||
this->previewWidgetOrderCache.clear();
|
||||
|
||||
int previewPos = 0;
|
||||
QVector<RenderTarget> targets;
|
||||
for(SearchResult &sr : this->previewableSearchResults)
|
||||
for(const SearchResult &sr : this->previewCoordinator.getPreviewableSearchResults())
|
||||
{
|
||||
if(ui->comboPreviewFiles->currentIndex() != 0)
|
||||
{
|
||||
|
@ -971,11 +977,8 @@ void MainWindow::makePreviews(int page)
|
|||
RenderTarget renderTarget;
|
||||
renderTarget.path = sr.fileData.absPath;
|
||||
renderTarget.page = (int)sr.page;
|
||||
targets.append(renderTarget);
|
||||
|
||||
int pos = previewPos - beginOffset;
|
||||
this->previewOrder[renderTarget.path + QString::number(renderTarget.page)] = pos;
|
||||
++previewPos;
|
||||
targets.append(renderTarget);
|
||||
}
|
||||
int numpages = ceil(static_cast<double>(targets.size()) / previewsPerPage);
|
||||
ui->spinPreviewPage->setMaximum(numpages);
|
||||
|
@ -985,12 +988,12 @@ void MainWindow::makePreviews(int page)
|
|||
ui->previewProcessBar->setMaximum(targets.count());
|
||||
ui->previewProcessBar->setMinimum(0);
|
||||
ui->previewProcessBar->setValue(0);
|
||||
ui->previewProcessBar->setVisible(this->previewableSearchResults.size() > 0);
|
||||
++this->currentPreviewGeneration;
|
||||
ui->previewProcessBar->setVisible(this->previewCoordinator.previewableCount() > 0);
|
||||
this->ui->spinPreviewPage->setEnabled(false);
|
||||
this->ui->comboPreviewFiles->setEnabled(false);
|
||||
this->ui->txtSearch->setEnabled(false);
|
||||
emit startIpcPreviews(renderConfig, targets);
|
||||
|
||||
this->previewCoordinator.startGeneration(renderConfig, targets);
|
||||
}
|
||||
|
||||
void MainWindow::handleSearchError(QString error)
|
||||
|
@ -998,27 +1001,87 @@ void MainWindow::handleSearchError(QString error)
|
|||
ui->lblSearchResults->setText("Error:" + error);
|
||||
}
|
||||
|
||||
void MainWindow::createSearchResutlMenu(QMenu &menu, const QFileInfo &fileInfo)
|
||||
void MainWindow::createSearchResultMenu(QMenu &menu, const QFileInfo &fileInfo)
|
||||
{
|
||||
menu.addAction("Copy filename to clipboard",
|
||||
menu.addAction("Copy filename to clipboard", this,
|
||||
[&fileInfo] { QGuiApplication::clipboard()->setText(fileInfo.fileName()); });
|
||||
menu.addAction("Copy full path to clipboard",
|
||||
menu.addAction("Copy full path to clipboard", this,
|
||||
[&fileInfo] { QGuiApplication::clipboard()->setText(fileInfo.absoluteFilePath()); });
|
||||
menu.addAction("Open containing folder", [this, &fileInfo] { this->openFile(fileInfo.absolutePath()); });
|
||||
menu.addAction("Open containing folder", this, [this, &fileInfo] { this->openFile(fileInfo.absolutePath()); });
|
||||
|
||||
auto previewables = this->previewCoordinator.getPreviewableSearchResults();
|
||||
auto result =
|
||||
std::find_if(this->previewableSearchResults.begin(), this->previewableSearchResults.end(),
|
||||
[this, &fileInfo](SearchResult &a) { return fileInfo.absoluteFilePath() == a.fileData.absPath; });
|
||||
std::find_if(previewables.begin(), previewables.end(),
|
||||
[&fileInfo](SearchResult &a) { return fileInfo.absoluteFilePath() == a.fileData.absPath; });
|
||||
|
||||
if(result != this->previewableSearchResults.end())
|
||||
if(result != previewables.end())
|
||||
{
|
||||
menu.addAction("Show previews for this file",
|
||||
menu.addAction("Show previews for this file", this,
|
||||
[this, &fileInfo]
|
||||
{
|
||||
ui->tabWidget->setCurrentIndex(1);
|
||||
this->ui->comboPreviewFiles->setCurrentText(fileInfo.absoluteFilePath());
|
||||
});
|
||||
}
|
||||
|
||||
QMenu *tagMenu = menu.addMenu("Tag file with: ");
|
||||
QVector<QString> allTags = this->dbService->getTags();
|
||||
QHash<QString, bool> fileTags;
|
||||
|
||||
QString path = fileInfo.absoluteFilePath();
|
||||
|
||||
for(const QString &fileTag : this->dbService->getTagsForPath(path))
|
||||
{
|
||||
fileTags[fileTag] = true;
|
||||
}
|
||||
|
||||
for(const QString &tag : allTags)
|
||||
{
|
||||
QCheckBox *checkBox = new QCheckBox(tagMenu);
|
||||
QWidgetAction *checkableAction = new QWidgetAction(tagMenu);
|
||||
checkableAction->setDefaultWidget(checkBox);
|
||||
checkBox->setText(tag);
|
||||
checkBox->setChecked(fileTags.contains(tag));
|
||||
tagMenu->addAction(checkableAction);
|
||||
|
||||
connect(checkBox, &QCheckBox::stateChanged, this,
|
||||
[this, checkBox, path]
|
||||
{
|
||||
QVector<QString> currentTags = this->dbService->getTagsForPath(path);
|
||||
QString checkBoxText = checkBox->text();
|
||||
if(checkBox->isChecked())
|
||||
{
|
||||
if(!this->tagManager->addTagsToPath(path, {checkBoxText}))
|
||||
{
|
||||
QMessageBox::critical(this, "Error while adding tag",
|
||||
"An error occured while trying to add the tag");
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if(!this->tagManager->removeTagsForPath(path, {checkBoxText}))
|
||||
{
|
||||
QMessageBox::critical(this, "Error while removing tag",
|
||||
"An error occured while trying to remove the tag");
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
tagMenu->addAction("Add new tags", this,
|
||||
[this, path]
|
||||
{
|
||||
bool ok;
|
||||
QString text =
|
||||
QInputDialog::getText(this, tr("Enter new tags"), tr("New tags (comma separated):"),
|
||||
QLineEdit::Normal, "", &ok);
|
||||
|
||||
if(ok && !this->tagManager->addTagsToPath(path, text, ','))
|
||||
{
|
||||
QMessageBox::critical(this, "Error while trying to add tags",
|
||||
"An error occured while trying to add tags");
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
void MainWindow::openDocument(QString path, int num)
|
||||
|
@ -1048,7 +1111,7 @@ void MainWindow::openFile(QString path)
|
|||
QDesktopServices::openUrl(QUrl::fromLocalFile(path));
|
||||
}
|
||||
|
||||
void MainWindow::treeSearchItemActivated(QTreeWidgetItem *item, int i)
|
||||
void MainWindow::treeSearchItemActivated(QTreeWidgetItem *item, int /*i*/)
|
||||
{
|
||||
openFile(item->text(1));
|
||||
}
|
||||
|
@ -1062,22 +1125,22 @@ void MainWindow::showSearchResultsContextMenu(const QPoint &point)
|
|||
}
|
||||
QFileInfo pathinfo(item->text(1));
|
||||
QMenu menu("SearchResults", this);
|
||||
createSearchResutlMenu(menu, pathinfo);
|
||||
createSearchResultMenu(menu, pathinfo);
|
||||
menu.exec(QCursor::pos());
|
||||
}
|
||||
|
||||
MainWindow::~MainWindow()
|
||||
{
|
||||
syncerThread.terminate();
|
||||
ipcClientThread.terminate();
|
||||
delete this->indexSyncer;
|
||||
delete this->dbService;
|
||||
delete this->dbFactory;
|
||||
delete this->indexer;
|
||||
delete this->tagManager;
|
||||
delete ui;
|
||||
}
|
||||
|
||||
void MainWindow::closeEvent(QCloseEvent *event)
|
||||
void MainWindow::closeEvent(QCloseEvent * /*event*/)
|
||||
{
|
||||
QStringList list = this->searchHistory.toList();
|
||||
QSettings settings;
|
||||
|
|
|
@ -12,8 +12,9 @@
|
|||
#include <QProgressDialog>
|
||||
#include "../shared/looqsquery.h"
|
||||
#include "../shared/indexsyncer.h"
|
||||
#include "ipcpreviewclient.h"
|
||||
#include "previewcoordinator.h"
|
||||
#include "indexer.h"
|
||||
#include "tagmanager.h"
|
||||
namespace Ui
|
||||
{
|
||||
class MainWindow;
|
||||
|
@ -27,8 +28,9 @@ class MainWindow : public QMainWindow
|
|||
DatabaseFactory *dbFactory;
|
||||
SqliteDbService *dbService;
|
||||
Ui::MainWindow *ui;
|
||||
IPCPreviewClient ipcPreviewClient;
|
||||
QThread ipcClientThread;
|
||||
|
||||
PreviewCoordinator previewCoordinator;
|
||||
|
||||
QThread syncerThread;
|
||||
Indexer *indexer;
|
||||
IndexSyncer *indexSyncer;
|
||||
|
@ -36,18 +38,15 @@ class MainWindow : public QMainWindow
|
|||
QFileIconProvider iconProvider;
|
||||
QSqlDatabase db;
|
||||
QFutureWatcher<QVector<SearchResult>> searchWatcher;
|
||||
QVector<SearchResult> previewableSearchResults;
|
||||
LooqsQuery contentSearchQuery;
|
||||
QVector<QString> searchHistory;
|
||||
|
||||
TagManager *tagManager;
|
||||
|
||||
int currentSearchHistoryIndex = 0;
|
||||
QString currentSavedSearchText;
|
||||
QHash<QString, int> previewOrder; /* Quick lookup for the order a preview should have */
|
||||
QMap<int, QWidget *>
|
||||
previewWidgetOrderCache /* Saves those that arrived out of order to be inserted later at the correct pos */;
|
||||
bool previewDirty = false;
|
||||
int previewsPerPage = 20;
|
||||
unsigned int processedPdfPreviews = 0;
|
||||
unsigned int currentPreviewGeneration = 1;
|
||||
|
||||
void connectSignals();
|
||||
void makePreviews(int page);
|
||||
|
@ -56,20 +55,20 @@ class MainWindow : public QMainWindow
|
|||
void keyPressEvent(QKeyEvent *event) override;
|
||||
void handleSearchResults(const QVector<SearchResult> &results);
|
||||
void handleSearchError(QString error);
|
||||
void createSearchResutlMenu(QMenu &menu, const QFileInfo &fileInfo);
|
||||
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);
|
||||
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(QSharedPointer<PreviewResult> preview, unsigned int previewGeneration);
|
||||
void previewReceived();
|
||||
void comboScaleChanged(int i);
|
||||
void spinPreviewPageValueChanged(int val);
|
||||
void startIndexing();
|
||||
|
|
|
@ -18,16 +18,13 @@
|
|||
<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>1</number>
|
||||
<number>2</number>
|
||||
</property>
|
||||
<widget class="QWidget" name="resultsTab">
|
||||
<attribute name="title">
|
||||
|
@ -82,7 +79,7 @@
|
|||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>1244</width>
|
||||
<height>633</height>
|
||||
<height>641</height>
|
||||
</rect>
|
||||
</property>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout"/>
|
||||
|
@ -195,62 +192,6 @@
|
|||
</attribute>
|
||||
<layout class="QGridLayout" name="gridLayout">
|
||||
<item row="6" column="0">
|
||||
<widget class="QLineEdit" name="txtIgnorePatterns"/>
|
||||
</item>
|
||||
<item row="11" column="0">
|
||||
<widget class="QPushButton" name="btnStartIndexing">
|
||||
<property name="text">
|
||||
<string>Start indexing</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="0">
|
||||
<widget class="QGroupBox" name="groupBoxPaths">
|
||||
<property name="title">
|
||||
<string>Add paths to scan</string>
|
||||
</property>
|
||||
<layout class="QGridLayout" name="gridLayout_2">
|
||||
<item row="1" column="0">
|
||||
<widget class="QLineEdit" name="txtPathScanAdd"/>
|
||||
</item>
|
||||
<item row="3" column="0" colspan="5">
|
||||
<widget class="QListWidget" name="lstPaths"/>
|
||||
</item>
|
||||
<item row="1" column="3">
|
||||
<widget class="QToolButton" name="btnDeletePath">
|
||||
<property name="enabled">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Delete</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="1">
|
||||
<widget class="QPushButton" name="btnChoosePath">
|
||||
<property name="text">
|
||||
<string>...</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="2">
|
||||
<widget class="QPushButton" name="btnAddPath">
|
||||
<property name="text">
|
||||
<string>Add</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="5" column="0">
|
||||
<widget class="QLabel" name="label">
|
||||
<property name="text">
|
||||
<string>Ignore patterns, separated by ';'. Example: *.js;*Downloads*</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="9" column="0">
|
||||
<widget class="QGroupBox" name="groupBoxIndexProgress">
|
||||
<property name="contextMenuPolicy">
|
||||
<enum>Qt::PreventContextMenu</enum>
|
||||
|
@ -452,6 +393,108 @@
|
|||
</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">
|
||||
<string>Add paths to scan</string>
|
||||
</property>
|
||||
<layout class="QGridLayout" name="gridLayout_2">
|
||||
<item row="1" column="0">
|
||||
<widget class="QLineEdit" name="txtPathScanAdd"/>
|
||||
</item>
|
||||
<item row="3" column="0" colspan="5">
|
||||
<widget class="QListWidget" name="lstPaths"/>
|
||||
</item>
|
||||
<item row="1" column="3">
|
||||
<widget class="QToolButton" name="btnDeletePath">
|
||||
<property name="enabled">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Delete</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="1">
|
||||
<widget class="QPushButton" name="btnChoosePath">
|
||||
<property name="text">
|
||||
<string>...</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="2">
|
||||
<widget class="QPushButton" name="btnAddPath">
|
||||
<property name="text">
|
||||
<string>Add</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
<widget class="QWidget" name="settingsTab">
|
||||
|
@ -701,5 +744,22 @@
|
|||
</widget>
|
||||
<layoutdefault spacing="6" margin="11"/>
|
||||
<resources/>
|
||||
<connections/>
|
||||
<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>
|
||||
</ui>
|
||||
|
|
|
@ -0,0 +1,98 @@
|
|||
#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);
|
||||
connect(&ipcPreviewClient, &IPCPreviewClient::error, this, [&](QString err) { emit error(err); });
|
||||
|
||||
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);
|
||||
}
|
|
@ -0,0 +1,48 @@
|
|||
#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
|
|
@ -24,7 +24,7 @@ QSharedPointer<PreviewResult> PreviewGeneratorOdt::generate(RenderConfig config,
|
|||
throw LooqsGeneralException("Error while reading content.xml of " + documentPath);
|
||||
}
|
||||
TagStripperProcessor tsp;
|
||||
QString content = tsp.process(entireContent).first().content;
|
||||
QString content = tsp.process(entireContent).pages.constFirst().content;
|
||||
|
||||
PreviewGeneratorPlainText plainTextGenerator;
|
||||
result->setText(plainTextGenerator.generatePreviewText(content, config, info.fileName()));
|
||||
|
|
|
@ -13,18 +13,21 @@ Poppler::Document *PreviewGeneratorPdf::document(QString path)
|
|||
return documentcache.value(path);
|
||||
}
|
||||
locker.unlock();
|
||||
Poppler::Document *result = Poppler::Document::load(path);
|
||||
if(result == nullptr)
|
||||
auto result = Poppler::Document::load(path);
|
||||
if(!result)
|
||||
{
|
||||
qDebug() << "Failed to load document: " << path;
|
||||
// TODO: some kind of user feedback would be nice
|
||||
return nullptr;
|
||||
}
|
||||
result->setRenderHint(Poppler::Document::TextAntialiasing);
|
||||
|
||||
result->setRenderHint(Poppler::Document::TextHinting);
|
||||
result->setRenderHint(Poppler::Document::TextSlightHinting);
|
||||
auto ptr = result.release();
|
||||
locker.relock();
|
||||
documentcache.insert(path, result);
|
||||
documentcache.insert(path, ptr);
|
||||
locker.unlock();
|
||||
return result;
|
||||
return ptr;
|
||||
}
|
||||
|
||||
QSharedPointer<PreviewResult> PreviewGeneratorPdf::generate(RenderConfig config, QString documentPath,
|
||||
|
@ -34,10 +37,12 @@ QSharedPointer<PreviewResult> PreviewGeneratorPdf::generate(RenderConfig config,
|
|||
Poppler::Document *doc = document(documentPath);
|
||||
if(doc == nullptr)
|
||||
{
|
||||
qDebug() << "Failed to obtain document for: " << documentPath;
|
||||
return QSharedPointer<PreviewResult>(result);
|
||||
}
|
||||
if(doc->isLocked())
|
||||
{
|
||||
qDebug() << "Failed to open document as its locked: " << documentPath;
|
||||
return QSharedPointer<PreviewResult>(result);
|
||||
}
|
||||
int p = (int)page - 1;
|
||||
|
@ -45,7 +50,12 @@ QSharedPointer<PreviewResult> PreviewGeneratorPdf::generate(RenderConfig config,
|
|||
{
|
||||
p = 0;
|
||||
}
|
||||
Poppler::Page *pdfPage = doc->page(p);
|
||||
auto pdfPage = doc->page(p);
|
||||
if(!pdfPage)
|
||||
{
|
||||
qDebug() << "Failed to open page " << p << " for document" << documentPath;
|
||||
return QSharedPointer<PreviewResult>(result);
|
||||
}
|
||||
QImage img = pdfPage->renderToImage(config.scaleX, config.scaleY);
|
||||
for(QString &word : config.wordsToHighlight)
|
||||
{
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#ifndef PREVIEWGENERATORPDF_H
|
||||
#define PREVIEWGENERATORPDF_H
|
||||
#include <poppler-qt5.h>
|
||||
#include <poppler-qt6.h>
|
||||
#include "previewgenerator.h"
|
||||
#include "previewresultpdf.h"
|
||||
|
||||
|
|
|
@ -195,7 +195,7 @@ QString PreviewGeneratorPlainText::generateLineBasedPreviewText(QTextStream &in,
|
|||
int totalWordsA = 0;
|
||||
int differentWordsB = 0;
|
||||
int totalWordsB = 0;
|
||||
for(int count : a.wordCountMap.values())
|
||||
for(int count : qAsConst(a.wordCountMap))
|
||||
{
|
||||
if(count > 0)
|
||||
{
|
||||
|
@ -203,7 +203,7 @@ QString PreviewGeneratorPlainText::generateLineBasedPreviewText(QTextStream &in,
|
|||
}
|
||||
totalWordsA += count;
|
||||
}
|
||||
for(int count : b.wordCountMap.values())
|
||||
for(int count : qAsConst(b.wordCountMap))
|
||||
{
|
||||
if(count > 0)
|
||||
{
|
||||
|
@ -246,17 +246,21 @@ QString PreviewGeneratorPlainText::generateLineBasedPreviewText(QTextStream &in,
|
|||
totalWordCountMap[it->first] = totalWordCountMap.value(it->first, 0) + it->second;
|
||||
}
|
||||
}
|
||||
if(isTruncated)
|
||||
if(!resultText.isEmpty())
|
||||
{
|
||||
header += "(truncated) ";
|
||||
}
|
||||
for(QString &word : config.wordsToHighlight)
|
||||
{
|
||||
header += word + ": " + QString::number(totalWordCountMap[word]) + " ";
|
||||
}
|
||||
header += "<hr>";
|
||||
if(isTruncated)
|
||||
{
|
||||
header += "(truncated) ";
|
||||
}
|
||||
for(QString &word : config.wordsToHighlight)
|
||||
{
|
||||
header += word + ": " + QString::number(totalWordCountMap[word]) + " ";
|
||||
}
|
||||
header += "<hr>";
|
||||
|
||||
return header + resultText;
|
||||
resultText = header + resultText;
|
||||
}
|
||||
return resultText;
|
||||
}
|
||||
|
||||
QSharedPointer<PreviewResult> PreviewGeneratorPlainText::generate(RenderConfig config, QString documentPath,
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
#include <QThread>
|
||||
#include <QSqlQuery>
|
||||
#include "databasefactory.h"
|
||||
#include "logger.h"
|
||||
#include "looqsgeneralexception.h"
|
||||
|
@ -31,11 +32,23 @@ QSqlDatabase DatabaseFactory::forCurrentThread()
|
|||
QSqlDatabase db =
|
||||
QSqlDatabase::addDatabase("QSQLITE", "LOOQS" + QString::number((quint64)QThread::currentThread(), 16));
|
||||
db.setDatabaseName(this->connectionString);
|
||||
db.setConnectOptions("QSQLITE_BUSY_TIMEOUT=30000");
|
||||
if(!db.open())
|
||||
{
|
||||
Logger::error() << "Failed to open the database: " << this->connectionString << Qt::endl;
|
||||
throw LooqsGeneralException("Failed to create open new connection");
|
||||
}
|
||||
QSqlQuery q(db);
|
||||
if(!q.exec("PRAGMA journal_mode=WAL;"))
|
||||
{
|
||||
Logger::error() << "Failed to set WAL mode: " << this->connectionString << Qt::endl;
|
||||
throw LooqsGeneralException("Failed to set WAL mode on sqlite database");
|
||||
}
|
||||
if(!q.exec("PRAGMA wal_autocheckpoint=250;"))
|
||||
{
|
||||
Logger::error() << "Failed to set WAL autocheckpoint: " << this->connectionString << Qt::endl;
|
||||
throw LooqsGeneralException("Failed to set WAL autocheckpoint on sqlite database");
|
||||
}
|
||||
dbStore.setLocalData(db);
|
||||
return db;
|
||||
}
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#include <QFile>
|
||||
#include <QDataStream>
|
||||
#include <QTextCodec>
|
||||
#include <QStringDecoder>
|
||||
#include <QDebug>
|
||||
#include "defaulttextprocessor.h"
|
||||
|
||||
|
@ -13,10 +13,10 @@ QString DefaultTextProcessor::processText(const QByteArray &data) const
|
|||
QString encoding = encodingDetector.detectEncoding(data);
|
||||
if(!encoding.isEmpty())
|
||||
{
|
||||
QTextCodec *codec = QTextCodec::codecForName(encoding.toUtf8());
|
||||
if(codec != nullptr)
|
||||
QStringDecoder decoder = QStringDecoder(encoding.toStdString().c_str());
|
||||
if(decoder.isValid())
|
||||
{
|
||||
return codec->toUnicode(data);
|
||||
return decoder(data);
|
||||
}
|
||||
qWarning() << "No codec found for " << encoding;
|
||||
return QString(data);
|
||||
|
@ -24,7 +24,9 @@ QString DefaultTextProcessor::processText(const QByteArray &data) const
|
|||
return {};
|
||||
}
|
||||
|
||||
QVector<PageData> DefaultTextProcessor::process(const QByteArray &data) const
|
||||
DocumentProcessResult DefaultTextProcessor::process(const QByteArray &data) const
|
||||
{
|
||||
return {{0, processText(data)}};
|
||||
DocumentProcessResult result;
|
||||
result.pages.append({0, processText(data)});
|
||||
return result;
|
||||
}
|
||||
|
|
|
@ -11,7 +11,7 @@ class DefaultTextProcessor : public Processor
|
|||
public:
|
||||
DefaultTextProcessor();
|
||||
QString processText(const QByteArray &data) const;
|
||||
QVector<PageData> process(const QByteArray &data) const override;
|
||||
DocumentProcessResult process(const QByteArray &data) const override;
|
||||
};
|
||||
|
||||
#endif // DEFAULTTEXTPROCESSOR_H
|
||||
|
|
|
@ -0,0 +1,31 @@
|
|||
#include "documentoutlineentry.h"
|
||||
|
||||
DocumentOutlineEntry::DocumentOutlineEntry()
|
||||
{
|
||||
}
|
||||
|
||||
QDataStream &operator<<(QDataStream &out, const DocumentOutlineEntry &pd)
|
||||
{
|
||||
out << pd.text << pd.type << pd.destinationPage;
|
||||
out << pd.children.size();
|
||||
for(const DocumentOutlineEntry &entry : pd.children)
|
||||
{
|
||||
out << entry;
|
||||
}
|
||||
return out;
|
||||
}
|
||||
|
||||
QDataStream &operator>>(QDataStream &in, DocumentOutlineEntry &pd)
|
||||
{
|
||||
in >> pd.text >> pd.type >> pd.destinationPage;
|
||||
|
||||
qsizetype numChildren;
|
||||
in >> numChildren;
|
||||
for(int i = 0; i < numChildren; i++)
|
||||
{
|
||||
DocumentOutlineEntry entry;
|
||||
in >> entry;
|
||||
pd.children.append(entry);
|
||||
}
|
||||
return in;
|
||||
}
|
|
@ -0,0 +1,30 @@
|
|||
#ifndef DOCUMENTOUTLINEENTRY_H
|
||||
#define DOCUMENTOUTLINEENTRY_H
|
||||
#include <QMetaType>
|
||||
#include <QDataStream>
|
||||
#include <QString>
|
||||
#include <QVector>
|
||||
|
||||
enum OutlineDestinationType
|
||||
{
|
||||
OUTLINE_DESTINATION_TYPE_NONE,
|
||||
OUTLINE_DESTINATION_TYPE_PAGE
|
||||
/* In the future, links, or #anchors are possible */
|
||||
};
|
||||
|
||||
class DocumentOutlineEntry
|
||||
{
|
||||
public:
|
||||
DocumentOutlineEntry();
|
||||
QVector<DocumentOutlineEntry> children;
|
||||
OutlineDestinationType type;
|
||||
QString text;
|
||||
unsigned int destinationPage;
|
||||
};
|
||||
|
||||
Q_DECLARE_METATYPE(DocumentOutlineEntry);
|
||||
|
||||
QDataStream &operator<<(QDataStream &out, const DocumentOutlineEntry &pd);
|
||||
QDataStream &operator>>(QDataStream &in, DocumentOutlineEntry &pd);
|
||||
|
||||
#endif // DOCUMENTOUTLINEENTRY_H
|
|
@ -0,0 +1,39 @@
|
|||
#include "documentprocessresult.h"
|
||||
#include <QDebug>
|
||||
QDataStream &operator<<(QDataStream &out, const DocumentProcessResult &pd)
|
||||
{
|
||||
out << pd.pages.size();
|
||||
out << pd.outlines.size();
|
||||
for(const PageData &pd : pd.pages)
|
||||
{
|
||||
out << pd;
|
||||
}
|
||||
for(const DocumentOutlineEntry &outline : pd.outlines)
|
||||
{
|
||||
out << outline;
|
||||
}
|
||||
return out;
|
||||
}
|
||||
|
||||
QDataStream &operator>>(QDataStream &in, DocumentProcessResult &pd)
|
||||
{
|
||||
qsizetype numPages, numOutlines;
|
||||
in >> numPages;
|
||||
in >> numOutlines;
|
||||
|
||||
for(int i = 0; i < numPages; i++)
|
||||
{
|
||||
PageData data;
|
||||
in >> data;
|
||||
pd.pages.append(data);
|
||||
}
|
||||
|
||||
for(int i = 0; i < numOutlines; i++)
|
||||
{
|
||||
DocumentOutlineEntry outline;
|
||||
in >> outline;
|
||||
pd.outlines.append(outline);
|
||||
}
|
||||
|
||||
return in;
|
||||
}
|
|
@ -0,0 +1,17 @@
|
|||
#ifndef DOCUMENTPROCESSRESULT_H
|
||||
#define DOCUMENTPROCESSRESULT_H
|
||||
#include <pagedata.h>
|
||||
#include <documentoutlineentry.h>
|
||||
|
||||
class DocumentProcessResult
|
||||
{
|
||||
public:
|
||||
QVector<PageData> pages;
|
||||
QVector<DocumentOutlineEntry> outlines;
|
||||
};
|
||||
Q_DECLARE_METATYPE(DocumentProcessResult);
|
||||
|
||||
QDataStream &operator<<(QDataStream &out, const DocumentProcessResult &pd);
|
||||
QDataStream &operator>>(QDataStream &in, DocumentProcessResult &pd);
|
||||
|
||||
#endif // DOCUMENTPROCESSRESULT_H
|
|
@ -25,10 +25,22 @@ SaveFileResult FileSaver::addFile(QString path)
|
|||
QString absPath = info.absoluteFilePath();
|
||||
|
||||
auto mtime = info.lastModified().toSecsSinceEpoch();
|
||||
if(this->dbService->fileExistsInDatabase(absPath, mtime))
|
||||
|
||||
bool exists = false;
|
||||
if(this->fileSaverOptions.fillExistingContentless)
|
||||
{
|
||||
exists = this->dbService->fileExistsInDatabase(absPath, mtime, 'c');
|
||||
}
|
||||
else
|
||||
{
|
||||
exists = this->dbService->fileExistsInDatabase(absPath, mtime);
|
||||
}
|
||||
|
||||
if(exists)
|
||||
{
|
||||
return SKIPPED;
|
||||
}
|
||||
|
||||
return saveFile(info);
|
||||
}
|
||||
|
||||
|
@ -38,18 +50,17 @@ SaveFileResult FileSaver::updateFile(QString path)
|
|||
return saveFile(info);
|
||||
}
|
||||
|
||||
int FileSaver::addFiles(const QVector<QString> paths, bool keepGoing, bool verbose)
|
||||
int FileSaver::addFiles(const QVector<QString> paths)
|
||||
{
|
||||
return processFiles(paths, std::bind(&FileSaver::addFile, this, std::placeholders::_1), keepGoing, verbose);
|
||||
return processFiles(paths, std::bind(&FileSaver::addFile, this, std::placeholders::_1));
|
||||
}
|
||||
|
||||
int FileSaver::updateFiles(const QVector<QString> paths, bool keepGoing, bool verbose)
|
||||
int FileSaver::updateFiles(const QVector<QString> paths)
|
||||
{
|
||||
return processFiles(paths, std::bind(&FileSaver::updateFile, this, std::placeholders::_1), keepGoing, verbose);
|
||||
return processFiles(paths, std::bind(&FileSaver::updateFile, this, std::placeholders::_1));
|
||||
}
|
||||
|
||||
int FileSaver::processFiles(const QVector<QString> paths, std::function<SaveFileResult(QString path)> saverFunc,
|
||||
bool keepGoing, bool verbose)
|
||||
int FileSaver::processFiles(const QVector<QString> paths, std::function<SaveFileResult(QString path)> saverFunc)
|
||||
{
|
||||
std::atomic<bool> terminate{false};
|
||||
std::atomic<int> processedCount{0};
|
||||
|
@ -60,7 +71,7 @@ int FileSaver::processFiles(const QVector<QString> paths, std::function<SaveFile
|
|||
{
|
||||
return;
|
||||
}
|
||||
if(verbose)
|
||||
if(this->fileSaverOptions.verbose)
|
||||
{
|
||||
Logger::info() << "Processing " << path << Qt::endl;
|
||||
}
|
||||
|
@ -68,7 +79,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(!keepGoing)
|
||||
if(!this->fileSaverOptions.keepGoing)
|
||||
{
|
||||
terminate = true;
|
||||
}
|
||||
|
@ -76,7 +87,7 @@ int FileSaver::processFiles(const QVector<QString> paths, std::function<SaveFile
|
|||
else
|
||||
{
|
||||
++processedCount;
|
||||
if(verbose)
|
||||
if(this->fileSaverOptions.verbose)
|
||||
{
|
||||
if(result == SKIPPED)
|
||||
{
|
||||
|
@ -99,7 +110,7 @@ int FileSaver::processFiles(const QVector<QString> paths, std::function<SaveFile
|
|||
|
||||
SaveFileResult FileSaver::saveFile(const QFileInfo &fileInfo)
|
||||
{
|
||||
QVector<PageData> pageData;
|
||||
DocumentProcessResult processResult;
|
||||
QString canonicalPath = fileInfo.canonicalFilePath();
|
||||
|
||||
int processorReturnCode = -1;
|
||||
|
@ -120,11 +131,26 @@ SaveFileResult FileSaver::saveFile(const QFileInfo &fileInfo)
|
|||
{
|
||||
if(canonicalPath.startsWith(excludedPath))
|
||||
{
|
||||
if(this->fileSaverOptions.verbose)
|
||||
{
|
||||
Logger::info() << "Skipped due to excluded path";
|
||||
}
|
||||
return SKIPPED;
|
||||
}
|
||||
}
|
||||
|
||||
if(fileInfo.size() > 0)
|
||||
bool mustFillContent = this->fileSaverOptions.fillExistingContentless;
|
||||
if(!mustFillContent)
|
||||
{
|
||||
mustFillContent = !this->fileSaverOptions.metadataOnly;
|
||||
if(mustFillContent)
|
||||
{
|
||||
auto filetype = this->dbService->queryFileType(fileInfo.absolutePath());
|
||||
mustFillContent = !filetype.has_value() || filetype.value() == 'c';
|
||||
}
|
||||
}
|
||||
|
||||
if(fileInfo.size() > 0 && mustFillContent)
|
||||
{
|
||||
QProcess process;
|
||||
QStringList args;
|
||||
|
@ -143,11 +169,10 @@ SaveFileResult FileSaver::saveFile(const QFileInfo &fileInfo)
|
|||
* finishes.
|
||||
*/
|
||||
QDataStream in(process.readAllStandardOutput());
|
||||
while(!in.atEnd())
|
||||
|
||||
if(!in.atEnd())
|
||||
{
|
||||
PageData pd;
|
||||
in >> pd;
|
||||
pageData.append(pd);
|
||||
in >> processResult;
|
||||
}
|
||||
processorReturnCode = process.exitCode();
|
||||
if(processorReturnCode != OK && processorReturnCode != OK_WASEMPTY)
|
||||
|
@ -159,7 +184,7 @@ SaveFileResult FileSaver::saveFile(const QFileInfo &fileInfo)
|
|||
}
|
||||
}
|
||||
}
|
||||
SaveFileResult result = this->dbService->saveFile(fileInfo, pageData);
|
||||
SaveFileResult result = this->dbService->saveFile(fileInfo, processResult, this->fileSaverOptions.metadataOnly);
|
||||
if(result == OK && processorReturnCode == OK_WASEMPTY)
|
||||
{
|
||||
return OK_WASEMPTY;
|
||||
|
|
|
@ -2,6 +2,7 @@
|
|||
#define FILESAVER_H
|
||||
#include <QSqlDatabase>
|
||||
#include <QFileInfo>
|
||||
#include "filesaveroptions.h"
|
||||
#include "pagedata.h"
|
||||
#include "filedata.h"
|
||||
#include "sqlitedbservice.h"
|
||||
|
@ -11,16 +12,21 @@ 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,
|
||||
bool keepGoing, bool verbose);
|
||||
int addFiles(const QVector<QString> paths, bool keepGoing, bool verbose);
|
||||
int updateFiles(const QVector<QString> paths, bool keepGoing, bool verbose);
|
||||
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;
|
||||
}
|
||||
};
|
||||
|
||||
#endif // FILESAVER_H
|
||||
|
|
|
@ -0,0 +1,14 @@
|
|||
#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,6 +12,7 @@ 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)
|
||||
{
|
||||
|
@ -20,11 +21,18 @@ 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();
|
||||
Logger::error() << e.what() << Qt::endl;
|
||||
sfr = PROCESSFAIL; // well...
|
||||
}
|
||||
|
||||
emit result({path, sfr});
|
||||
if(stopToken->load(std::memory_order_relaxed)) // TODO: relaxed should suffice here, but recheck
|
||||
{
|
||||
|
@ -34,3 +42,8 @@ void FileScanWorker::run()
|
|||
}
|
||||
emit finished();
|
||||
}
|
||||
|
||||
void FileScanWorker::setFileSaverOptions(FileSaverOptions options)
|
||||
{
|
||||
this->fileSaverOptions = options;
|
||||
}
|
||||
|
|
|
@ -15,12 +15,14 @@ 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();
|
||||
|
|
|
@ -30,7 +30,7 @@ void Indexer::beginIndexing()
|
|||
pattern += "/";
|
||||
}
|
||||
pattern += "*";
|
||||
ignoreList.append(excludedPath);
|
||||
ignoreList.append(pattern);
|
||||
}
|
||||
ignoreList.append(this->ignorePattern);
|
||||
wildcardMatcher.setPatterns(ignoreList);
|
||||
|
@ -73,16 +73,6 @@ void Indexer::setTargetPaths(QVector<QString> pathsToScan)
|
|||
this->pathsToScan = pathsToScan;
|
||||
}
|
||||
|
||||
void Indexer::setVerbose(bool verbose)
|
||||
{
|
||||
this->verbose = verbose;
|
||||
}
|
||||
|
||||
void Indexer::setKeepGoing(bool keepGoing)
|
||||
{
|
||||
this->keepGoing = keepGoing;
|
||||
}
|
||||
|
||||
void Indexer::requestCancellation()
|
||||
{
|
||||
this->dirScanner->cancel();
|
||||
|
@ -108,6 +98,7 @@ 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);
|
||||
}
|
||||
|
@ -120,24 +111,6 @@ void Indexer::dirScanProgress(int current, int total)
|
|||
|
||||
void Indexer::processFileScanResult(FileScanResult result)
|
||||
{
|
||||
if(isErrorSaveFileResult(result.second))
|
||||
{
|
||||
this->currentIndexResult.results.append(result);
|
||||
if(!keepGoing)
|
||||
{
|
||||
this->requestCancellation();
|
||||
emit finished();
|
||||
return;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if(verbose)
|
||||
{
|
||||
this->currentIndexResult.results.append(result);
|
||||
}
|
||||
}
|
||||
|
||||
/* TODO: OK_WASEMPTY might need a special list */
|
||||
if(result.second == OK || result.second == OK_WASEMPTY)
|
||||
{
|
||||
|
@ -152,6 +125,24 @@ 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)
|
||||
{
|
||||
|
@ -172,6 +163,17 @@ void Indexer::processFinishedWorker()
|
|||
--this->runningWorkers;
|
||||
if(!isRunning())
|
||||
{
|
||||
this->db->runWalCheckpoint();
|
||||
emit finished();
|
||||
}
|
||||
}
|
||||
|
||||
void Indexer::setFileSaverOptions(FileSaverOptions options)
|
||||
{
|
||||
this->fileSaverOptions = options;
|
||||
}
|
||||
|
||||
void Indexer::setProgressReportThreshold(int threshold)
|
||||
{
|
||||
this->progressReportThreshold = threshold;
|
||||
}
|
||||
|
|
|
@ -52,8 +52,7 @@ class Indexer : public QObject
|
|||
{
|
||||
Q_OBJECT
|
||||
protected:
|
||||
bool verbose = false;
|
||||
bool keepGoing = true;
|
||||
FileSaverOptions fileSaverOptions;
|
||||
SqliteDbService *db;
|
||||
|
||||
int progressReportThreshold = 50;
|
||||
|
@ -80,8 +79,10 @@ class Indexer : public QObject
|
|||
void beginIndexing();
|
||||
void setIgnorePattern(QStringList ignorePattern);
|
||||
void setTargetPaths(QVector<QString> pathsToScan);
|
||||
void setVerbose(bool verbose);
|
||||
void setKeepGoing(bool keepGoing);
|
||||
|
||||
void setFileSaverOptions(FileSaverOptions options);
|
||||
|
||||
void setProgressReportThreshold(int threshold);
|
||||
|
||||
void requestCancellation();
|
||||
|
||||
|
|
|
@ -7,21 +7,16 @@ 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;
|
||||
|
@ -35,7 +30,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;
|
||||
|
@ -87,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->keepGoing)
|
||||
if(!this->fileSaverOptions.keepGoing)
|
||||
{
|
||||
emit finished(totalUpdatesFilesCount, totalDeletedFilesCount, totalErroredFilesCount);
|
||||
return;
|
||||
|
@ -104,16 +99,18 @@ void IndexSyncer::sync()
|
|||
}
|
||||
}
|
||||
|
||||
unsigned int updatedFilesCount = saver.updateFiles(filePathsToUpdate, keepGoing, verbose);
|
||||
FileSaver saver(*this->dbService);
|
||||
saver.setFileSaverOptions(this->fileSaverOptions);
|
||||
unsigned int updatedFilesCount = saver.updateFiles(filePathsToUpdate);
|
||||
unsigned int shouldHaveUpdatedCount = static_cast<unsigned int>(filePathsToUpdate.size());
|
||||
if(updatedFilesCount != shouldHaveUpdatedCount)
|
||||
{
|
||||
|
||||
totalErroredFilesCount += (shouldHaveUpdatedCount - updatedFilesCount);
|
||||
if(!keepGoing)
|
||||
if(!this->fileSaverOptions.keepGoing)
|
||||
{
|
||||
QString errorMsg = QString("Failed to update all files selected for updating in this batch. Updated") +
|
||||
updatedFilesCount + "out of" + shouldHaveUpdatedCount + "selected for updating";
|
||||
QString::number(updatedFilesCount) + "out of" + QString::number(shouldHaveUpdatedCount) + "selected for updating";
|
||||
emit error(errorMsg);
|
||||
emit finished(totalUpdatesFilesCount, totalDeletedFilesCount, totalErroredFilesCount);
|
||||
}
|
||||
|
|
|
@ -1,16 +1,15 @@
|
|||
#ifndef INDEXSYNCER_H
|
||||
#define INDEXSYNCER_H
|
||||
#include "sqlitedbservice.h"
|
||||
|
||||
#include "filesaveroptions.h"
|
||||
class IndexSyncer : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
private:
|
||||
SqliteDbService *dbService = nullptr;
|
||||
bool keepGoing = true;
|
||||
FileSaverOptions fileSaverOptions;
|
||||
bool removeDeletedFromIndex = true;
|
||||
bool dryRun = false;
|
||||
bool verbose = false;
|
||||
QString pattern;
|
||||
|
||||
std::atomic<bool> stopToken{false};
|
||||
|
@ -18,12 +17,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);
|
||||
|
||||
|
|
|
@ -7,6 +7,7 @@
|
|||
#include <optional>
|
||||
#include <algorithm>
|
||||
#include "looqsquery.h"
|
||||
#include "looqsgeneralexception.h"
|
||||
|
||||
const QVector<Token> &LooqsQuery::getTokens() const
|
||||
{
|
||||
|
@ -28,6 +29,11 @@ bool LooqsQuery::hasContentSearch() const
|
|||
return (this->getTokensMask() & FILTER_CONTENT) == FILTER_CONTENT;
|
||||
}
|
||||
|
||||
bool LooqsQuery::hasOutlineSearch() const
|
||||
{
|
||||
return (this->getTokensMask() & FILTER_OUTLINE_CONTAINS) == FILTER_OUTLINE_CONTAINS;
|
||||
}
|
||||
|
||||
bool LooqsQuery::hasPathSearch() const
|
||||
{
|
||||
return (this->getTokensMask() & FILTER_PATH) == FILTER_PATH;
|
||||
|
@ -180,8 +186,9 @@ LooqsQuery LooqsQuery::build(QString expression, TokenType loneWordsTokenType, b
|
|||
|
||||
QStringList loneWords;
|
||||
LooqsQuery result;
|
||||
QRegularExpression rx("((?<filtername>(\\.|\\w)+):(?<args>\\((?<innerargs>[^\\)]+)\\)|([^\\s])+)|(?<boolean>AND|OR)"
|
||||
"|(?<negation>!)|(?<bracket>\\(|\\))|(?<loneword>[^\\s]+))");
|
||||
static QRegularExpression rx(
|
||||
"((?<filtername>(\\.|\\w)+):(?<args>\\((?<innerargs>[^\\)]+)\\)|([^\\s])+)|(?<boolean>AND|OR)"
|
||||
"|(?<negation>!)|(?<bracket>\\(|\\))|(?<loneword>[^\\s]+))");
|
||||
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); };
|
||||
|
@ -283,6 +290,14 @@ LooqsQuery LooqsQuery::build(QString expression, TokenType loneWordsTokenType, b
|
|||
{
|
||||
tokenType = FILTER_CONTENT_PAGE;
|
||||
}
|
||||
else if(filtername == "t" || filtername == "tag")
|
||||
{
|
||||
tokenType = FILTER_TAG_ASSIGNED;
|
||||
}
|
||||
else if(filtername == "toc" || filtername == "outline")
|
||||
{
|
||||
tokenType = FILTER_OUTLINE_CONTAINS;
|
||||
}
|
||||
// TODO: given this is not really a "filter", this feels slightly misplaced here
|
||||
else if(filtername == "sort")
|
||||
{
|
||||
|
|
|
@ -2,7 +2,6 @@
|
|||
#define LOOQSQUERY_H
|
||||
#include <QString>
|
||||
#include <QVector>
|
||||
#include "looqsgeneralexception.h"
|
||||
#include "token.h"
|
||||
/* Fields that can be queried or sorted */
|
||||
enum QueryField
|
||||
|
@ -46,7 +45,7 @@ class LooqsQuery
|
|||
void addToken(Token t);
|
||||
void updateTokensMask()
|
||||
{
|
||||
for(const Token &t : tokens)
|
||||
for(const Token &t : qAsConst(tokens))
|
||||
{
|
||||
this->tokensMask |= t.type;
|
||||
}
|
||||
|
@ -69,6 +68,7 @@ class LooqsQuery
|
|||
this->limit = limit;
|
||||
}
|
||||
bool hasContentSearch() const;
|
||||
bool hasOutlineSearch() const;
|
||||
bool hasPathSearch() const;
|
||||
|
||||
void addSortCondition(SortCondition sc);
|
||||
|
@ -92,14 +92,6 @@ class LooqsQuery
|
|||
this->sortConditions = sortConditions;
|
||||
updateTokensMask();
|
||||
}
|
||||
|
||||
LooqsQuery(const LooqsQuery &o)
|
||||
{
|
||||
this->tokens = o.tokens;
|
||||
this->sortConditions = o.sortConditions;
|
||||
this->tokensMask = o.tokensMask;
|
||||
this->limit = o.limit;
|
||||
}
|
||||
};
|
||||
|
||||
#endif // LOOQSQUERY_H
|
||||
|
|
|
@ -0,0 +1,6 @@
|
|||
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';
|
|
@ -0,0 +1,2 @@
|
|||
CREATE TABLE outline(id INTEGER PRIMARY KEY, fileid INTEGER REFERENCES file (id) ON DELETE CASCADE, text varchar(1024), page integer);
|
||||
CREATE INDEX outline_fileid ON outline (fileid);
|
|
@ -4,5 +4,7 @@
|
|||
<file>2.sql</file>
|
||||
<file>3.sql</file>
|
||||
<file>4.sql</file>
|
||||
<file>5.sql</file>
|
||||
<file>6.sql</file>
|
||||
</qresource>
|
||||
</RCC>
|
||||
|
|
|
@ -10,7 +10,7 @@ class NothingProcessor : public Processor
|
|||
NothingProcessor();
|
||||
|
||||
public:
|
||||
QVector<PageData> process(const QByteArray &data) const override
|
||||
DocumentProcessResult process(const QByteArray & /*data*/) const override
|
||||
{
|
||||
return {};
|
||||
}
|
||||
|
|
|
@ -3,12 +3,12 @@
|
|||
#include "odtprocessor.h"
|
||||
#include "tagstripperprocessor.h"
|
||||
|
||||
QVector<PageData> OdtProcessor::process(const QByteArray &data) const
|
||||
DocumentProcessResult OdtProcessor::process(const QByteArray & /*data*/) const
|
||||
{
|
||||
throw LooqsGeneralException("Not implemented yet");
|
||||
}
|
||||
|
||||
QVector<PageData> OdtProcessor::process(QString path) const
|
||||
DocumentProcessResult OdtProcessor::process(QString path) const
|
||||
{
|
||||
QuaZipFile zipFile(path);
|
||||
zipFile.setFileName("content.xml");
|
||||
|
|
|
@ -8,9 +8,9 @@ class OdtProcessor : public Processor
|
|||
{
|
||||
this->PREFERED_DATA_SOURCE = FILEPATH;
|
||||
}
|
||||
QVector<PageData> process(const QByteArray &data) const override;
|
||||
DocumentProcessResult process(const QByteArray &data) const override;
|
||||
|
||||
QVector<PageData> process(QString path) const override;
|
||||
DocumentProcessResult process(QString path) const override;
|
||||
};
|
||||
|
||||
#endif // ODTPROCESSOR_H
|
||||
|
|
|
@ -1,5 +1,3 @@
|
|||
#include "paralleldirscanner.h"
|
||||
|
||||
#include <QRunnable>
|
||||
#include <QMutex>
|
||||
#include <QDirIterator>
|
||||
|
@ -7,7 +5,7 @@
|
|||
#include <QThreadPool>
|
||||
#include <functional>
|
||||
#include "dirscanworker.h"
|
||||
#include "logger.h"
|
||||
#include "paralleldirscanner.h"
|
||||
|
||||
ParallelDirScanner::ParallelDirScanner()
|
||||
{
|
||||
|
|
|
@ -1,15 +1,35 @@
|
|||
#include <QScopedPointer>
|
||||
#include <poppler-qt5.h>
|
||||
#include "pdfprocessor.h"
|
||||
PdfProcessor::PdfProcessor()
|
||||
{
|
||||
}
|
||||
|
||||
QVector<PageData> PdfProcessor::process(const QByteArray &data) const
|
||||
QVector<DocumentOutlineEntry> PdfProcessor::createOutline(const QVector<Poppler::OutlineItem> &outlineItems) const
|
||||
{
|
||||
QVector<PageData> result;
|
||||
QScopedPointer<Poppler::Document> doc(Poppler::Document::loadFromData(data));
|
||||
if(doc.isNull())
|
||||
QVector<DocumentOutlineEntry> result;
|
||||
for(const Poppler::OutlineItem &outlineItem : outlineItems)
|
||||
{
|
||||
DocumentOutlineEntry documentOutlineEntry;
|
||||
documentOutlineEntry.text = outlineItem.name();
|
||||
documentOutlineEntry.type = OUTLINE_DESTINATION_TYPE_PAGE;
|
||||
if(!outlineItem.destination().isNull())
|
||||
{
|
||||
documentOutlineEntry.destinationPage = outlineItem.destination()->pageNumber();
|
||||
}
|
||||
if(outlineItem.hasChildren())
|
||||
{
|
||||
documentOutlineEntry.children = createOutline(outlineItem.children());
|
||||
}
|
||||
result.append(documentOutlineEntry);
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
DocumentProcessResult PdfProcessor::process(const QByteArray &data) const
|
||||
{
|
||||
DocumentProcessResult result;
|
||||
auto doc(Poppler::Document::loadFromData(data));
|
||||
if(!doc)
|
||||
{
|
||||
throw LooqsGeneralException("Failed to process pdf data");
|
||||
}
|
||||
|
@ -26,12 +46,13 @@ QVector<PageData> PdfProcessor::process(const QByteArray &data) const
|
|||
for(auto i = 0; i < pagecount; i++)
|
||||
{
|
||||
QString text = doc->page(i)->text(entirePage);
|
||||
result.append({static_cast<unsigned int>(i + 1), text});
|
||||
result.pages.append({static_cast<unsigned int>(i + 1), text});
|
||||
/*TODO: hack, so we can fts search several words over the whole document, not just pages.
|
||||
* this of course uses more space and should be solved differently.
|
||||
*/
|
||||
entire += text;
|
||||
}
|
||||
result.append({0, entire});
|
||||
result.pages.append({0, entire});
|
||||
result.outlines = createOutline(doc->outline());
|
||||
return result;
|
||||
}
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
#ifndef PDFPROCESSOR_H
|
||||
#define PDFPROCESSOR_H
|
||||
#include <poppler-qt6.h>
|
||||
#include "processor.h"
|
||||
class PdfProcessor : public Processor
|
||||
{
|
||||
|
@ -7,7 +8,8 @@ class PdfProcessor : public Processor
|
|||
PdfProcessor();
|
||||
|
||||
public:
|
||||
QVector<PageData> process(const QByteArray &data) const override;
|
||||
QVector<DocumentOutlineEntry> createOutline(const QVector<Poppler::OutlineItem> &outlineItems) const;
|
||||
DocumentProcessResult process(const QByteArray &data) const override;
|
||||
};
|
||||
|
||||
#endif // PDFPROCESSOR_H
|
||||
|
|
|
@ -2,8 +2,8 @@
|
|||
#define PROCESSOR_H
|
||||
#include <QVector>
|
||||
#include <QFile>
|
||||
#include "pagedata.h"
|
||||
#include "utils.h"
|
||||
#include "documentprocessresult.h"
|
||||
enum DataSource
|
||||
{
|
||||
FILEPATH,
|
||||
|
@ -18,8 +18,8 @@ class Processor
|
|||
* a single file */
|
||||
DataSource PREFERED_DATA_SOURCE = ARRAY;
|
||||
Processor();
|
||||
virtual QVector<PageData> process(const QByteArray &data) const = 0;
|
||||
virtual QVector<PageData> process(QString path) const
|
||||
virtual DocumentProcessResult process(const QByteArray &data) const = 0;
|
||||
virtual DocumentProcessResult process(QString path) const
|
||||
{
|
||||
return process(Utils::readFile(path));
|
||||
}
|
||||
|
|
|
@ -65,18 +65,12 @@ void SandboxedProcessor::enableSandbox(QString readablePath)
|
|||
exile_free_policy(policy);
|
||||
}
|
||||
|
||||
void SandboxedProcessor::printResults(const QVector<PageData> &pageData)
|
||||
void SandboxedProcessor::printResults(const DocumentProcessResult &result)
|
||||
{
|
||||
QFile fsstdout;
|
||||
fsstdout.open(stdout, QIODevice::WriteOnly);
|
||||
QDataStream stream(&fsstdout);
|
||||
|
||||
for(const PageData &data : pageData)
|
||||
{
|
||||
stream << data;
|
||||
// fsstdout.flush();
|
||||
}
|
||||
|
||||
stream << result;
|
||||
fsstdout.close();
|
||||
}
|
||||
|
||||
|
@ -102,7 +96,7 @@ SaveFileResult SandboxedProcessor::process()
|
|||
return OK;
|
||||
}
|
||||
|
||||
QVector<PageData> pageData;
|
||||
DocumentProcessResult processResult;
|
||||
QString absPath = fileInfo.absoluteFilePath();
|
||||
|
||||
try
|
||||
|
@ -111,13 +105,13 @@ SaveFileResult SandboxedProcessor::process()
|
|||
{
|
||||
/* Read access to FS needed... doh..*/
|
||||
enableSandbox(absPath);
|
||||
pageData = processor->process(absPath);
|
||||
processResult = processor->process(absPath);
|
||||
}
|
||||
else
|
||||
{
|
||||
QByteArray data = Utils::readFile(absPath);
|
||||
enableSandbox();
|
||||
pageData = processor->process(data);
|
||||
processResult = processor->process(data);
|
||||
}
|
||||
}
|
||||
catch(LooqsGeneralException &e)
|
||||
|
@ -126,6 +120,6 @@ SaveFileResult SandboxedProcessor::process()
|
|||
return PROCESSFAIL;
|
||||
}
|
||||
|
||||
printResults(pageData);
|
||||
return pageData.isEmpty() ? OK_WASEMPTY : OK;
|
||||
printResults(processResult);
|
||||
return processResult.pages.isEmpty() ? OK_WASEMPTY : OK;
|
||||
}
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
#define SANDBOXEDPROCESSOR_H
|
||||
#include <QString>
|
||||
#include <QMimeDatabase>
|
||||
#include "pagedata.h"
|
||||
#include "documentprocessresult.h"
|
||||
#include "savefileresult.h"
|
||||
|
||||
class SandboxedProcessor
|
||||
|
@ -12,7 +12,7 @@ class SandboxedProcessor
|
|||
QMimeDatabase mimeDatabase;
|
||||
|
||||
void enableSandbox(QString readablePath = "");
|
||||
void printResults(const QVector<PageData> &pageData);
|
||||
void printResults(const DocumentProcessResult &pageData);
|
||||
|
||||
public:
|
||||
SandboxedProcessor(QString filepath)
|
||||
|
|
|
@ -14,11 +14,11 @@ CONFIG += staticlib
|
|||
CONFIG += c++17
|
||||
|
||||
INCLUDEPATH += $$PWD/../sandbox/exile.h/
|
||||
INCLUDEPATH += /usr/include/poppler/qt5/ /usr/include/quazip5
|
||||
INCLUDEPATH += /usr/include/poppler/qt6/ /usr/include/quazip5
|
||||
|
||||
# Dirty, we only need the includes here but well this magic works, so...
|
||||
packagesExist(quazip1-qt5) {
|
||||
PKGCONFIG += quazip1-qt5
|
||||
packagesExist(quazip1-qt6) {
|
||||
PKGCONFIG += quazip1-qt6
|
||||
CONFIG += link_pkgconfig
|
||||
}
|
||||
|
||||
|
@ -42,6 +42,8 @@ SOURCES += sqlitesearch.cpp \
|
|||
dbmigrator.cpp \
|
||||
defaulttextprocessor.cpp \
|
||||
dirscanworker.cpp \
|
||||
documentoutlineentry.cpp \
|
||||
documentprocessresult.cpp \
|
||||
encodingdetector.cpp \
|
||||
filesaver.cpp \
|
||||
filescanworker.cpp \
|
||||
|
@ -60,6 +62,7 @@ SOURCES += sqlitesearch.cpp \
|
|||
processor.cpp \
|
||||
sandboxedprocessor.cpp \
|
||||
sqlitedbservice.cpp \
|
||||
tagmanager.cpp \
|
||||
tagstripperprocessor.cpp \
|
||||
utils.cpp \
|
||||
../submodules/exile.h/exile.c \
|
||||
|
@ -71,9 +74,12 @@ HEADERS += sqlitesearch.h \
|
|||
dbmigrator.h \
|
||||
defaulttextprocessor.h \
|
||||
dirscanworker.h \
|
||||
documentoutlineentry.h \
|
||||
documentprocessresult.h \
|
||||
encodingdetector.h \
|
||||
filedata.h \
|
||||
filesaver.h \
|
||||
filesaveroptions.h \
|
||||
filescanworker.h \
|
||||
indexer.h \
|
||||
indexsyncer.h \
|
||||
|
@ -92,6 +98,7 @@ HEADERS += sqlitesearch.h \
|
|||
savefileresult.h \
|
||||
searchresult.h \
|
||||
sqlitedbservice.h \
|
||||
tagmanager.h \
|
||||
tagstripperprocessor.h \
|
||||
token.h \
|
||||
common.h \
|
||||
|
|
|
@ -2,25 +2,11 @@
|
|||
#include <QFileInfo>
|
||||
#include <QDateTime>
|
||||
#include <QSqlError>
|
||||
#include <QRegularExpression>
|
||||
#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)
|
||||
{
|
||||
|
@ -29,20 +15,29 @@ QVector<SearchResult> SqliteDbService::search(const LooqsQuery &query)
|
|||
return searcher.search(query);
|
||||
}
|
||||
|
||||
bool SqliteDbService::fileExistsInDatabase(QString path)
|
||||
std::optional<QChar> SqliteDbService::queryFileType(QString absPath)
|
||||
{
|
||||
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());
|
||||
}
|
||||
auto query = exec("SELECT filetype FROM file WHERE path = ?", {absPath});
|
||||
if(!query.next())
|
||||
{
|
||||
return false;
|
||||
return {};
|
||||
}
|
||||
return query.value(0).toBool();
|
||||
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});
|
||||
}
|
||||
|
||||
SqliteDbService::SqliteDbService(DatabaseFactory &dbFactory)
|
||||
|
@ -87,16 +82,14 @@ unsigned int SqliteDbService::getFiles(QVector<FileData> &results, QString wildC
|
|||
throw LooqsGeneralException("Error while trying to retrieve files from database: " + query.lastError().text());
|
||||
}
|
||||
|
||||
// TODO: port this to QRegularExpression once >5.12 gets more widespread because of this bug
|
||||
// https://bugreports.qt.io/browse/QTBUG-72539?focusedCommentId=439053&page=com.atlassian.jira.plugin.system.issuetabpanels%3Acomment-tabpanel
|
||||
bool usePattern = !wildCardPattern.isEmpty();
|
||||
QRegExp regexPattern(wildCardPattern);
|
||||
regexPattern.setPatternSyntax(QRegExp::PatternSyntax::WildcardUnix);
|
||||
QString regex = QRegularExpression::wildcardToRegularExpression(wildCardPattern, QRegularExpression::UnanchoredWildcardConversion);
|
||||
QRegularExpression regexPattern(regex);
|
||||
|
||||
while(query.next())
|
||||
{
|
||||
QString absPath = query.value(0).toString();
|
||||
if(!usePattern || regexPattern.exactMatch(absPath))
|
||||
if(!usePattern || regexPattern.match(absPath).hasMatch())
|
||||
{
|
||||
FileData current;
|
||||
current.absPath = absPath;
|
||||
|
@ -110,6 +103,121 @@ 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(!this->beginTransaction(db))
|
||||
{
|
||||
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;
|
||||
}
|
||||
|
||||
deletionQuery.finish();
|
||||
|
||||
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;
|
||||
}
|
||||
tagQuery.finish();
|
||||
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;
|
||||
}
|
||||
fileTagQuery.finish();
|
||||
}
|
||||
if(!this->commitTransaction(db))
|
||||
{
|
||||
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;
|
||||
|
@ -135,6 +243,7 @@ bool SqliteDbService::insertToFTS(bool useTrigrams, QSqlDatabase &db, int fileid
|
|||
Logger::error() << "Failed fts insertion " << ftsQuery.lastError() << Qt::endl;
|
||||
return false;
|
||||
}
|
||||
ftsQuery.finish();
|
||||
QSqlQuery contentQuery(db);
|
||||
contentQuery.prepare(contentInsertStatement);
|
||||
contentQuery.addBindValue(fileid);
|
||||
|
@ -144,15 +253,112 @@ bool SqliteDbService::insertToFTS(bool useTrigrams, QSqlDatabase &db, int fileid
|
|||
Logger::error() << "Failed content insertion " << contentQuery.lastError() << Qt::endl;
|
||||
return false;
|
||||
}
|
||||
contentQuery.finish();
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
SaveFileResult SqliteDbService::saveFile(QFileInfo fileInfo, QVector<PageData> &pageData)
|
||||
bool SqliteDbService::insertOutline(QSqlDatabase &db, int fileid, const QVector<DocumentOutlineEntry> &outlines)
|
||||
{
|
||||
QSqlQuery outlineQuery(db);
|
||||
outlineQuery.prepare("INSERT INTO outline(fileid, text, page) VALUES(?,?,?)");
|
||||
outlineQuery.addBindValue(fileid);
|
||||
for(const DocumentOutlineEntry &outline : outlines)
|
||||
{
|
||||
QString text = outline.text.trimmed();
|
||||
if(text.length() > 0)
|
||||
{
|
||||
text = text.toLower();
|
||||
|
||||
outlineQuery.bindValue(1, text);
|
||||
outlineQuery.bindValue(2, outline.destinationPage);
|
||||
if(!outlineQuery.exec())
|
||||
{
|
||||
Logger::error() << "Failed outline insertion " << outlineQuery.lastError() << Qt::endl;
|
||||
return false;
|
||||
}
|
||||
outlineQuery.finish();
|
||||
if(!insertOutline(db, fileid, outline.children))
|
||||
{
|
||||
Logger::error() << "Failed outline insertion (children)) " << outlineQuery.lastError() << Qt::endl;
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
bool SqliteDbService::runWalCheckpoint()
|
||||
{
|
||||
auto query = QSqlQuery(dbFactory->forCurrentThread());
|
||||
return query.exec("PRAGMA wal_checkpoint(TRUNCATE);");
|
||||
}
|
||||
|
||||
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();
|
||||
}
|
||||
|
||||
/*
|
||||
* The default only opens BEGIN TRANSACTION, but for multi-threaded, IMMEDIATE TRANSACTION is the more reasonable choice */
|
||||
bool SqliteDbService::beginTransaction(QSqlDatabase &db)
|
||||
{
|
||||
QSqlQuery query(db);
|
||||
if(!query.exec("BEGIN IMMEDIATE TRANSACTION"))
|
||||
{
|
||||
Logger::error() << "Immediate transaction could not be acquired" << query.lastError() << Qt::endl;
|
||||
/* TODO: handle maybe the busy time out here */
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
bool SqliteDbService::commitTransaction(QSqlDatabase &db)
|
||||
{
|
||||
QSqlQuery query(db);
|
||||
if(!query.exec("COMMIT TRANSACTION"))
|
||||
{
|
||||
Logger::error() << "Transaction failed to commit" << Qt::endl;
|
||||
/* TODO: handle maybe the busy time out here */
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
SaveFileResult SqliteDbService::saveFile(QFileInfo fileInfo, DocumentProcessResult &processResult, bool pathsOnly)
|
||||
{
|
||||
QString absPath = fileInfo.absoluteFilePath();
|
||||
auto mtime = fileInfo.lastModified().toSecsSinceEpoch();
|
||||
QChar fileType = fileInfo.isDir() ? 'd' : 'f';
|
||||
QChar fileType = fileInfo.isDir() ? 'd' : 'c';
|
||||
if(pathsOnly)
|
||||
{
|
||||
fileType = 'f';
|
||||
}
|
||||
|
||||
/* Insertion can take a long time and other threads can be be busy... we are not guaranteed to get a lock for the transaction.
|
||||
* Don't want to set the sqlite busy handler to eternity. */
|
||||
QMutexLocker lock(&this->writeMutex);
|
||||
|
||||
|
||||
QSqlDatabase db = dbFactory->forCurrentThread();
|
||||
QSqlQuery delQuery(db);
|
||||
|
@ -166,7 +372,7 @@ SaveFileResult SqliteDbService::saveFile(QFileInfo fileInfo, QVector<PageData> &
|
|||
inserterQuery.addBindValue(fileInfo.size());
|
||||
inserterQuery.addBindValue(fileType);
|
||||
|
||||
if(!db.transaction())
|
||||
if(!this->beginTransaction(db))
|
||||
{
|
||||
Logger::error() << "Failed to open transaction for " << absPath << " : " << db.lastError() << Qt::endl;
|
||||
return DBFAIL;
|
||||
|
@ -178,6 +384,7 @@ SaveFileResult SqliteDbService::saveFile(QFileInfo fileInfo, QVector<PageData> &
|
|||
db.rollback();
|
||||
return DBFAIL;
|
||||
}
|
||||
delQuery.finish();
|
||||
|
||||
if(!inserterQuery.exec())
|
||||
{
|
||||
|
@ -185,21 +392,32 @@ SaveFileResult SqliteDbService::saveFile(QFileInfo fileInfo, QVector<PageData> &
|
|||
db.rollback();
|
||||
return DBFAIL;
|
||||
}
|
||||
|
||||
int lastid = inserterQuery.lastInsertId().toInt();
|
||||
if(!insertToFTS(false, db, lastid, pageData))
|
||||
inserterQuery.finish();
|
||||
|
||||
if(!pathsOnly)
|
||||
{
|
||||
db.rollback();
|
||||
Logger::error() << "Failed to insert data to FTS index " << Qt::endl;
|
||||
return DBFAIL;
|
||||
if(!insertToFTS(false, db, lastid, processResult.pages))
|
||||
{
|
||||
db.rollback();
|
||||
Logger::error() << "Failed to insert data to FTS index " << Qt::endl;
|
||||
return DBFAIL;
|
||||
}
|
||||
if(!insertToFTS(true, db, lastid, processResult.pages))
|
||||
{
|
||||
db.rollback();
|
||||
Logger::error() << "Failed to insert data to FTS index " << Qt::endl;
|
||||
return DBFAIL;
|
||||
}
|
||||
if(!insertOutline(db, lastid, processResult.outlines))
|
||||
{
|
||||
db.rollback();
|
||||
Logger::error() << "Failed to insert outline data " << Qt::endl;
|
||||
return DBFAIL;
|
||||
}
|
||||
}
|
||||
if(!insertToFTS(true, db, lastid, pageData))
|
||||
{
|
||||
db.rollback();
|
||||
Logger::error() << "Failed to insert data to FTS index " << Qt::endl;
|
||||
return DBFAIL;
|
||||
}
|
||||
if(!db.commit())
|
||||
|
||||
if(!this->commitTransaction(db))
|
||||
{
|
||||
db.rollback();
|
||||
Logger::error() << "Failed to commit transaction for " << absPath << " : " << db.lastError() << Qt::endl;
|
||||
|
@ -207,3 +425,127 @@ 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(!this->beginTransaction(db))
|
||||
{
|
||||
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;
|
||||
}
|
||||
tagQuery.finish();
|
||||
|
||||
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;
|
||||
}
|
||||
fileTagQuery.finish();
|
||||
}
|
||||
if(!this->commitTransaction(db))
|
||||
{
|
||||
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;
|
||||
}
|
||||
fileTagQuery.finish();
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
bool SqliteDbService::deleteTag(QString tag)
|
||||
{
|
||||
QSqlDatabase db = dbFactory->forCurrentThread();
|
||||
if(!this->beginTransaction(db))
|
||||
{
|
||||
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;
|
||||
}
|
||||
assignmentDeleteQuery.finish();
|
||||
|
||||
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;
|
||||
}
|
||||
deleteTagQuery.finish();
|
||||
|
||||
if(!this->commitTransaction(db))
|
||||
{
|
||||
db.rollback();
|
||||
Logger::error() << "Error while trying to delete tag: " << db.lastError() << Qt::endl;
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
|
|
@ -1,9 +1,12 @@
|
|||
#ifndef SQLITEDBSERVICE_H
|
||||
#define SQLITEDBSERVICE_H
|
||||
#include <QFileInfo>
|
||||
#include <QMutexLocker>
|
||||
#include <optional>
|
||||
|
||||
#include "databasefactory.h"
|
||||
#include "utils.h"
|
||||
#include "pagedata.h"
|
||||
#include "documentprocessresult.h"
|
||||
#include "filedata.h"
|
||||
#include "../shared/sqlitesearch.h"
|
||||
#include "../shared/token.h"
|
||||
|
@ -15,14 +18,39 @@ class SqliteDbService
|
|||
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);
|
||||
|
||||
bool beginTransaction(QSqlDatabase &db);
|
||||
bool commitTransaction(QSqlDatabase &db);
|
||||
|
||||
QMutex writeMutex;
|
||||
|
||||
public:
|
||||
SqliteDbService(DatabaseFactory &dbFactory);
|
||||
SaveFileResult saveFile(QFileInfo fileInfo, QVector<PageData> &pageData);
|
||||
unsigned int getFiles(QVector<FileData> &results, QString wildCardPattern, int offset, int limit);
|
||||
SaveFileResult saveFile(QFileInfo fileInfo, DocumentProcessResult &pageData, bool pathsOnly);
|
||||
|
||||
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);
|
||||
bool insertOutline(QSqlDatabase &db, int fileid, const QVector<DocumentOutlineEntry> &outlines);
|
||||
|
||||
bool runWalCheckpoint();
|
||||
};
|
||||
|
||||
#endif // SQLITEDBSERVICE_H
|
||||
|
|
|
@ -69,7 +69,7 @@ QString SqliteSearch::createSortSql(const QVector<SortCondition> sortConditions)
|
|||
QString SqliteSearch::escapeFtsArgument(QString ftsArg)
|
||||
{
|
||||
QString result;
|
||||
QRegularExpression extractor(R"#("([^"]*)"|([^\s]+))#");
|
||||
static QRegularExpression extractor(R"#("([^"]*)"|([^\s]+))#");
|
||||
QRegularExpressionMatchIterator i = extractor.globalMatch(ftsArg);
|
||||
while(i.hasNext())
|
||||
{
|
||||
|
@ -143,15 +143,25 @@ QPair<QString, QVector<QString>> SqliteSearch::createSql(const Token &token)
|
|||
{
|
||||
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()}};
|
||||
}
|
||||
if(token.type == FILTER_OUTLINE_CONTAINS)
|
||||
{
|
||||
return {" outline.text LIKE '%' || ? || '%' ", {value.toLower()}};
|
||||
}
|
||||
|
||||
throw LooqsGeneralException("Unknown token passed (should not happen)");
|
||||
}
|
||||
|
||||
QSqlQuery SqliteSearch::makeSqlQuery(const LooqsQuery &query)
|
||||
{
|
||||
QString whereSql;
|
||||
QString joinSql;
|
||||
QVector<QString> bindValues;
|
||||
bool isContentSearch = (query.getTokensMask() & FILTER_CONTENT) == FILTER_CONTENT;
|
||||
bool isOutlineSearch = query.hasOutlineSearch();
|
||||
if(query.getTokens().isEmpty())
|
||||
{
|
||||
throw LooqsGeneralException("Nothing to search for supplied");
|
||||
|
@ -180,31 +190,38 @@ QSqlQuery SqliteSearch::makeSqlQuery(const LooqsQuery &query)
|
|||
}
|
||||
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;
|
||||
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;
|
||||
}
|
||||
else
|
||||
{
|
||||
QString pageColumn = "'0' as page";
|
||||
QString joiners = "";
|
||||
if(isOutlineSearch)
|
||||
{
|
||||
pageColumn = "outline.page as page";
|
||||
joiners = " INNER JOIN outline ON outline.fileid = file.id ";
|
||||
}
|
||||
if(sortSql.isEmpty())
|
||||
{
|
||||
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 "
|
||||
"filetype FROM file WHERE 1=1 AND " +
|
||||
whereSql + " " + sortSql;
|
||||
prepSql = "SELECT DISTINCT file.path AS path, " + pageColumn +
|
||||
",file.mtime AS mtime, file.size AS size, "
|
||||
"file.filetype AS filetype FROM file" +
|
||||
joiners + " WHERE 1=1 AND " + whereSql + " " + sortSql;
|
||||
}
|
||||
|
||||
if(query.getLimit() > 0)
|
||||
{
|
||||
prepSql += " LIMIT " + QString::number(query.getLimit());
|
||||
|
@ -238,7 +255,7 @@ QVector<SearchResult> SqliteSearch::search(const LooqsQuery &query)
|
|||
throw LooqsGeneralException("SQL Error: " + dbQuery.lastError().text());
|
||||
}
|
||||
|
||||
bool contentSearch = query.hasContentSearch();
|
||||
bool contentSearch = query.hasContentSearch() || query.hasOutlineSearch();
|
||||
while(dbQuery.next())
|
||||
{
|
||||
SearchResult result;
|
||||
|
|
|
@ -0,0 +1,66 @@
|
|||
#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);
|
||||
}
|
|
@ -0,0 +1,28 @@
|
|||
#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
|
|
@ -1,14 +1,14 @@
|
|||
#include "tagstripperprocessor.h"
|
||||
|
||||
#include <QRegularExpression>
|
||||
TagStripperProcessor::TagStripperProcessor()
|
||||
{
|
||||
}
|
||||
|
||||
QVector<PageData> TagStripperProcessor::process(const QByteArray &data) const
|
||||
DocumentProcessResult TagStripperProcessor::process(const QByteArray &data) const
|
||||
{
|
||||
auto result = DefaultTextProcessor::process(data);
|
||||
// TODO: does not work properly with <br> and does not deal with entities...
|
||||
|
||||
result[0].content.remove(QRegExp("<[^>]*>"));
|
||||
Q_ASSERT(result.pages.size() > 0);
|
||||
result.pages[0].content.remove(QRegularExpression("<[^>]*>"));
|
||||
return result;
|
||||
}
|
||||
|
|
|
@ -8,7 +8,7 @@ class TagStripperProcessor : public DefaultTextProcessor
|
|||
TagStripperProcessor();
|
||||
|
||||
public:
|
||||
QVector<PageData> process(const QByteArray &data) const override;
|
||||
DocumentProcessResult process(const QByteArray &data) const override;
|
||||
};
|
||||
|
||||
#endif // XMLSTRIPPERPROCESSOR_H
|
||||
|
|
|
@ -19,7 +19,9 @@ enum TokenType
|
|||
FILTER_PATH_SIZE,
|
||||
FILTER_PATH_ENDS,
|
||||
FILTER_PATH_STARTS,
|
||||
FILTER_CONTENT = 512,
|
||||
FILTER_TAG_ASSIGNED,
|
||||
FILTER_OUTLINE_CONTAINS,
|
||||
FILTER_CONTENT = 512, /* Everything below here is content search (except LIMIT) */
|
||||
FILTER_CONTENT_CONTAINS,
|
||||
FILTER_CONTENT_PAGE,
|
||||
LIMIT = 1024
|
||||
|
|
|
@ -14,7 +14,7 @@ QByteArray Utils::readFile(QString path)
|
|||
QByteArray data = file.readAll();
|
||||
if(data.isEmpty() && file.error() != QFileDevice::FileError::NoError)
|
||||
{
|
||||
throw LooqsGeneralException("Error reading file: " + path + ", Error: " + file.error());
|
||||
throw LooqsGeneralException("Error reading file: " + path + ", Error: " + QString::number(file.error()));
|
||||
}
|
||||
return data;
|
||||
}
|
||||
|
|
|
@ -5,9 +5,8 @@ void WildcardMatcher::setPatterns(QStringList patterns)
|
|||
this->regexes.clear();
|
||||
for(QString &str : patterns)
|
||||
{
|
||||
QRegExp regexp;
|
||||
regexp.setPattern(str);
|
||||
regexp.setPatternSyntax(QRegExp::WildcardUnix);
|
||||
QRegularExpression regexp;
|
||||
regexp.setPattern(QRegularExpression::wildcardToRegularExpression(str, QRegularExpression::UnanchoredWildcardConversion));
|
||||
this->regexes.append(regexp);
|
||||
}
|
||||
}
|
||||
|
@ -18,9 +17,10 @@ WildcardMatcher::WildcardMatcher()
|
|||
|
||||
bool WildcardMatcher::match(QString haystack) const
|
||||
{
|
||||
for(const QRegExp ®exp : this->regexes)
|
||||
for(const QRegularExpression ®exp : this->regexes)
|
||||
{
|
||||
if(regexp.exactMatch(haystack))
|
||||
QRegularExpressionMatch match = regexp.match(haystack);
|
||||
if(match.hasMatch())
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
#ifndef WILDCARDMATCHER_H
|
||||
#define WILDCARDMATCHER_H
|
||||
#include <QStringList>
|
||||
#include <QRegExp>
|
||||
#include <QRegularExpression>
|
||||
class WildcardMatcher
|
||||
{
|
||||
private:
|
||||
QVector<QRegExp> regexes;
|
||||
QVector<QRegularExpression> regexes;
|
||||
QStringList patterns;
|
||||
|
||||
public:
|
||||
|
|
|
@ -1 +1 @@
|
|||
Subproject commit 769f729dc51f2feb8bc3cbb2a48ed91ff2d56bf3
|
||||
Subproject commit 44b9a17becf6882e1b3728cbf885ae9e5a6717af
|
Laden…
In neuem Issue referenzieren