1
0
mirror of https://github.com/janeczku/calibre-web synced 2024-11-19 00:04:54 +00:00
Commit Graph

142 Commits

Author SHA1 Message Date
gjutras
0a7345186d Merge branch 'janeczku-master'
# Conflicts:
#	cps/helper.py
#	cps/tasks/convert.py
#	cps/templates/user_edit.html
2022-07-08 16:42:14 -04:00
Thore Schillmann
4913673e8f added subprocess.wait() when getting metadata 2022-07-07 11:47:10 +00:00
Thore Schillmann
fc004f4f0c moved get_calibre_binarypath() to helper.py 2022-07-07 11:41:51 +00:00
Ozzie Isaacs
3bde8a5d95 Encrypt passwords 2022-07-02 17:45:24 +02:00
Thore Schillmann
e39c6130c3 cleanup and better error handling 2022-06-29 19:54:53 +00:00
Thore Schillmann
3c4330ba51 refactoring of calibre binary detection 2022-06-21 17:04:44 +00:00
Thore Schillmann
8c781ad4a4 code cleanup and implements cover change 2022-06-19 23:20:59 +00:00
Thore Schillmann
5e9ec706c5 first draft of embedding metadata on conversion 2022-06-19 22:59:54 +00:00
Ozzie Isaacs
f85b587d0a Prevent converting of kepub on every new user (#2446)
Added error logging message if convert fails
If convert only task, only convert book message is logged
2022-06-13 17:05:00 +02:00
Ozzie Isaacs
fbac3e38ac Eenabled send epubs to E-Reader devices 2022-05-08 12:55:54 +02:00
Ozzie Isaacs
e8e4d87d39 Bugfix session commit
Bugfix get_locale
Bugfix reconnect database schedule
Bugfix no permission error message logging
Bugfix updater
2022-04-30 10:17:41 +02:00
Ozzie Isaacs
e7464f2694 Refactored web.py to shrink size of file 2022-04-26 11:49:06 +02:00
Ozzie Isaacs
9410b47144 Refactored startup for compatibility with pyinstaller 5.0 2022-04-26 11:10:44 +02:00
Ozzie Isaacs
6e8445fed5 Changed schedule start- and end-time to schedule start and duration
Localized display of schedule start-time and duration
Removed displaying scheduling settings if "APScheduler" is missing
Input check for start-time and duration
2022-04-25 17:00:07 +02:00
Ozzie Isaacs
d83c731030 Reconnect only if reconnect is enabled 2022-04-25 08:28:29 +02:00
Ozzie Isaacs
1e723dff3a Make texts in Background thread translatable 2022-04-24 18:40:50 +02:00
Ozzie Isaacs
bc96ff9a39 Enable scheduled side deleting of thumbnails of deleted books 2022-04-24 11:14:39 +02:00
Ozzie Isaacs
069dc2766f Update optional-requirements
Bugfix with serializing tasks
Bugfix order of tasks (id was used instead of task_id)
Code cosmetics
2022-04-23 20:03:59 +02:00
Ozzie Isaacs
2f5b9e41ac Reduce number visible System tasks in Tasks list 2022-04-22 20:31:03 +02:00
Ozzie Isaacs
9a8093db31 Thumbnail is generated directly after a book is added 2022-04-22 16:13:51 +02:00
gjutras
cb0d9ec95c Allow kindle_email to be CSV to allow sending to multiple kindles 2022-03-28 19:59:59 -04:00
Ozzie Isaacs
c0d0660986 Added names for jobs to make log more readable
Bugfix logging delete thumbnail
2022-03-20 19:55:46 +01:00
Ozzie Isaacs
f34fc002da Implement missing cache delete Task identifier 2022-03-16 20:33:11 +01:00
Ozzie Isaacs
06e8845641 Implement delete thumbnail entry
Implement delete cache_dir on database change
2022-03-16 20:31:25 +01:00
Ozzie Isaacs
d9a83e0638 Merge branch 'master' into cover_thumbnail
# Conflicts:
#	cps/editbooks.py
#	cps/helper.py
#	cps/web.py
#	test/Calibre-Web TestSummary_Linux.html
2022-03-14 19:41:47 +01:00
Ozzie Isaacs
4379669cf8 Database error is more detailed
renamed debug_or_exception to error_or_exception
2022-03-12 17:14:54 +01:00
Ozzie Isaacs
ef7c6731bc Possible fix for #2301 (sending emails from custom domain name server) 2022-02-14 17:35:20 +01:00
Ozzie Isaacs
e9b674f46e Fix a problem with sending emails from custom domain name server (#2301) 2022-02-13 16:17:04 +01:00
Ozzie Isaacs
764389ea2a small change 2022-02-08 20:15:01 +01:00
Ozzie Isaacs
4a0dde0371 Merge remote-tracking branch 'cover_images/thumbnails' into cover_thumbnail
# Conflicts:
#	cps/admin.py
#	cps/config_sql.py
#	cps/helper.py
#	cps/tasks/upload.py
#	cps/updater.py
#	cps/web.py
2022-02-08 19:55:20 +01:00
Ozzie Isaacs
e22b3da601 Merge branch 'master' into Develop
# Conflicts:
#	cps/tasks/convert.py
#	test/Calibre-Web TestSummary_Linux.html
2022-02-07 13:57:50 +01:00
Ozzie Isaacs
7c623941de Bugfixes after testrun
Enabled re-encode of bookformats
2022-02-07 13:55:18 +01:00
Ozzie Isaacs
3bb41aca6d Bugfix for already present mobi file during convert (fixes #1900) 2022-02-06 18:57:58 +01:00
Ozzie Isaacs
0c3c0c0664 Improved logging of book title on upload 2022-02-06 16:33:12 +01:00
Ozzie Isaacs
895f68033f Improved detection of changed database 2022-02-06 14:22:55 +01:00
mmonkey
18ce310b30 Merge branch Develop into thumbnails 2022-01-26 23:51:50 -06:00
Ozzie Isaacs
35f6f4c727 Deleted book formats remove book from synced to kobo table
updated teststatus
2022-01-24 18:47:34 +01:00
Ozzie Isaacs
bc7a305285 Deleted book formats remove book from synced to kobo table
updated teststatus
2022-01-23 13:11:02 +01:00
Ozzieisaacs
573c9f9fb4 Improved logging (right stacklevel on mail exceptions)
Updated jsonschema requirements
2021-12-30 14:45:31 +01:00
Ozzie Isaacs
b7927a0df1 Bugfix handling of stacktrace from calibre 2021-12-18 18:38:17 +01:00
Ozzie Isaacs
021298374e Improved debug output for task added
Improved handling of calibre output on windows
2021-12-18 17:31:33 +01:00
Ozzieisaacs
25b09a532f Fixed missing handle_error in convert calibre task (database readonly case) 2021-11-04 21:23:02 +04:00
Ozzie Isaacs
ed26d34961 Code cleaning (remove python2) 2021-10-04 19:23:24 +02:00
mmonkey
46205a1f83 Made long running tasks cancellable. Added cancel button to cancellable tasks in the task list. Added APP_MODE env variable for determining if the app is running in development, test, or production. 2021-09-29 02:40:12 -05:00
mmonkey
26071d4e7a Added Scheduled Tasks Settings 2021-09-26 02:02:48 -05:00
mmonkey
0bd544704d Added series cover thumbnail generation. Better cache file handling. 2021-09-25 03:04:38 -05:00
mmonkey
be28a91315 Simplified all of the thumbnail generation and loading. 2021-09-24 03:11:14 -05:00
mmonkey
d648785471 Review feedback fixes 2021-09-17 01:42:56 -05:00
mmonkey
04a5db5c1d Resolve merge conflicts 2021-09-16 22:58:54 -05:00
Ozzie Isaacs
d4cfad6363 Fixed several text problems from tasks
Fixed task update
2021-08-28 11:32:13 +02:00
Ozzie Isaacs
97e4707f72 user list column value and tags editor (#1938)
Bugfixes for massedit in user list (#1938)
Changed no. of debug messages
2021-04-25 10:43:01 +02:00
Ozzie Isaacs
450ee43677 Additional logging for emails 2021-04-22 19:14:56 +02:00
Ozzie Isaacs
8acd1f1fe4 Code refactoring and improved error handling for edit user list
Update teststatus
2021-04-06 17:29:42 +02:00
Ozzie Isaacs
b17d71e4c3 Update optional-requirements.txt
Bugfix Mail task after convert task
2021-03-28 20:36:08 +02:00
Ozzie Isaacs
99520d54a5 Added ability to send emails via gmail (#1905)
Gmail email sending
2021-03-28 14:51:01 +02:00
Ozzie Isaacs
130a4ed2d3 Fix opds and error logging in mail 2021-03-21 11:54:39 +01:00
Ozzie Isaacs
59ebc1af8a Code refactoring 2021-03-21 08:20:04 +01:00
Ozzie Isaacs
dd30ac4fbd Added thumbnails
Merge remote-tracking branch 'cover/thumbnails' into development

# Conflicts:
#	cps/admin.py
#	cps/templates/layout.html
#	cps/ub.py
#	cps/web.py
Update join for sqlalchemy 1.4
2021-03-20 11:32:50 +01:00
Ozzie Isaacs
725fc658f8 Some code cosmetics 2021-03-14 13:28:52 +01:00
Ozzie Isaacs
e5f754ed0e improved session handling 2021-01-11 14:18:01 +01:00
Ozzie Isaacs
6f9e52792a No autoflush on metadata.db change 2021-01-10 11:01:54 +01:00
Ozzieisaacs
a659f2e49d Improved logging for emails
Removed private data from debug export
2021-01-03 19:27:34 +01:00
Ozzieisaacs
b637a63e71 Refactored exception logging 2020-12-12 08:11:00 +01:00
OzzieIsaacs
a80a8aab1c Fix LDAP import user 2020-12-08 20:13:36 +01:00
OzzieIsaacs
d39b28b011 Fix for existing book format with gdrive 2020-12-08 13:34:15 +01:00
OzzieIsaacs
8f36128fe3 Merge branch 'session' into Develop 2020-12-08 11:49:39 +01:00
Ozzieisaacs
1a9b220ec2 Session no longer expires on commit (only in worker thread) 2020-12-08 08:04:46 +01:00
Ozzieisaacs
d15d252af7 Session no longer expires on commit 2020-12-08 08:01:42 +01:00
jvoisin
19b2a334e4 Remove unused imports 2020-10-27 11:06:43 +01:00
OzzieIsaacs
bb03026589 Fixes from merge problems 2020-10-10 07:30:03 +02:00
OzzieIsaacs
3b8e5ddfb3 Merge remote-tracking branch 'worker/db' into Develop
# Conflicts:
#	cps/tasks/convert.py
2020-10-06 21:40:47 +02:00
Ozzieisaacs
e3f4f24c3e Fixes for failed email and conversions with gdrive 2020-10-04 13:59:33 +02:00
Ozzieisaacs
eb37e3a52b Fix UI Deelete Buttons in Edit Books page
Fix Conversion of multiple formats of one book in the queue with gdrive
2020-10-04 12:09:52 +02:00
Ozzieisaacs
23d66a0d68 Fix 2020-10-03 21:43:48 +02:00
Ozzieisaacs
0d64692c84 Fix for convert + email task with gdrive 2020-09-30 19:29:57 +02:00
blitzmann
76c724c783 Remove global session object, this is now wrapped in the CalibreDB class 2020-09-13 21:37:47 -04:00
Ozzieisaacs
e32b017431 Revert "Test revert global Session"
This reverts commit 393869e538.
2020-09-06 10:59:34 +02:00
Ozzieisaacs
393869e538 Test revert global Session 2020-09-06 10:27:10 +02:00
OzzieIsaacs
feacbe8ebd Possible Fix for database crash after adding new format and accessing calibre database afterwards 2020-09-05 10:24:32 +02:00
OzzieIsaacs
1a9a436cbe Fixed wrong translation string
Removed unused variables from callback in server.py
Update Testresults
2020-08-30 17:11:11 +02:00
OzzieIsaacs
62dd29d2f3 Renamed email to mail due to naming conflict in python2 2020-08-30 08:49:53 +02:00
OzzieIsaacs
9e5cad0dc8 Merge new worker thread 2020-08-29 11:14:52 +02:00
blitzmann
f3a3797850 Fail the convert task if the email subtask fails 2020-08-24 21:28:55 -04:00
blitzmann
8634b0c6f0 Remove left over placeholder code 2020-08-24 21:00:15 -04:00
blitzmann
ac22483f98 Add error handling to the email task within the convert task 2020-08-23 21:35:05 -04:00
blitzmann
59d56d5c83 py27 support (I think) and some clean up 2020-08-23 21:21:55 -04:00
blitzmann
a000de0270 Some clean up 2020-08-23 13:33:57 -04:00
blitzmann
bf41b04cfa Remove convert task from db.py - with the fixed from #1565, this no longer seems to be needed 2020-08-23 13:07:24 -04:00
blitzmann
9ce2e8ea53 Fix progress indication for emails that have been completed. 2020-08-23 12:58:24 -04:00
blitzmann
414043ded1 Remove references to old worker, turn off calibre_db task queue (for now until I can determine if it's needed still), and attempt to re-implement email progress tracking (not working at the moment) 2020-08-22 23:35:48 -04:00
blitzmann
2533c9c14e Continue converting tasks - email and upload tasks 2020-08-22 22:44:28 -04:00
blitzmann
f10f0dada6 First working PoC with a new task structure 2020-08-22 16:31:00 -04:00