from django.conf import settings
from django.contrib.sites.models import Site
+from django.core.cache import get_cache
from django.core.urlresolvers import reverse
from piston.handler import AnonymousBaseHandler, BaseHandler
from piston.utils import rc
from api.models import Deleted
from catalogue.forms import BookImportForm
from catalogue.models import Book, Tag, BookMedia, Fragment
+from picture.models import Picture
+from picture.forms import PictureImportForm
from stats.utils import piwik_track
"""
allowed_methods = ['GET']
- fields = ['title', 'parent'] + Book.file_types + [
+ fields = ['title', 'parent'] + Book.formats + [
'media', 'url'] + category_singular.keys()
@piwik_track
def read(self, request, slug):
- """ Returns details of a book, identified by a slug. """
-
+ """ Returns details of a book, identified by a slug and lang. """
try:
return Book.objects.get(slug=slug)
except Book.DoesNotExist:
else:
return ''
return get_file
-for format in Book.file_types:
+for format in Book.formats:
setattr(BooksHandler, format, _file_getter(format))
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
@piwik_track
def read(self, request, slug, anchor):
""" Returns details of a fragment, identified by book slug and anchor. """
-
try:
return Fragment.objects.get(book__slug=slug, anchor=anchor)
except Fragment.DoesNotExist:
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.slug, fragment.anchor])
@classmethod
def url(cls, fragment):
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',
obj = {}
for field in fields:
- if field in Book.file_types:
+ if field in Book.formats:
f = getattr(book, field+'_file')
if f:
obj[field] = {
'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({
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:
def changes(cls, request=None, since=0, until=None, book_fields=None,
tag_fields=None, tag_categories=None):
until = cls.until(until)
+ since = int(since)
+
+ if not since:
+ cache = get_cache('api')
+ key = hash((book_fields, tag_fields, tag_categories,
+ tuple(sorted(request.GET.items()))
+ ))
+ value = cache.get(key)
+ if value is not None:
+ return value
changes = {
'time_checked': timestamp(until)
if field == 'time_checked':
continue
changes.setdefault(field, {})[model] = changes_by_type[model][field]
+
+ if not since:
+ cache.set(key, changes)
+
return changes
@piwik_track
def read(self, request, since):
return self.changes(request, since)
+
+
+class PictureHandler(BaseHandler):
+ model = Picture
+ fields = ('slug', 'title')
+ allowed_methods = ('POST',)
+
+ def create(self, request):
+ if not request.user.has_perm('picture.add_picture'):
+ return rc.FORBIDDEN
+
+ data = json.loads(request.POST.get('data'))
+ form = PictureImportForm(data)
+ if form.is_valid():
+ form.save()
+ return rc.CREATED
+ else:
+ return rc.NOT_FOUND