fnp
/
wolnelektury.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'pretty' of github.com:fnp/wolnelektury into pretty
[wolnelektury.git]
/
apps
/
api
/
handlers.py
diff --git
a/apps/api/handlers.py
b/apps/api/handlers.py
index
8f06dea
..
62708c9
100644
(file)
--- a/
apps/api/handlers.py
+++ b/
apps/api/handlers.py
@@
-93,15
+93,18
@@
class BookDetailHandler(BaseHandler):
"""
allowed_methods = ['GET']
"""
allowed_methods = ['GET']
- fields = ['title', 'parent'] + Book.f
ile_type
s + [
+ fields = ['title', 'parent'] + Book.f
ormat
s + [
'media', 'url'] + category_singular.keys()
@piwik_track
'media', 'url'] + category_singular.keys()
@piwik_track
- def read(self, request, slug):
- """ Returns details of a book, identified by a slug. """
+ def read(self, request, book):
+ """ Returns details of a book, identified by a slug and lang. """
+ kwargs = Book.split_urlid(book)
+ if not kwargs:
+ return rc.NOT_FOUND
try:
try:
- return Book.objects.get(
slug=slug
)
+ return Book.objects.get(
**kwargs
)
except Book.DoesNotExist:
return rc.NOT_FOUND
except Book.DoesNotExist:
return rc.NOT_FOUND
@@
-122,7
+125,7
@@
class AnonymousBooksHandler(AnonymousBaseHandler):
@classmethod
def href(cls, book):
""" Returns an URI for a Book in the API. """
@classmethod
def href(cls, book):
""" Returns an URI for a Book in the API. """
- return API_BASE + reverse("api_book", args=[book.
slug
])
+ return API_BASE + reverse("api_book", args=[book.
urlid()
])
@classmethod
def url(cls, book):
@classmethod
def url(cls, book):
@@
-202,7
+205,7
@@
def _file_getter(format):
else:
return ''
return get_file
else:
return ''
return get_file
-for format in Book.f
ile_type
s:
+for format in Book.f
ormat
s:
setattr(BooksHandler, format, _file_getter(format))
setattr(BooksHandler, format, _file_getter(format))
@@
-246,9
+249,8
@@
class TagsHandler(BaseHandler):
except KeyError, e:
return rc.NOT_FOUND
except KeyError, e:
return rc.NOT_FOUND
- tags = Tag.objects.filter(category=category_sng)
- tags = [t for t in tags if t.get_count() > 0]
- if tags:
+ tags = Tag.objects.filter(category=category_sng).exclude(book_count=0)
+ if tags.exists():
return tags
else:
return rc.NOT_FOUND
return tags
else:
return rc.NOT_FOUND
@@
-265,11
+267,18
@@
class FragmentDetailHandler(BaseHandler):
fields = ['book', 'anchor', 'text', 'url', 'themes']
@piwik_track
fields = ['book', 'anchor', 'text', 'url', 'themes']
@piwik_track
- def read(self, request,
slug
, anchor):
+ def read(self, request,
book
, anchor):
""" Returns details of a fragment, identified by book slug and anchor. """
""" Returns details of a fragment, identified by book slug and anchor. """
+ kwargs = Book.split_urlid(book)
+ if not kwargs:
+ return rc.NOT_FOUND
+
+ fragment_kwargs = {}
+ for field, value in kwargs.items():
+ fragment_kwargs['book__' + field] = value
try:
try:
- return Fragment.objects.get(
book__slug=slug, anchor=anchor
)
+ return Fragment.objects.get(
anchor=anchor, **fragment_kwargs
)
except Fragment.DoesNotExist:
return rc.NOT_FOUND
except Fragment.DoesNotExist:
return rc.NOT_FOUND
@@
-306,7
+315,7
@@
class FragmentsHandler(BaseHandler):
def href(cls, fragment):
""" Returns URI in the API for the fragment. """
def href(cls, fragment):
""" Returns URI in the API for the fragment. """
- return API_BASE + reverse("api_fragment", args=[fragment.book.
slug
, fragment.anchor])
+ return API_BASE + reverse("api_fragment", args=[fragment.book.
urlid()
, fragment.anchor])
@classmethod
def url(cls, fragment):
@classmethod
def url(cls, fragment):
@@
-354,8
+363,7
@@
class CatalogueHandler(BaseHandler):
def book_dict(book, fields=None):
all_fields = ['url', 'title', 'description',
'gazeta_link', 'wiki_link',
def book_dict(book, fields=None):
all_fields = ['url', 'title', 'description',
'gazeta_link', 'wiki_link',
- ] + Book.file_types + [
- 'mp3', 'ogg', 'daisy',
+ ] + Book.formats + BookMedia.formats + [
'parent', 'parent_number',
'tags',
'license', 'license_description', 'source_name',
'parent', 'parent_number',
'tags',
'license', 'license_description', 'source_name',
@@
-372,7
+380,7
@@
class CatalogueHandler(BaseHandler):
obj = {}
for field in fields:
obj = {}
for field in fields:
- if field in Book.f
ile_type
s:
+ if field in Book.f
ormat
s:
f = getattr(book, field+'_file')
if f:
obj[field] = {
f = getattr(book, field+'_file')
if f:
obj[field] = {
@@
-380,7
+388,7
@@
class CatalogueHandler(BaseHandler):
'size': f.size,
}
'size': f.size,
}
- elif field in
('mp3', 'ogg', 'daisy')
:
+ elif field in
BookMedia.formats
:
media = []
for m in book.media.filter(type=field):
media.append({
media = []
for m in book.media.filter(type=field):
media.append({
@@
-509,7
+517,7
@@
class CatalogueHandler(BaseHandler):
changed_at__gte=since,
changed_at__lt=until):
# only serve non-empty tags
changed_at__gte=since,
changed_at__lt=until):
# only serve non-empty tags
- if tag.
get_count()
:
+ if tag.
book_count
:
tag_d = cls.tag_dict(tag, fields)
updated.append(tag_d)
elif tag.created_at < since:
tag_d = cls.tag_dict(tag, fields)
updated.append(tag_d)
elif tag.created_at < since: