Commit Graph

650 Commits

Author SHA1 Message Date
Luis Ángel San Martín
5459ff78cf Disable close button as the default when pressing enter
It can be triggered using ESC
2021-03-06 18:02:41 +01:00
Luis Ángel San Martín
0f6b203d34 Embrace HTML coming from Comic Vine 2021-03-06 09:05:35 +01:00
Luis Ángel San Martín
51a9c72d05 Replace QtScript with QJson*
QtScript is deprecated and this was needed to start supporting Qt6
2021-02-27 12:02:57 +01:00
Igor Kushnir
6f182b2bb3 Extract CONFIG += c++11 into common config.pri 2021-02-18 19:49:43 +01:00
Igor Kushnir
0f372a001e Library: update toolbar title on history navigation
When Back or Forward action was triggered, the toolbar title was not
updated to match the reselected entry.

I am calling LibraryWindow::setToolbarTitle() from
selectedIndexFromHistory() rather than loadIndexFromHistory(), because
the latter is also called from
YACReaderNavigationController::loadPreviousStatus(), which in turn is
called only from LibraryWindow::setSearchFilter() when the search line
text becomes empty. The toolbar title is already correct and does not
have to be updated in this case.

My code analysis and experiments have revealed that YACReader code never
creates YACReaderLibrarySourceContainer objects of type None. This type
could be removed altogether along with YACReaderLibrarySourceContainer's
default constructor, but for Q_DECLARE_METATYPE macro's requirement. So
YACReaderNavigationController::loadIndexFromHistory() now simply prints
an error message instead of introducing a failure condition by returning
false when the type is None.
2021-02-14 19:07:37 +02:00
Luis Ángel San Martín
b55c442590 Add missing import
It fixes compilation with some compilers
2021-02-08 08:38:15 +01:00
Igor Kushnir
5656c3f540 Make ComicQueryResultProcessor::modelData() static
The function doesn't use data members or other member functions. It
could even be put into an unnamed namespace in the cpp file, but that
would require more changes and complicate turning it back into a member
function if need be in the future.
2021-02-06 20:08:47 +02:00
Igor Kushnir
12c2ff027a ComicQueryResultProcessor: fix a typo in the class name 2021-02-06 20:08:44 +02:00
Igor Kushnir
3a9bec55f8 Library: don't print errors when search edit's text changes
This was a temporary debug output. Not useful anymore.
2021-02-05 09:34:13 +01:00
Luis Ángel San Martín
6d5f3d7de3 Use the query search queue in FolderQueryResultProcessor 2021-02-04 19:15:58 +01:00
Igor Kushnir
64d0e22fb5 Library: don't leak folderQueryResultProcessor at exit
FolderQueryResultProcessor has a ConcurrentQueue data member. The leak
meant that the thread was not joined before exit.
2021-02-04 17:58:33 +02:00
Igor Kushnir
f88af80379 Library: fix InfoComicsView crashes
InfoComicsView constructor is the only function that connects to
FlowView's currentCoverChanged signal. Neither of the slots connected to
this signal handles the argument value index==-1. So when FlowView emits
this signal with index==-1, YACReaderLibrary crashes. Returning early
from either ComicsView::updateInfoForIndex() or
InfoComicsView::setCurrentIndex() when index==-1 is not sufficient - the
crash happens in the other slot then. Let us skip emitting the signal in
FlowView if index==-1 rather than return early from both slots.

Steps to reproduce 1:
1. Launch YACReaderLibrary version that matches the version of the
default library database. Alternatively, select a compatible library
after starting the application.
2. If InfoComicsView is not active, switch to it.
3. (optional) Switch to another comics view out of InfoComicsView.
4. Quit YACReaderLibrary. The application crashes during exit - after
the "YACReaderLibrary closed with exit code : 0" message is printed.

Steps to reproduce 2:
1. Launch a YACReaderLibrary version newer than the version of the
default library database.
2. Click the "No" button in the "Update needed" dialog that pops up.
3. Change between comics views until InfoComicsView becomes active. If
this view was active at the beginning, switch through all the views to
get back to it. At this point YACReaderLibrary crashes.
2021-02-01 11:27:18 +02:00
Luis Ángel San Martín
f4b2b3d8e3 Update comments 2021-01-28 19:56:35 +01:00
Luis Ángel San Martín
d96d01d963 Fix launch sequence to avoid http port collisions 2021-01-25 15:48:15 +01:00
Luis Ángel San Martín
74840f9914 Enable SVG explicitly 2021-01-22 10:48:13 +01:00
Luis Ángel San Martín
58fdf0af23 Add what's new dialog 2021-01-21 21:39:22 +01:00
Luis Ángel San Martín
3f6c44ce7a Fix SQL update query for setting manga in all the comics in a folder 2021-01-17 14:05:14 +01:00
Luis Ángel San Martín
20c772797b Fix typo 2021-01-16 18:59:53 +01:00
Luis Ángel San Martín
6461a4014e Add actions for setting folders as manga/normal 2021-01-16 18:31:48 +01:00
Luis Ángel San Martín
d402999991 Set all new imported comics and folders as manga if the parent folder is manga 2021-01-16 18:31:13 +01:00
Luis Ángel San Martín
60de69635b Get/set new manga field from/to the db 2021-01-16 18:30:25 +01:00
Luis Ángel San Martín
f7fa4adbd0 Add manga field to folders too
This way we can tell the app that a folder contains mangas so the user doesn't have to constantly set comics as manga when new issues are added. And it should be easier to set all the content in a folder as manga from the folder tree.
2021-01-16 18:29:22 +01:00
Luis Ángel San Martín
9643274b39 Enable manga in the search engine 2021-01-16 14:26:37 +01:00
Luis Ángel San Martín
bc82078ec9 Add new manga field to the edit comic dialog 2021-01-16 14:26:07 +01:00
Luis Ángel San Martín
97c7723b17 Add support for setting issues as manga/normal in the comics view 2021-01-16 14:25:47 +01:00
Luis Ángel San Martín
52953633e5 Send manga field through the server 2021-01-16 14:24:14 +01:00
Luis Ángel San Martín
3ab05c6777 Add a new boolean field for tagging comics as manga 2021-01-16 14:23:59 +01:00
Luis Ángel San Martín
76a307d0d8 Remove comments 2021-01-14 19:11:25 +01:00
Luis Ángel San Martín
6bb64c5467 Import non-gui global header 2021-01-14 18:42:51 +01:00
Luis Ángel San Martín
24c0a783de Remove reference to lexertl's license 2021-01-14 18:42:21 +01:00
Luis Ángel San Martín
82eb5c0a8b Add fallback for qt < 5.15 2021-01-14 15:51:20 +01:00
Luis Ángel San Martín
f03ad848cb Add support for true and false literals to be used with bool fields
The lexer itself should be responsible for parsing those values but it will require a bigger refactoring.
2021-01-14 15:32:20 +01:00
Luis Ángel San Martín
f803b54f2e Add support for boolean folder fields 2021-01-14 12:25:24 +01:00
Luis Ángel San Martín
dde60b78ea YACReaderLibrary compiles using c++11 just fine
It is probably worth to bump this to c++14 and ideally use c++17, but it will be done in a separate branch.
2021-01-14 11:38:45 +01:00
Luis Ángel San Martín
5343d24f26 Run folder search filtering in the background
It uses the same approach used by the comics search filter
2021-01-14 11:37:17 +01:00
Luis Ángel San Martín
ccc382df7d Use ComicQueryResultProcesor 2021-01-14 09:17:18 +01:00
Luis Ángel San Martín
dbdc7bd965 Add a class for processing search queries and create the comics model data 2021-01-14 09:10:58 +01:00
Luis Ángel San Martín
fa5ce25425 Add concurrent queue based on lambdas 2021-01-14 09:03:17 +01:00
Luis Ángel San Martín
7b36100458 Use QString::fromStdString
Just to keep things consistent in the whole round trip conversion
2021-01-14 08:51:08 +01:00
Luis Ángel San Martín
260f538de3 Use an explicit constructor for TreeNode
List initialization ended using movable constructors which surprisingly caused data troubles in release mode, at least in VC2019 compiler. The tree being messed up caused crashes while SQL was generated.

I have no explanation for it.
2021-01-14 08:49:48 +01:00
Luis Ángel San Martín
f09c5955d8 Remove space and atWord tokens
`atWord` wasn't used at all and spaces should be eaten by the lexer

And added `unspecified` token
2021-01-14 08:39:16 +01:00
Luis Ángel San Martín
ddb140d430 Remove misplaced code 2021-01-12 18:57:25 +01:00
Luis Ángel San Martín
a777aa3fe8 Replace lexertl with a custom lexeter implementation
QueryLexeter does not parse "atWord" because I couldn't find what it is used for.
2021-01-12 18:56:59 +01:00
Luis Ángel San Martín
5037f3ac92 Fix data base removal in FolderModel 2021-01-12 18:41:57 +01:00
Luis Ángel San Martín
6438c9210f Move query execution and model setup to the right scope 2021-01-12 18:41:09 +01:00
Luis Ángel San Martín
255e51da86 Fix binding values to search query
This was broken while doing a rebase
2021-01-08 16:59:17 +01:00
Iain Benson
8efb9912ee Use concatenation, rather than ostringstream 2021-01-08 15:56:16 +01:00
Luis Ángel San Martín
4990093e3d Remove c++17 dependency 2021-01-08 15:56:16 +01:00
Luis Ángel San Martín
2d3888b4b4 Fix scopes 2021-01-08 15:56:13 +01:00
Luis Ángel San Martín
7ccb338455 Apply clang-format 2021-01-08 15:51:59 +01:00
Iain Benson
9a660350d2 Add some documentation and attribution to the query parser 2021-01-08 15:51:59 +01:00
Iain Benson
30529dca43 Some small tidy ups 2021-01-08 15:51:56 +01:00
Iain Benson
673ee1f067 Use the query parser in the comic and folder model 2021-01-08 15:41:29 +01:00
Iain Benson
5fa7da1e46 Add folder into the query parser 2021-01-08 15:41:29 +01:00
Iain Benson
4a50d438d0 Add query parser class 2021-01-08 15:41:28 +01:00
Iain Benson
d3de52ca82 Add commit 43aab01 of BenHanson/lexertl14 from github 2021-01-08 15:41:28 +01:00
Felix Kauselmann
c4f792bd40 Fix port settings
When setting ports, temporary or for good, we need to go via the config
files and not QTcpServer or we get undefined behavior. To support temp
ports, we need to back up the fixed port in the settings.
2020-12-11 12:33:05 +01:00
Luis Ángel San Martín
e79ea56d32 Fix format 2020-12-05 14:49:54 +01:00
Heimen Stoffels
ccf1e4cb56 Updated Dutch translation 2020-10-01 11:56:35 +02:00
Igor Kushnir
04140bef0b Remove an unnecessary indirection in ComicFlow
The timer pointer forced error-prone manual memory management without
any benefits.
2020-08-31 15:45:12 +02:00
Igor Kushnir
cb7c967252 Add WorkerThread class and use it in ComicFlow
In a later commit WorkerThread should also replace classes similar to
ImageLoader: PageLoader, ImageLoaderGL and ImageLoaderByteArrayGL.

Bugs fixed:
  1. Eliminated a data race between ImageLoader::run() and
ComicFlow::updateImageData()->ImageLoader::result(). Specifically when
ImageLoader::busy() returns false, then ImageLoader::run() sets
ImageLoader::working to true, loads the image and starts assigning it to
ImageLoader::img, while ImageLoader::result() is accessed without
locking from updateImageData().
Making ImageLoader::working atomic is clearly insufficient to eliminate
this data race. The fix is to set 'working' to true immediately and
synchronously as soon as a new task is assigned to the worker.
  2. Replaced thread termination with graceful thread exit. ComicFlow
destructor called QThread::terminate(), using which is discouraged by Qt
documentation. The application exited without errors in Release mode.
In Debug mode, however, it received the SIG32 signal on exit and printed
the following warning - "QWaitCondition: mutex destroy failure:
Device or resource busy".
The loop in WorkerThread::run() is no longer endless. The worker thread
properly ends and is joined in WorkerThread destructor.

Design decisions:
 1. WorkerThread could emit a signal when it completes a task.
Thus updateTimer could be removed from ComicFlow and GoToFlow. However,
there is no obvious way to use this new signal in the two GL classes.
Also I don't know whether updateTimer is just an inefficient polling
substitute for notification or an intentional animation mechanism.
 2. The index variable is no longer stored in the worker class, but in
ComicFlow directly. Thing is, this data member was never actually
accessed by the worker, but ComicFlow went so far as to lock worker's
mutex to "protect" access to the index.
 3. The common ImageLoader implementation turned out to be very general.
So I converted it into the WorkerThread class template that is not
restricted to producing QImage results and can be reused elsewhere.
 4. I used standard classes (such as std::thread) instead of their Qt
equivalents (e.g. QThread) because they are more thoroughly documented.
The standard classes should also be more efficient as they were more
carefully designed and provide much fewer unnecessary features.
 5. Release-Acquire ordering is safe for the WorkerThread::working
use case and is more efficient than the std::atomic-default
Sequentially-consistent ordering.
 6. condition.notify_one() is called while the mutex is unlocked
to improve performance. This is safe in both cases:
  a) if the worker thread exits due to a spurious wakeup just before
the condition.notify_one() call in WorkerThread destructor, so much the
better;
  b) if a spurious wakeup lets the worker thread finish the task and
start waiting on the condition again just before the
condition.notify_one() call in WorkerThread::performTask(), the second
waking will be ignored by the worker thread as 'working' and 'abort'
will be false then.
2020-08-31 15:45:12 +02:00
Felix Kauselmann
4a654c38c0 Headless server: Add support for setting a port from commandline
Manual editing of a config file for setting a port is not ideal.
Solution: add a set-port command to save a port and also a
--port option to allow setting a temporary port during startup
2020-08-29 18:21:06 +02:00
Luis Ángel San Martín
b64ea19e8b Use an invalid QVariant to set to NULL a value in the DB
nullptr causes troubles in some platforms/compiles
2020-08-25 19:45:05 +02:00
Luis Ángel San Martín
f11a757141 Code format
I had to update clang-format
2020-08-25 19:13:43 +02:00
Luis Ángel San Martín
5bc3ad5014 Send back more recent comic status to the client on sync 2020-08-25 19:03:00 +02:00
Luis Ángel San Martín
2b780e23a4 Make updateFromRemoteClient return more updated comics
So they can be sent back to the client.
2020-08-25 19:01:43 +02:00
Luis Ángel San Martín
fe15bc2ba8 Include "last_time_opened" in JSON serialization 2020-08-25 19:01:03 +02:00
Luis Ángel San Martín
c84fc20419 Reset last time opened when setting a comic as unread 2020-08-25 19:00:21 +02:00
Felix Kauselmann
4b3042def4 Fix object leaks in database code
Qt's database and query model requires that both the queries and the database
objects are out of scope before a database connection can safely be removed.

Solution: Properly encapsulate databases and queries in "{ }" and use a string
to cache the connection name for out-of-scope removal.
2020-08-25 17:34:46 +02:00
Felix Kauselmann
1b344d70e5 Update server code integration for QtWebApp 1.7.11
- Adapt server code for QtWebapp namespace 'stefanfrings'
- Implement custom modifications needed by v1 controller
  via template engine
- Unify iphone and ipad templates
2020-08-20 18:22:57 +02:00
Felix Kauselmann
3de099491f Move QtWebApp sources to third_party 2020-08-20 18:22:57 +02:00
Felix Kauselmann
1af613663c Fix QsLog setup in Library and LibraryServer
The calls changed, so we need to adapt them.
2020-08-20 17:41:56 +02:00
Felix Kauselmann
c13ec618d0 Move QsLog to third_party directory 2020-08-20 17:41:56 +02:00
Felix Kauselmann
b9acd13120
Fix code format errors due to changes in default coding style. (#150) 2020-07-24 21:17:49 +02:00
Jan Beich
65a77daa75 Explicitly include <sys/socket.h>
server_config_dialog.cpp:57:30: error: member access into incomplete type 'struct sockaddr'
            if (ifa->ifa_addr->sa_family == AF_INET) { // check it is IP4
                             ^
/usr/local/include/qt5/QtNetwork/qhostaddress.h:50:8: note: forward declaration of 'sockaddr'
struct sockaddr;
       ^
server_config_dialog.cpp:61:27: error: use of undeclared identifier 'AF_INET'
                inet_ntop(AF_INET, tmpAddrPtr, addressBuffer, INET_ADDRSTRLEN);
                          ^
server_config_dialog.cpp:64:37: error: member access into incomplete type 'struct sockaddr'
            } else if (ifa->ifa_addr->sa_family == AF_INET6) { // check it is IP6
                                    ^
/usr/local/include/qt5/QtNetwork/qhostaddress.h:50:8: note: forward declaration of 'sockaddr'
struct sockaddr;
       ^
server_config_dialog.cpp:68:27: error: use of undeclared identifier 'AF_INET6'
                inet_ntop(AF_INET6, tmpAddrPtr, addressBuffer, INET6_ADDRSTRLEN);
                          ^
2019-11-26 19:03:34 +00:00
Luis Ángel San Martín
e1b0e7c96f Fix full screen mode in windows with qt 5.12.4+ 2019-09-28 10:11:44 +02:00
ivanvranjic
346bcdaf75 Clang format fix. 2019-09-25 17:38:59 +02:00
Ivan Vranjic
cfb4e31af9 Fix for story arcs not being parsed from comicvine. 2019-09-25 17:38:59 +02:00
Luis Ángel San Martín
0b83764734
Revert "Thread ping pong" 2019-09-24 12:00:21 +02:00
Felix Kauselmann
be547081f2 Fix huge memleak in server code caused by thread pingpong fix.
Stopped QThreads don't process events, so cleanup signals get lost.
Prevent this from happening by keeping the threads alive and the comic
inside the thread (as we already do in the viewer). Cleanup happens by
connecting the comic's destroyed() signal to the thread's quit() slot.
2019-09-24 08:21:14 +02:00
Luis Ángel San Martín
68ae40fda7 Fix restoring the window from a minimized state 2019-09-22 15:04:54 +02:00
Luis Ángel San Martín
6990ba0765 Use showNormal in macos and show in other platforms 2019-09-22 13:27:06 +02:00
Luis Ángel San Martín
1ddf0038b8 Use Trigger in linux, we have seen some setups were double click is not reported 2019-09-22 13:14:02 +02:00
Luis Ángel San Martín
94d17a1d5c Use "show" instead of "showNormal" to keep maximized geometry 2019-09-22 13:08:10 +02:00
Luis Ángel San Martín
fc85f77d15 Use LibraryWindow::closeApp to exit from the system tray context menu 2019-09-21 12:12:19 +02:00
Luis Ángel San Martín
9fafa06063 Move call forward 2019-09-21 12:11:56 +02:00
Luis Ángel San Martín
674fa21717 Pass a more specific instance of our main window 2019-09-21 12:11:39 +02:00
Luis Ángel San Martín
ef8216b338 Make closeApp work with no event
And exit using QApplication.exit so we don't mess with window events to exit the app
2019-09-21 12:11:03 +02:00
Luis Ángel San Martín
7ac331ed41 Do not force macos sdk for now
This was commited by mistake
2019-09-21 11:06:51 +02:00
Luis Ángel San Martín
8e99d9e59f Extract the system tray functionality to its own class
LibraryWindow is already a monster, so we'll try to not make it bigger.
2019-09-21 10:47:01 +02:00
Luis Ángel San Martín
3c07e7269a Update the UI string about system tray support 2019-09-21 10:45:34 +02:00
Luis Ángel San Martín
5b78ef2dae Use new property name and set false as default 2019-09-21 10:44:28 +02:00
Luis Ángel San Martín
b5f3799753 Restore the code to start the app into the system tray 2019-09-21 10:44:03 +02:00
Luis Ángel San Martín
63e16e44b7 Better macos tray icon 2019-09-20 16:38:11 +02:00
Luis Ángel San Martín
403e657062 A new trayicon is needed for macos 2019-09-20 13:41:26 +02:00
Luis Ángel San Martín
6031c81d81 Add better icons for the system tray in macos and windows
I would like to design specific icons for the system tray at some point, but for now this is what we have.
2019-09-20 10:07:20 +02:00
Luis Ángel San Martín
4377ad935c Fixed more merge problems 2019-09-19 22:54:08 +02:00
Luis Ángel San Martín
8f845727ae Fixed more merge problems 2019-09-19 22:49:00 +02:00
Luis Ángel San Martín
a0f682be7b Merge went bad
Hopefully this is all that got messed up
2019-09-19 22:32:07 +02:00
Luis Ángel San Martín
a632480422 Format 2019-09-19 21:16:56 +02:00