mirror of
https://github.com/JonathanHerrewijnen/calibre-web.git
synced 2024-11-11 05:33:57 +00:00
Merge remote-tracking branch 'fix/fix_time' into Develop
This commit is contained in:
commit
6becca17bf
@ -21,6 +21,7 @@ import sys
|
|||||||
import base64
|
import base64
|
||||||
import os
|
import os
|
||||||
import uuid
|
import uuid
|
||||||
|
from datetime import datetime
|
||||||
from time import gmtime, strftime
|
from time import gmtime, strftime
|
||||||
try:
|
try:
|
||||||
from urllib import unquote
|
from urllib import unquote
|
||||||
@ -234,14 +235,14 @@ def create_book_entitlement(book):
|
|||||||
return {
|
return {
|
||||||
"Accessibility": "Full",
|
"Accessibility": "Full",
|
||||||
"ActivePeriod": {"From": current_time(),},
|
"ActivePeriod": {"From": current_time(),},
|
||||||
"Created": book.timestamp,
|
"Created": book.timestamp.strftime("%Y-%m-%dT%H:%M:%SZ"),
|
||||||
"CrossRevisionId": book_uuid,
|
"CrossRevisionId": book_uuid,
|
||||||
"Id": book_uuid,
|
"Id": book_uuid,
|
||||||
"IsHiddenFromArchive": False,
|
"IsHiddenFromArchive": False,
|
||||||
"IsLocked": False,
|
"IsLocked": False,
|
||||||
# Setting this to true removes from the device.
|
# Setting this to true removes from the device.
|
||||||
"IsRemoved": False,
|
"IsRemoved": False,
|
||||||
"LastModified": book.last_modified,
|
"LastModified": book.last_modified.strftime("%Y-%m-%dT%H:%M:%SZ"),
|
||||||
"OriginCategory": "Imported",
|
"OriginCategory": "Imported",
|
||||||
"RevisionId": book_uuid,
|
"RevisionId": book_uuid,
|
||||||
"Status": "Active",
|
"Status": "Active",
|
||||||
@ -397,6 +398,7 @@ def HandleUserRequest(dummy=None):
|
|||||||
@kobo.route("/v1/products/<dummy>/reviews", methods=["GET", "POST"])
|
@kobo.route("/v1/products/<dummy>/reviews", methods=["GET", "POST"])
|
||||||
@kobo.route("/v1/products/books/<dummy>", methods=["GET", "POST"])
|
@kobo.route("/v1/products/books/<dummy>", methods=["GET", "POST"])
|
||||||
@kobo.route("/v1/products/dailydeal", methods=["GET", "POST"])
|
@kobo.route("/v1/products/dailydeal", methods=["GET", "POST"])
|
||||||
|
@kobo.route("/v1/products", methods=["GET", "POST"])
|
||||||
def HandleProductsRequest(dummy=None):
|
def HandleProductsRequest(dummy=None):
|
||||||
log.debug("Unimplemented Products Request received: %s", request.base_url)
|
log.debug("Unimplemented Products Request received: %s", request.base_url)
|
||||||
return redirect_or_proxy_request()
|
return redirect_or_proxy_request()
|
||||||
|
Loading…
Reference in New Issue
Block a user