NunoSempere/calibre-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,301 Commits 1 Branch 0 Tags 95 MiB
9a678c41fe
Commit Graph

1978 Commits

Author SHA1 Message Date
OzzieIsaacs
b65095fd0f Merge remote-tracking branch 'google_oauth/patch-1' into Develop 2020-08-30 08:26:34 +02:00
OzzieIsaacs
28733179d2 Merge remote-tracking branch 'caliblur/editMetaFix' into Develop 2020-08-30 08:25:17 +02:00
OzzieIsaacs
960d23ca50 Merge remote-tracking branch 'caliblur/blurPaginationFix' into Develop 2020-08-30 08:23:06 +02:00
blitzmann
3e378bd665 Some more clean up 2020-08-29 21:04:49 -04:00
blitzmann
c120138f26 Fixes for pagination ugliness for caliBlur! style 2020-08-29 20:58:30 -04:00
blitzmann
31b20362ec caliBlur! style: Fixes issue with edit metadata button not getting styled correctly 2020-08-29 18:45:23 -04:00
blitzmann
e7eb5b6ea6 Improvements to task processing 
* Moves clean up to separate function for organization
* moves the `self.dequeued.append(item)` immediately after `self.queue.get()` so that we don't wait for it to show up

(cherry picked from commit bc9372e88f0c8855694431f811702d7fb899a97e)
 2020-08-29 12:25:33 -04:00
OzzieIsaacs
9e5cad0dc8 Merge new worker thread 2020-08-29 11:14:52 +02:00
blitzmann
4cb82ea9bd Revert testing condition that decreased number of tasks kept 2020-08-27 21:49:55 -04:00
blitzmann
572ac4a17b Fix for deleting old, completed tasks 
(cherry picked from commit e066d7a4b0f47d3327696a11795cdc923ff0f6f3)
 2020-08-27 21:46:20 -04:00
Ozzie Isaacs
dc5191f8ba Added unrar binary is found on windows 2020-08-27 21:01:45 +02:00
Ozzie Isaacs
8ab5710098 Updated testresuts Windows 2020-08-26 21:43:58 +02:00
OzzieIsaacs
61d628d596 oauth problem solved 2020-08-26 18:22:56 +02:00
Sean Leonard
078fc25845
Remove Google+ OAuth scope 
The scope is no longer available per https://developers.google.com/+/api-shutdown

Fixes #1472 
Fixes #1573
 2020-08-26 08:56:56 -07:00
Marvel Renju
67eb4b317a Fix typo 
google oauth provider obtain link was pointing to github
 2020-08-26 03:15:39 +01: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
f3a3797850 Fail the convert task if the email subtask fails 2020-08-24 21:28:55 -04:00
blitzmann
5ec1283bb1 Remove threading for the calibre DB class 2020-08-24 21:03:59 -04:00
blitzmann
8634b0c6f0 Remove left over placeholder code 2020-08-24 21:00:15 -04:00
Ozzie Isaacs
d89830af61 Fix anonymous user has no modified_flag error 2020-08-24 21:00:13 +02:00
Ozzie Isaacs
ef1736b571 Fix error on guest user (view settings missing) 2020-08-24 20:38:06 +02:00
blitzmann
04081f62c4 Delete old worker thread class / logic 2020-08-23 23:34:41 -04:00
blitzmann
0f28dc5e55 Remove the queue stuff for CalibreDB (is no longer used) 2020-08-23 23:17:07 -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
bec280c6b1 Add some error handling 2020-08-23 21:51:44 -04:00
blitzmann
6a8ae9c0c4 Merge remote-tracking branch 'upstream/master' into tasks 
# Conflicts:
#	cps/helper.py
 2020-08-23 21:38:56 -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
OzzieIsaacs
cdaad2fb4a Merge branch 'master' into Develop 2020-08-23 21:23:00 +02:00
OzzieIsaacs
843279bacb Merge remote-tracking branch 'jef/jef/download-kobo' into master 2020-08-23 21:22:44 +02: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
OzzieIsaacs
f066926fc9 Merge branch 'master' into Develop 2020-08-23 10:56:10 +02:00
OzzieIsaacs
4c38b0ab10 Prepare for save name sort order 2020-08-23 10:56:00 +02: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
OzzieIsaacs
282859bc1b Merge remote-tracking branch 'github/master' into master 2020-08-22 15:38:40 +02:00
OzzieIsaacs
a3ae97a5a3 Fix #1574 (author name not shown in change book order in shelfs) 2020-08-22 15:37:40 +02:00
OzzieIsaacs
ed8275a20b Fix #1574 (author name not shown in change book order in shelfs) 2020-08-22 15:35:21 +02:00
OzzieIsaacs
f2add3f788 Migration of view settings working in User database 
Book Merge gives now feedback on what is done
 2020-08-22 10:27:09 +02:00
OzzieIsaacs
ad144922fb Merge with master 2020-08-22 09:23:29 +02:00
OzzieIsaacs
b9c0f2a3d3 Merge remote-tracking branch 'origin/master' into master 2020-08-21 19:27:19 +02:00
OzzieIsaacs
0cc07362b8 Fix for #1573 2020-08-21 19:26:58 +02:00
Brandon Ingli
4ee5dcaff3
Elevate Log Messages in web.py 
Elevates login failure log messages and register failure log messages from INFO to WARNING, "Unknown Error" to ERROR, and fixes misspelling of "address" in web.py log messages. Misspelling remains in variable names to avoid breaking changes.
 2020-08-17 11:29:10 -05:00
Ozzie Isaacs
4d44746a88 Change settings database gdrive watch to JSON 2020-08-15 15:07:03 +02:00
OzzieIsaacs
1535bdbcd8 Merge remote-tracking branch 'memorydatabase/issue/1564' 2020-08-15 12:08:59 +02:00
OzzieIsaacs
f9c6fb30bf Excluded series type again, as it causes problems upon reconnect 2020-08-14 19:43:54 +02:00
Ozzie Isaacs
94ad93ebd7 Added series like custom columns #1501 2020-08-11 18:56:34 +02:00
blitzmann
0e1ec5034e Fix for #1564 - using memory database in multiple threads. 
See also: https://docs.sqlalchemy.org/en/13/dialects/sqlite.html#using-a-memory-database-in-multiple-threads
 2020-08-11 12:44:55 -04:00
OzzieIsaacs
b309c1fc91 Fix filenames (Escape "\") for searching calibre excecutable on windows 2020-08-09 15:11:54 +02: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
Ryan Holmes
28bfb06c67
Revert the deletion of another line 
This was done by mistake, whoops!
 2020-08-09 00:57:30 -04:00
Ryan Holmes
704dcb3e58
Move assignment of new_coverpath 
With the assignment originally being within the try, if the try failed, the exception wouldn't have access to the value
 2020-08-09 00:55:56 -04:00
Ren Wei
4c6f5096be get metadata, typo, if no result from google, it will display the noresult msg, regardless of the others results. 2020-08-01 15:12:20 +08:00
Ozzie Isaacs
1a1d105fae Fix #1538 (Floating point numbers showing 2 decimals on details page 2020-07-23 19:31:48 +02:00
Ozzie Isaacs
42a0639bb5 Fix #1533 (Invalid LDAP Cert Path no longer crashes app) 2020-07-23 19:23:57 +02:00
Ozzie Isaacs
e27b08203d Fix #1531 (white background on transparent cover instead of black one) 2020-07-23 18:41:38 +02:00
Ozzie Isaacs
25fc6f1937 Further fixes for #1530 (Handle improper migrated database with config_mature_content_tags, allowed_tags, denied_tags, denied_column_value, allowed_column_value NULL instead of "") 2020-07-22 18:44:11 +02: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
Ozzie Isaacs
66acd1821d Update Gdrive integration (Error Handling on Callback and wording) 2020-07-21 18:01:38 +02:00
Ozzie Isaacs
93a0217d5f Fix for #1530 (Handle improper migrated database with config_mature_content_tags NULL instead of "") 2020-07-20 20:28:10 +02:00
Jef LeCompte
711a697570
Merge remote-tracking branch 'upstream/master' into jef/download-kobo 2020-07-13 01:50:38 -04:00
Ozzieisaacs
f8139f3198 Store last selected view for sidebar (not for categories, series, publishers, ..) 
Started making search paged
 2020-07-11 12:09:34 +02:00
Ozzieisaacs
df01022f49 Added save user view settings 2020-07-08 21:18:38 +02:00
Ozzieisaacs
450411a732 #1344 (Support Multiple authors, but not showing up on Kobo reader) 
Fix for #1439 (reading progress was not stored, as user login was wrong)
 2020-07-05 20:54:36 +02:00
Ozzieisaacs
f80c67828b Fix #1500 (Custom ratings of increment 0.5 are allowed) 2020-07-05 14:35:57 +02:00
Ozzieisaacs
d1889a5e06 Fix #1502 (program info only visible in about section if user is admin) 2020-07-05 14:00:40 +02:00
Ozzieisaacs
12263ff02f Fix #1423 (OverflowError thrown during sync on some Linux Systems if one of the timestamps is outside range 1970 to 2038) 2020-07-05 13:55:59 +02:00
Ozzieisaacs
76f914cbc2 Fixed logging in SyncToken 2020-07-05 13:52:29 +02:00
Ozzieisaacs
c1f5252b3f Fix #1509 (OSError thrown during sync on Windows if one of the timestamps is outside range 1970 to 2038) 2020-07-05 13:40:33 +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
ee6f1405d4 Fix #1456 (Added route to robots.txt) 2020-07-04 21:22:19 +02:00
Ozzieisaacs
ee3541d74e Fix kobo links for reverse proxies with subdomains (and docker?) #1470 2020-07-04 13:35:08 +02:00
Jef LeCompte
e048388213
feat(api): include external port option 
Signed-off-by: Jef LeCompte <jeffreylec@gmail.com>
 2020-07-03 12:58:58 -04:00
Ozzieisaacs
3ff3431b17 Merge branch 'master' into Develop 2020-06-30 19:59:38 +02:00
Ozzieisaacs
8608ff11f7 Fix #1507 (Password generation on python2 working again) 2020-06-30 19:58:07 +02:00
Ozzieisaacs
c6c9cfea22 Merging books basically working 2020-06-29 20:14:48 +02:00
Ozzieisaacs
a758976c69 Merge branch 'master' into Develop 2020-06-29 18:47:16 +02:00
OzzieIsaacs
601464083b Fix for task wrap around 2020-06-28 13:44:21 +02:00
Ozzieisaacs
ccca5d4d1c Merge branch 'master' into Develop 
# Conflicts:
#	cps/templates/layout.html
 2020-06-28 12:11:46 +02:00
Ozzieisaacs
ba10657829 Add fix for read only gdrive file 2020-06-28 12:06:27 +02:00
Ozzieisaacs
6315655f93 Re-add missing po files 2020-06-28 12:05:16 +02:00
Ozzieisaacs
533cb23b73 Merge remote-tracking branch 'next/bug/login-next-get-param' 2020-06-28 10:01:41 +02:00
Ozzieisaacs
852f252d13 Prevent invalid variable 
Make text in kobo_auth_screen consistent
 2020-06-28 09:48:05 +02:00
Ozzieisaacs
080042882f Merge remote-tracking branch 'cz/master' 2020-06-28 09:33:18 +02:00
Ozzieisaacs
dde5b08c47 Re enabled gevent as dependency 
Fix #1399 (Calibre-web starting with installed and not activated gdrive denpendencies without internet connection again)
 2020-06-27 13:36:33 +02:00
Ozzieisaacs
88d2c60ee8 Catch some errors related to non writable settings db 2020-06-27 13:22:16 +02:00
Ghighi Eftimie
eeff5a5d43 fix for hidden input 'next' on login form 2020-06-27 12:00:08 +03:00
Ozzieisaacs
a0b8cc21cc Fix #1503 (js error on login screen) 2020-06-23 15:07:14 +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
d0a3503d74 Fix #1493 (stay logged in with enabled remember token, use remember token) 2020-06-20 19:02:23 +02:00
Ozzieisaacs
59b78f9984 enable disabling of remember_me function 2020-06-20 15:41:26 +02:00
Ozzieisaacs
bf75f16169 Updated Chinese translation 2020-06-20 13:55:34 +02:00
Ozzieisaacs
2f833dc457 Fix login with remember me token 2020-06-20 13:46:12 +02:00
Ozzieisaacs
22344a3971 Improvements for delete book 2020-06-18 20:39:45 +02:00