Commit Graph

24 Commits (master)

Author SHA1 Message Date
jvoisin 19b2a334e4 Remove unused imports 4 years ago
OzzieIsaacs bb03026589 Fixes from merge problems 4 years ago
OzzieIsaacs 3b8e5ddfb3 Merge remote-tracking branch 'worker/db' into Develop
# Conflicts:
#	cps/tasks/convert.py
4 years ago
Ozzieisaacs e3f4f24c3e Fixes for failed email and conversions with gdrive 4 years ago
Ozzieisaacs eb37e3a52b Fix UI Deelete Buttons in Edit Books page
Fix Conversion of multiple formats of one book in the queue with gdrive
4 years ago
Ozzieisaacs 23d66a0d68 Fix 4 years ago
Ozzieisaacs 0d64692c84 Fix for convert + email task with gdrive 4 years ago
blitzmann 76c724c783 Remove global session object, this is now wrapped in the CalibreDB class 4 years ago
Ozzieisaacs e32b017431 Revert "Test revert global Session"
This reverts commit 393869e538.
4 years ago
Ozzieisaacs 393869e538 Test revert global Session 4 years ago
OzzieIsaacs feacbe8ebd Possible Fix for database crash after adding new format and accessing calibre database afterwards 4 years ago
OzzieIsaacs 1a9a436cbe Fixed wrong translation string
Removed unused variables from callback in server.py
Update Testresults
4 years ago
OzzieIsaacs 62dd29d2f3 Renamed email to mail due to naming conflict in python2 4 years ago
OzzieIsaacs 9e5cad0dc8 Merge new worker thread 4 years ago
blitzmann f3a3797850 Fail the convert task if the email subtask fails 4 years ago
blitzmann 8634b0c6f0 Remove left over placeholder code 4 years ago
blitzmann ac22483f98 Add error handling to the email task within the convert task 4 years ago
blitzmann 59d56d5c83 py27 support (I think) and some clean up 4 years ago
blitzmann a000de0270 Some clean up 4 years ago
blitzmann bf41b04cfa Remove convert task from db.py - with the fixed from #1565, this no longer seems to be needed 4 years ago
blitzmann 9ce2e8ea53 Fix progress indication for emails that have been completed. 4 years ago
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) 4 years ago
blitzmann 2533c9c14e Continue converting tasks - email and upload tasks 4 years ago
blitzmann f10f0dada6 First working PoC with a new task structure 4 years ago