OzzieIsaacs
884270093b
Merge remote-tracking branch 'worker/tasks' into Develop
2020-08-31 13:00:13 +02:00
blitzmann
ef49e2b5b3
Revert daemon in favor of timeout
2020-08-30 13:49:45 -04:00
blitzmann
b0a055a870
Rename email.py -> mail.py to avoid shadowing standard email module
2020-08-30 13:31:59 -04:00
blitzmann
9b9e29a3b6
Implement worker thread as a daemon
2020-08-30 13:29:42 -04: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
d406d91856
Merge remote-tracking branch 'worker/tasks' into Develop
2020-08-30 08:32:09 +02:00
OzzieIsaacs
98494c610a
Merge branch 'master' into Develop
2020-08-30 08:31:35 +02:00
OzzieIsaacs
649a553fa4
Merge remote-tracking branch 'metadata/master' into master
2020-08-30 08:30:32 +02:00
OzzieIsaacs
e17a06d7bd
Merge remote-tracking branch 'oauth/oauth-typo' into master
2020-08-30 08:28:27 +02:00
OzzieIsaacs
4b14cc6a74
Merge remote-tracking branch 'oauth/oauth-typo' into Develop
2020-08-30 08:28:14 +02:00
OzzieIsaacs
65560ab65e
Merge remote-tracking branch 'google_oauth/patch-1' into master
2020-08-30 08:26:48 +02:00
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
fe91ed815e
Updated testresults with merged new worker
2020-08-29 12:46:12 +02:00
OzzieIsaacs
9e5cad0dc8
Merge new worker thread
2020-08-29 11:14:52 +02:00
OzzieIsaacs
36cbc42363
Better test output html file
2020-08-28 16:51:53 +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
6c552f6b43
Update tests Windows
2020-08-27 22:29:47 +02:00
Ozzie Isaacs
9723129436
Updated dependency comicapi version
2020-08-27 21:03:36 +02:00
Ozzie Isaacs
dc5191f8ba
Added unrar binary is found on windows
2020-08-27 21:01:45 +02:00
OzzieIsaacs
d79726899f
Updated testresult linux
2020-08-26 21:44:31 +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