Commit Graph

393 Commits

Author SHA1 Message Date
Ozzie Isaacs d8f5bdea6d Refactor rename author/title on gdrive 2022-01-23 19:31:56 +01:00
Ozzie Isaacs 127bf98aac Merge branch 'master' into Develop
# Conflicts:
#	cps/templates/detail.html
#	test/Calibre-Web TestSummary_Linux.html
2022-01-23 17:51:54 +01:00
Ozzie Isaacs ede273a8f9 Added variable to allow loading cover from localhost 2022-01-23 13:43:35 +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
Ozzie Isaacs de1bc3f9af Fix #2265 (add book to shelf on popup for book details)
Updated testresults
2022-01-17 17:46:57 +01:00
Ozzieisaacs 47f5e2ffb4 Remove python2 urllib imports
Fix for "javascript:" script links in identifier
2021-12-30 14:45:31 +01:00
Ozzieisaacs 7eb875f388 Improvement for gdrive rename authors 2021-12-28 17:13:18 +01:00
Ozzieisaacs bdedec90dd Catch more Gdrive errors (#2233) 2021-12-23 11:13:08 +01:00
Ozzie Isaacs 2e815147fb Merge branch 'master' into Develop
# Conflicts:
#	cps/kobo_sync_status.py
#	test/Calibre-Web TestSummary_Linux.html
2021-12-19 10:29:56 +01:00
Ozzie Isaacs 592288cb22 Fix inverted "convert to English characters" setting 2021-12-19 08:04:13 +01:00
Ozzie Isaacs 6e15280fac Start renaming author names on gdrive 2021-12-05 19:01:23 +01:00
Ozzie Isaacs d217676350 Upated testresult
Bugfix book table
2021-12-05 13:09:41 +01:00
Ozzie Isaacs cd5711e651 Merge branch 'master' into Develop
# Conflicts:
#	cps/web.py
2021-12-04 20:56:04 +01:00
Ozzie Isaacs 91a21ababe Allow download of archived books 2021-12-04 11:16:33 +01:00
Ozzie Isaacs a1d372630d Added missing language bit (fixes #2187)
Added handling of wrong .jpg cover file content
Guest sorting options are now stored in the session
Updated teststatus
2021-11-23 19:32:48 +01:00
Ozzieisaacs 6deb527769 Merge branch 'master' into Develop 2021-11-21 09:14:36 +01:00
Ozzie Isaacs 5ede079401 Handling of invalid cover files on upload 2021-11-20 13:45:41 +01:00
Ozzieisaacs 8e5bb02a28 Merge author rename 2021-11-20 13:28:45 +04:00
Ozzieisaacs baba205bce Rename everything on rename authors 2021-11-11 18:46:32 +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 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 8bee2b9552 Added CACHE_DIR env variable, graceful handling when APScheduler is not installed 2021-09-19 22:45:19 -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 86ef1d47e8 Bugfixes from testrun 2021-08-30 08:02:21 +02:00
Ozzieisaacs 10e212fcde Merge branch 'master' into Develop 2021-08-29 10:44:13 +02:00
Ozzie Isaacs d4cfad6363 Fixed several text problems from tasks
Fixed task update
2021-08-28 11:32:13 +02:00
Ozzie Isaacs 3a24561ca2 Removed additional " from convert message 2021-08-28 10:32:40 +02:00
Ozzie Isaacs 3946ef8f0d Merge branch 'master' into Develop
# Conflicts:
#	cps.py
#	cps/web.py
2021-08-27 16:16:24 +02:00
Ozzie Isaacs 91e6d94c83 Improved displaying of username and task title in tasks 2021-08-27 14:27:35 +02:00
Ozzie Isaacs ceec1051d5 Added option to save books with no nenglish characters
Imporvements on metadata search
2021-08-01 13:50:17 +02:00
Ozzie Isaacs 259ac94b93 Fix error unclosed IO on external binary version query 2021-07-11 09:19:27 +02:00
Ozzie Isaacs f8de7e75cc Fix error unclosed IO on external binary version query 2021-07-11 09:19:46 +02:00
Ozzie Isaacs 480aecb16c Fix #2046 (Deleting book with additional "/" in database path is working) 2021-07-10 08:27:29 +02:00
Ozzie Isaacs 4e3a5ca33b Added additional debug messages, catch additional errors in updater 2021-04-25 11:30:53 +02:00
Ozzieisaacs ae97e87506 Delete user working from user table (#1938)
Comment in helper
2021-04-10 11:32:25 +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 665210e506 Fixes for book edit with title sort and author sort 2021-04-04 14:01:06 +02:00
Ozzie Isaacs 9864d932e0 Changed user.nickname to user.name
Added function to view downloads of all users for admins
2021-03-21 18:55:02 +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 9a963bbe79 Refactored code
Testrun
2021-03-15 13:10:17 +01:00
Ozzie Isaacs 2451605033 Merge remote-tracking branch 'djvu/read-djvu' into master 2021-03-15 08:43:25 +01:00
Ozzie Isaacs 6229e4610a Updated teststatus and bugfix convert ebooks 2021-03-15 08:10:42 +01:00
Ozzie Isaacs 725fc658f8 Some code cosmetics 2021-03-14 13:28:52 +01:00
Ozzie Isaacs bbf609b880 Fix #1859 (Upload of jpg files without installed imagemagick doesn't work) 2021-02-13 14:34:41 +01:00
Ozzie Isaacs 34a474101f Fix #1838 (Log message on failed OPDS login) 2021-01-28 20:05:58 +01:00
jvoisin b8ab66369e Remove some unused imports 2021-01-07 17:59:08 +01:00
Ozzieisaacs 1a83bddf8c Merge bubble read status 2020-12-27 13:53:21 +01:00
Ozzieisaacs b637a63e71 Refactored exception logging 2020-12-12 08:11:00 +01:00
Ozzieisaacs d9b22fd513 log exceptions only in debug mode 2020-12-11 16:46:02 +01:00
Ozzie Isaacs db91577485 Use calibre-web folder in tempdir on upload cover and metadata backup
fix upload cover on windows (slash vs. backslash)
2020-12-11 13:34:29 +01:00
Ozzieisaacs 72a02e087c Update optional pydrive requirement
Bugfix cover url download for Wand insted of Pillow
Fix for gdrive with unknown certificates
2020-12-09 15:14:08 +01:00
Ozzieisaacs 352b4a0b73 Remove Pillow as dependency 2020-12-09 14:18:39 +01:00
OzzieIsaacs 8f36128fe3 Merge branch 'session' into Develop 2020-12-08 11:49:39 +01:00
Ozzieisaacs 777c2726d3 Changed session_handing 2020-12-07 08:52:52 +01:00
Ozzieisaacs 32b7b39223 Added function to download debug information 2020-11-15 14:25:27 +01:00
verglor 2343c79126 Use djvu_html5 to read djvu format in browser 2020-11-15 13:19:37 +01:00
Ozzieisaacs cd57731593 Merge remote-tracking branch 'sec_fixes/unused_imports' into master 2020-10-31 19:24:46 +01:00
Ozzieisaacs 5701e08db9 Fix for #1668 2020-10-28 20:37:52 +01:00
jvoisin 19b2a334e4 Remove unused imports 2020-10-27 11:06:43 +01:00
celogeek b2594468b4
add helper to get all read books 2020-10-17 16:49:06 +02:00
Ozzie Isaacs d128b037a5 Fix for editing files on windows 2020-10-11 18:01:26 +02:00
OzzieIsaacs bb03026589 Fixes from merge problems 2020-10-10 07:30:03 +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 e29247774c Bugfixes for uploading books to GDrive with new worker 2020-09-12 13:55:36 +02:00
Ozzieisaacs 449d31e8a1 Refactored update_dir_structure_file 2020-09-07 21:26:59 +02:00
blitzmann ded480207b Add link to convert task, fixes #1589 2020-08-30 13:54:51 -04: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 572ac4a17b Fix for deleting old, completed tasks
(cherry picked from commit e066d7a4b0f47d3327696a11795cdc923ff0f6f3)
2020-08-27 21:46:20 -04:00
blitzmann 6322919bc7 Merge branch 'Develop' into tasks
# Conflicts:
#	cps/db.py
2020-08-25 00:15:41 -04:00
blitzmann b81b8a1dea Fix registration email 2020-08-25 00:05:20 -04:00
blitzmann 508f49df18 Remove completed tasks and sort the tasks by date added when calling `.tasks` 2020-08-23 23:00:23 -04:00
blitzmann 6a8ae9c0c4 Merge remote-tracking branch 'upstream/master' into tasks
# Conflicts:
#	cps/helper.py
2020-08-23 21:38:56 -04:00
OzzieIsaacs cf35c9dcef Merge remote-tracking branch 'name/patch-2' into master 2020-08-23 10:53:18 +02:00
OzzieIsaacs 45ff9394f2 Fix comma separated author names during for upload 2020-08-23 09:44:42 +02: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
Ryan Holmes 969105b205
Trim whitespace from filename
This avoids an OSError when the book's metadata has whitespace at the end of it.
2020-08-09 01:08:00 -04:00
Ozzie Isaacs 0ccc3f7252 Fixes for windows (moving files not allowed -> Close pdf after metadata extracting, add os.path.normcase to path while renaming folders, as thi caused also trouble
Added hint for missing ghostcript on cover extraction
2020-07-21 20:14:08 +02:00
Ozzieisaacs 20c6f79a44 Changed behavior delete books with subfolders (additional warning message, but book is deleted) 2020-07-05 10:44:49 +02:00
Ozzieisaacs 8608ff11f7 Fix #1507 (Password generation on python2 working again) 2020-06-30 19:58:07 +02:00
Ozzieisaacs 329a7a03a5 Fix for errors editing/uploading books with duplicate tags/authors/language names
Additional parsing of epubs for cover files
Fix for change of database with linked read_column and read column isn't present any more
2020-06-22 19:11:58 +02:00
Ozzieisaacs ef2c98ba39 Fix #1453 (error unrar binary not found) 2020-06-02 20:51:08 +02:00
Ozzieisaacs 7d08cde8b8 Update error handling cover upload 2020-05-29 06:59:40 +02:00
Ozzieisaacs 5607d2086d Added error handling for cover upload 2020-05-27 20:41:16 +02:00
Ozzie Isaacs e4eab17595 Fix version detect of binaries on windows 2020-05-24 17:24:54 +02:00
Ozzieisaacs 5f0660a4e5 Refactored helper.py and db.py 2020-05-23 10:16:29 +02:00
OzzieIsaacs 0cf1cc5587 Fixes from tests 2020-05-21 22:26:19 +02:00
Ozzieisaacs 1a458fe39f Fix for #1407 converting books should now be possible again 2020-05-21 18:16:11 +02:00
Ozzieisaacs 81fc1eccd3 Fix for #1407 (to many read books lead to to large sql query) -> only fix for linked calibre-column 2020-05-19 21:35:56 +02:00
Ozzieisaacs 13994a5f96 Merge branch 'master' into Develop 2020-05-13 20:16:29 +02:00
Ozzieisaacs e8ac62cdd8 Moved password replace to prevent incomplete session 2020-05-13 20:15:35 +02:00
Ozzieisaacs 16a3deec2c Merge branch 'master' into Develop
# Conflicts:
#	cps/helper.py
2020-05-10 19:24:55 +02:00
OzzieIsaacs 92db00692a Merge all headers to download response
Updated test results
2020-05-10 14:58:18 +02:00
OzzieIsaacs d61b7e48d7 Merge remote-tracking branch 'sec_fixes/random_password' 2020-05-10 10:18:40 +02:00