mirrors/calibre-web
1
0
Fork 0
mirror of https://github.com/janeczku/calibre-web synced 2024-12-29 11:30:31 +00:00
Code Issues Releases Wiki Activity
3,983 Commits 4 Branches 24 Tags 103 MiB
eb6fbfc90c
Commit Graph

156 Commits

Author SHA1 Message Date
Ozzie Isaacs
5edde53fed Improved sync for kobo with additional table 2021-10-03 09:58:45 +02:00
Ozzie Isaacs
018f3ca250 Sort authors additionally to series and series_index (Fix #2001) 
Sqlalchemy version2 is now a global flag
 2021-07-26 07:52:01 +02:00
Ozzie Isaacs
616cc2018a Fix show cover 
Update more debug output for kobo sync
 2021-07-12 14:58:03 +02:00
Ozzie Isaacs
87f07003f4 Removed invalid code 
Sqlalchemy 2.0 compatibility for kobo sync
 2021-07-11 08:49:47 +02:00
Ozzie Isaacs
a56e071a19 Fix #2043 (Multiuser kobo sync with restrict to shelfs working) 
Sync only selected shelfs is stored correct on creating user
 2021-07-10 17:09:04 +02:00
Ozzie Isaacs
d95838309e Added config option for shelf sync behavior 2021-05-15 10:45:51 +02:00
Ozzieisaacs
02fc698f1c Some little code refactoring 2021-05-02 10:05:25 +02:00
Ozzieisaacs
8dc11e89bd Merge remote-tracking branch 'koko_sync/feature/kobo-shelf' into Develop 2021-05-02 09:43:47 +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
3c63f5b204 Merge branch 'master' into development 2021-03-27 09:46:12 +01:00
Gavin Mogan
c279055af4 Use the kobo auth'd version for download link when proxied -- Fixes #1908 2021-03-22 18:08:41 -07: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
9a963bbe79 Refactored code 
Testrun
 2021-03-15 13:10:17 +01:00
Ozzie Isaacs
8c751eb532 Some code cosmetics 2021-03-14 15:06:09 +01:00
alfred82santa
24bbf226a1 Sync reading state only for books on kobo shelves 2021-03-14 11:29:23 +01:00
alfred82santa
6014b04b2a Use BookShelf added_date as date reference 2021-02-08 20:10:12 +01:00
alfred82santa
8fe762709b Fix mistake 2021-02-06 21:15:36 +01:00
alfred82santa
a3f17deb17 Added options in order to synchronize only selected shelf on Kobo device 2021-02-06 20:29:43 +01:00
Ozzie Isaacs
9d7ef25062 Fix Kobo sync & Update Teststatus 2021-01-30 17:55:17 +01:00
Ozzie Isaacs
7fa5865cf6 Merge remote-tracking branch 'autoconv/kepub_autoconv' into development 
# Conflicts:
#	cps/kobo.py
#	cps/kobo_auth.py
 2021-01-30 14:47:18 +01:00
jvoisin
b8ab66369e Remove some unused imports 2021-01-07 17:59:08 +01:00
Ozzieisaacs
ca212c8737 Kobo sync limit set to 100 
Remove python2 support from readme
 2021-01-04 18:45:47 +01:00
OzzieIsaacs
56388145b5 Fixes from testrun 2021-01-03 15:40:17 +01:00
Ozzieisaacs
5cce01215f Code refactoring ub.session.commit() 
Code cosmentics admin.py
 2021-01-03 09:53:34 +01:00
Ozzieisaacs
dcab8af8ab Fixes for kobo sync 2020-12-09 09:41:23 +01:00
OzzieIsaacs
8f36128fe3 Merge branch 'session' into Develop 2020-12-08 11:49:39 +01:00
Ozzieisaacs
5e3618716d Fix missing session rollback on commit error 2020-12-07 19:53:34 +01:00
Ozzieisaacs
777c2726d3 Changed session_handing 2020-12-07 08:52:52 +01:00
Ozzieisaacs
c25afdc203 Chunked sync 2020-12-06 13:21:25 +01:00
Ozzieisaacs
c25f6d7c38 Prefer kepub in kobo sync 2020-12-06 06:01:10 +01:00
Ozzieisaacs
15bb0ce990 Fix for #1439 (send kepub file instead of epub for kobo epub3 request) 
Fix archived books are editable
 2020-12-04 19:23:36 +01:00
Ozzieisaacs
3372070a58 Fix change title regex 
Merge branch 'Develop' into master
 2020-12-02 11:09:55 +01:00
Jennifer Thakar
e2325f7ba4
Forward Overdrive requests to Kobo Store 
When loading books from OverDrive, Kobo readers make requests to `/v1/products/books/external/<overdrive ids>`.
This adds a route to forward these requests to the Kobo Store, so that OverDrive still works when using Calibre-Web's Kobo sync server.
 2020-11-22 15:06:37 -08:00
Ozzieisaacs
ba1c1c87c4 Merge remote-tracking branch 'kobo/feature/use-kobo-specific-download-urls' into Develop 2020-11-20 19:47:25 +01:00
Ozzieisaacs
58d485cbb5 Fix #1702 (invalid timestamps during kobo sync caused by malformed database) 2020-11-07 12:49:39 +01:00
Julian Naydichev
ae33aee3f6 When serving a download URL via KoboSync, use a URL that is specific to Kobo 2020-10-31 14:50:08 +01:00
jvoisin
19b2a334e4 Remove unused imports 2020-10-27 11:06:43 +01:00
norangebit
99d653eece
Add automatic conversion in kepub 
Automatic conversion from epub to kepub of new book on Kobo sync.
 2020-09-01 19:27:14 +02:00
OzzieIsaacs
843279bacb Merge remote-tracking branch 'jef/jef/download-kobo' into master 2020-08-23 21:22:44 +02:00
Jef LeCompte
711a697570
Merge remote-tracking branch 'upstream/master' into jef/download-kobo 2020-07-13 01:50:38 -04: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
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
73ad6dd0c4 Fix kobo sync (sync tags) 2020-05-23 14:40:50 +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
b75497231e Additional fix for #1407 (metadata.db is now held in memory, app.db is attached to it -> joins between both databases possible -> book_read_link is joined for getting result) 2020-05-21 09:28:35 +02:00
Ozzieisaacs
013793f989 Fix for #1391 (Kobo sync not working if series is given, but no series_index) 2020-05-17 10:46:48 +02:00
jvoisin
dd3b562f1a Change some links from http to https 2020-05-09 17:11:56 +02:00
Michael Shavit
e0fbfa44a4 Fix issue with cover images introduced during the merge of #1277. 2020-05-02 01:55:14 -04:00
Ozzieisaacs
b160a8de0b Merge branch 'master' into Develop 
# Conflicts:
#	cps/__init__.py
#	cps/comic.py
#	cps/editbooks.py
#	cps/helper.py
#	cps/kobo.py
#	cps/translations/nl/LC_MESSAGES/messages.mo
#	cps/translations/nl/LC_MESSAGES/messages.po
#	cps/ub.py
#	cps/uploader.py
#	cps/web.py
 2020-04-30 18:08:28 +02:00
Ozzieisaacs
2d92818613 Code cosmetics 2020-04-27 20:01:13 +02:00
Ozzieisaacs
8b8fe7a0ae bugfix on create shelv via kobo sync protocol 
bugfix for totally wrong json requests
prevent empty shelf names on kobo create shelf
Removed errorhandler 404
 2020-04-25 20:02:55 +02:00
Ozzieisaacs
e29f17ac46 Merge remote-tracking branch 'kobo/shelves' into Develop 
# Conflicts:
#	cps/kobo.py
#	cps/shelf.py
 2020-04-24 16:56:08 +02:00
Michael Shavit
06c15a792e Minor fixes to the Kobo shelves implementation (mostly typos) 2020-04-21 23:36:47 -04:00
Ozzieisaacs
24c743d23d Code cosmetics 2020-04-19 19:08:58 +02:00
Michael Shavit
41a3623fcc [Kobo] Add Shelf/Collection support. 
Implements the v1/library/tags set of endpoints to sync CalibreWeb
shelves with the Kobo device.
Drive-by: Refactors shelf.py to consolidate how user permissions are checked.
Drive-by: Fix issue with the sync endpoint that arrises when a book is
hard-deleted.
 2020-04-12 22:29:20 -04:00
Ozzieisaacs
3e1c34efe6 Merge remote-tracking branch 'fix/fix_covers' into Develop 2020-04-04 06:57:54 +02:00
Michael Shavit
7cb6801241 Fix issue with cover images. 2020-03-30 02:17:08 -04:00
Ozzieisaacs
f6c04b9b84 Merge branch 'master' into Develop 2020-03-29 16:48:56 +02:00
Michael Shavit
de0e27c512 Fix #1164 merge. 2020-03-12 20:09:26 -04:00
Ozzieisaacs
09e7d76c6f Merge remote-tracking branch 'kobo_book_delete' into Develop 
# Conflicts:
#	cps/kobo.py
#	cps/services/SyncToken.py
#	cps/templates/book_edit.html
#	cps/ub.py
 2020-03-12 20:43:39 +01:00
Ozzieisaacs
d597e05fa9 Merge remote-tracking branch 'reading_state' into Develop 
# Conflicts:
#	cps/kobo.py
 2020-03-12 20:35:24 +01:00
Ozzieisaacs
46b87dc7eb Fix for testability of kobo 2020-03-09 20:25:59 +01:00
Michael Shavit
ad564e25ca More fixes for Kobo Sync 
- Fix incorrect maintenance of the Synctoken timestamps.
- Fix issue where the SyncToken isn't included in the response when
kobo_proxying is disabled.
 2020-03-08 01:20:54 -05:00
Ozzieisaacs
d267338837 Fixes for Kobo sync 
Better output on upload cover
Fix for download after access to opds/fileformat
Fix osd search link
Added ratings to opds feed
Change for kobo sync for testing
 2020-03-07 11:07:43 +01:00
Michael Shavit
8e1641dac9 Add support for syncing Kobo reading state. 2020-03-01 22:01:05 -05:00
Ozzieisaacs
4e8b814ec2 Fix download URL for IPV6 2020-02-26 20:04:15 +01:00
Michael Shavit
cba3e62e71 Fix issue where books weren't correctly ordered by Date added on the 
Kobo device.
 2020-02-26 01:06:03 -05:00
Ozzieisaacs
372c284ad4 Merge branch 'master' into Develop 2020-02-22 16:24:06 +01:00
Ozzieisaacs
27a18d60a7 Merge remote-tracking branch 'fix/robust_proxy' into Develop 
# Conflicts:
#	cps/kobo.py
 2020-02-19 18:20:03 +01:00
Ozzieisaacs
6893635251 Handle kobo auth request 
Handle access from localhost for kobo
 2020-02-18 20:36:32 +01:00
Michael Shavit
7d99e21d0d Merge remote-tracking branch 'original/Develop' into kobo_book_delete 2020-02-17 14:49:42 -05:00
Michael Shavit
df3eb40e3c Make KoboStore proxying more robust. 
* Add a timeout to prevent hanging when the KoboStore isn't reachable.
* Add back a the dummy auth implementation for when proxying is
disabled.
* Return the dummy auth response as a fallback when failing to contact
the KoboStore.
* Don't contact the KoboStore during the /sync API call when proxying is
disabled.
 2020-02-17 14:37:02 -05:00
Ozzieisaacs
e3ddc16657 Fix opds login not working anymore (due to kobo sync protocol) 2020-02-16 14:25:15 +01:00
Ozzieisaacs
e44494aad0 Kobo sync enable/disable working 2020-01-27 20:32:37 +01:00
Michael Shavit
dc7aaae235 Now that CalibreWeb delete requests are respected, we can forward 
them to the KoboStore for books that aren't in Calibre.

Note: There's still an edge case where a book is removed from Calibre
without first being archived, in which case the delete call will fail.
 2020-01-26 16:01:27 -05:00
Michael Shavit
9804a98af8 Merge remote-tracking branch 'original/Develop' into kobo_book_delete 2020-01-26 15:58:57 -05:00
Ozzieisaacs
0411d4a8c9 Added 2 new kobo settings: Enable Kobo Sync (currently not working) and proxy Requests to Kobo 
Added fix for kobo reader generating requests without right port number, causing url_for not working correct
 2020-01-26 16:52:40 +01:00
Ozzieisaacs
a986faea56 Merge remote-tracking branch 'fix/fix_creation_time' into Develop 2020-01-26 16:50:38 +01:00
Ozzieisaacs
0955c6d6fb Update Kobo 2020-01-26 14:42:53 +01:00
Michael Shavit
a6f4db0f25 Fix bug where last_created is incorectly set in the SyncToken. 2020-01-26 00:32:05 -05:00
Michael Shavit
4547c328bc Delete/Restore book from Kobo device upon (un)archiving of a book in the web UI. 2020-01-26 00:29:36 -05:00
Michael Shavit
5027aeb3a0 Fix bug where last_created is incorectly set in the SyncToken. 2020-01-26 00:29:36 -05:00
Michael Shavit
e404da4192 Add support for book 'deletion' (i.e archiving) from a Kobo device. 2020-01-26 00:16:55 -05:00
Ozzieisaacs
cd9bb56db5 Cleanup Kobo integration 2020-01-20 06:14:53 +01:00
Ozzieisaacs
79a9ef4859 Make Kobo optional 
move jsonschema dependency to optional-requirements.txt
Added version of jsonschema to about section
Added additional column to RemoteAuthToken table
Update configuration of Kobo sync protocol
 2020-01-12 13:42:39 +01:00
Ozzieisaacs
1c630eb604 fixes from tests 2019-12-30 15:16:09 +01:00
Ozzieisaacs
288944db2c Merge remote-tracking branch 'kobo_sync/kobo' into Develop 
# Conflicts:
#	cps.py
#	cps/kobo.py
#	cps/kobo_auth.py
#	cps/ub.py
 2019-12-20 19:24:31 +01:00
Ozzieisaacs
f2c07d8f81 Update Kobo sync 2019-12-20 19:17:08 +01:00
Michael Shavit
d6a9746824 Add a filter to the Sync request endpoint to ignore books that don't 
have any formats supported by the device.
 2019-12-20 01:28:53 -05:00
Michael Shavit
2118d920f5 Formatter. 2019-12-20 01:04:12 -05:00
Michael Shavit
207004beff Remove config_server_url setting. 2019-12-20 01:02:49 -05:00
Michael Shavit
27d084ce39 Remove the KoboUserKey-based Authentication. 
Instead, the user generates the api_endpoint url to set on their device
by visiting http://.../kobo_auth/generate_auth_token.
The generated url will contain a RemoteAuthorizationToken that will be
included on all subsequent requests from the device to the kobo/
endpoints. (In contrast, the device is authenticated using a session cookie on
requests to the download endpoint).

Also use Flask.url_for to generate download urls.
 2019-12-20 00:55:53 -05:00
Ozzieisaacs
f705889c23 Inital Kobo 2019-12-17 20:28:20 +01:00
Michael Shavit
040d7d9ae3 Remove unused import and fix python3 compatibility, as per Ozielsaacs comments. 2019-12-11 00:12:35 -05:00
Michael Shavit
f9b1e84704 Remove backblaze leftovers 2019-12-10 23:57:53 -05:00
Michael Shavit
55c0bb6d34 Set the "Size" attribute for Kobo download_urls, and refactor the code 
to eventually allow formats other than KEPUB.
 2019-12-08 17:28:25 -05:00
Michael Shavit
2b55b9b250 Use the login_user Cookie to authorize download requests instead of 
passing the UserKey over url params.
 2019-12-08 15:33:57 -05:00