+from collections import defaultdict
from datetime import datetime, date, timedelta
import logging
import os
@active_tab('my')
@never_cache
def my(request):
+ last_books = sorted(request.session.get("wiki_last_books", {}).items(),
+ key=lambda x: x[1]['time'], reverse=True)
+ for k, v in last_books:
+ v['time'] = datetime.fromtimestamp(v['time'])
return render(request, 'catalogue/my_page.html', {
- 'last_books': sorted(request.session.get("wiki_last_books", {}).items(),
- key=lambda x: x[1]['time'], reverse=True),
-
+ 'last_books': last_books,
"logout_to": '/',
})
if request.method == "POST":
form = forms.DocumentsUploadForm(request.POST, request.FILES)
if form.is_valid():
- from fnpdjango.utils.text.slughifi import slughifi
+ from slugify import slugify
if request.user.is_authenticated():
creator = request.user
if filename[-1] == '/':
continue
title = os.path.basename(filename)[:-4]
- slug = slughifi(title)
+ slug = slugify(title)
if not (slug and filename.endswith('.xml')):
skipped_list.append(filename)
elif slug in slugs:
})
-@never_cache
-def book_xml(request, slug):
- book = get_object_or_404(Book, slug=slug)
+def serve_xml(request, book, slug):
if not book.accessible(request):
return HttpResponseForbidden("Not authorized.")
xml = book.materialize()
-
- response = http.HttpResponse(xml, content_type='application/xml', mimetype='application/wl+xml')
+ response = http.HttpResponse(xml, content_type='application/xml')
response['Content-Disposition'] = 'attachment; filename=%s.xml' % slug
return response
+@never_cache
+def book_xml(request, slug):
+ book = get_object_or_404(Book, slug=slug)
+ return serve_xml(request, book, slug)
+
+
+@never_cache
+def book_xml_dc(request, slug):
+ book = get_object_or_404(Book, dc_slug=slug)
+ return serve_xml(request, book, slug)
+
+
@never_cache
def book_txt(request, slug):
book = get_object_or_404(Book, slug=slug)
doc = book.wldocument()
text = doc.as_text().get_string()
- response = http.HttpResponse(text, content_type='text/plain', mimetype='text/plain')
+ response = http.HttpResponse(text, content_type='text/plain')
response['Content-Disposition'] = 'attachment; filename=%s.txt' % slug
return response
return HttpResponseForbidden("Not authorized.")
doc = book.wldocument(parse_dublincore=False)
- html = doc.as_html()
+ html = doc.as_html(options={'gallery': "'%s'" % book.gallery_url()})
html = html.get_string() if html is not None else ''
- # response = http.HttpResponse(html, content_type='text/html', mimetype='text/html')
+ # response = http.HttpResponse(html, content_type='text/html')
# return response
# book_themes = {}
# for fragment in book.fragments.all().iterator():
# TODO: move to celery
doc = book.wldocument()
# TODO: error handling
- pdf_file = doc.as_pdf()
+ pdf_file = doc.as_pdf(cover=True, ilustr_path=book.gallery_path())
from catalogue.ebook_utils import serve_file
return serve_file(pdf_file.get_filename(),
book.slug + '.pdf', 'application/pdf')
# TODO: move to celery
doc = book.wldocument()
# TODO: error handling
- epub = doc.as_epub().get_string()
- response = HttpResponse(mimetype='application/epub+zip')
+ epub = doc.as_epub(ilustr_path=book.gallery_path()).get_string()
+ response = HttpResponse(content_type='application/epub+zip')
response['Content-Disposition'] = 'attachment; filename=%s' % book.slug + '.epub'
response.write(epub)
return response
+@never_cache
+def book_mobi(request, slug):
+ book = get_object_or_404(Book, slug=slug)
+ if not book.accessible(request):
+ return HttpResponseForbidden("Not authorized.")
+
+ # TODO: move to celery
+ doc = book.wldocument()
+ # TODO: error handling
+ mobi = doc.as_mobi(ilustr_path=book.gallery_path()).get_string()
+ response = HttpResponse(content_type='application/x-mobipocket-ebook')
+ response['Content-Disposition'] = 'attachment; filename=%s' % book.slug + '.mobi'
+ response.write(mobi)
+ return response
+
+
@never_cache
def revision(request, slug, chunk=None):
try:
})
-@transaction.commit_on_success
+@transaction.atomic
@login_required
@require_POST
def chunk_mass_edit(request):
return HttpResponse("", content_type="text/plain")
-@transaction.commit_on_success
+@transaction.atomic
@login_required
@require_POST
def image_mass_edit(request):
return HttpResponseForbidden("Not authorized.")
try:
- book.publish(request.user)
+ protocol = 'https://' if request.is_secure() else 'http://'
+ book.publish(request.user, host=protocol + request.get_host())
except NotAuthorizedError:
return http.HttpResponseRedirect(reverse('apiclient_oauth'))
except BaseException, e:
def get_directory(self):
return "%s%s/" % (settings.IMAGE_DIR, self.object.gallery)
+
+
+def active_users_list(request):
+ since = date(date.today().year, 1, 1)
+ by_user = defaultdict(lambda: 0)
+ by_email = defaultdict(lambda: 0)
+ names_by_email = defaultdict(set)
+ for change_model in (Chunk.change_model, Image.change_model):
+ for c in change_model.objects.filter(
+ created_at__gte=since).order_by(
+ 'author', 'author_email', 'author_name').values(
+ 'author', 'author_name', 'author_email').annotate(
+ c=Count('author'), ce=Count('author_email')).distinct():
+ if c['author']:
+ by_user[c['author']] += c['c']
+ else:
+ by_email[c['author_email']] += c['ce']
+ if c['author_name'].strip():
+ names_by_email[c['author_email']].add(c['author_name'])
+ for user in User.objects.filter(pk__in=by_user):
+ by_email[user.email] += by_user[user.pk]
+ names_by_email[user.email].add("%s %s" % (user.first_name, user.last_name))
+
+ active_users = []
+ for email, count in by_email.items():
+ active_users.append((email, names_by_email[email], count))
+ active_users.sort(key=lambda x: -x[2])
+ return render(request, 'catalogue/active_users_list.html', {
+ 'users': active_users,
+ 'since': since,
+ })
+
+
fnp / redakcja.git / blobdiff