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
ecb160b28d
Merge remote-tracking branch 'pypy/fix-pypy3-settings-database-error'
2020-08-15 10:58:08 +02:00
OzzieIsaacs
7e9941def0
Updated test results
2020-08-14 21:02: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
Marvel Renju
76b0505bd9
Change all "conn = engine.connect()" statements to "with engine.connect() as conn:" in ub.py
...
Changed all the statements in ub.py to use python context managers so that conn.close() is called automatically. (https://docs.sqlalchemy.org/en/13/core/connections.html )
2020-08-10 03:42:36 +01:00
OzzieIsaacs
b309c1fc91
Fix filenames (Escape "\") for searching calibre excecutable on windows
2020-08-09 15:11:54 +02:00
OzzieIsaacs
b9a802a19c
Merge remote-tracking branch 'cover_path/patch-1'
2020-08-09 14:54:36 +02:00
OzzieIsaacs
a882ad3e65
Merge remote-tracking branch 'contrib/patch-1'
2020-08-09 14:52:01 +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
Efreak
a7e723d8d4
Spelling/grammar in CONTRIBUTING.md
2020-08-08 01:06:19 +00:00
Ozzie Isaacs
1a1d105fae
Fix #1538 (Floating point numbers showing 2 decimals on details page
2020-07-23 19:31:48 +02:00
