X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/3d1fb545dd1f49e0624d3adf20e5568b1c33d8ec..7ef55860a7a563f5218a91a4396a793fb127d43c:/apps/catalogue/views.py?ds=inline

diff --git a/apps/catalogue/views.py b/apps/catalogue/views.py
index d17c349c5..64aada533 100644
--- a/apps/catalogue/views.py
+++ b/apps/catalogue/views.py
@@ -129,27 +129,6 @@ def daisy_list(request):
                      template_name='catalogue/daisy_list.html')
 
 
-def counters(request):
-    form = forms.SearchForm()
-
-    books = models.Book.objects.count()
-    books_nonempty = models.Book.objects.exclude(html_file='').count()
-    books_empty = models.Book.objects.filter(html_file='').count()
-    books_root = models.Book.objects.filter(parent=None).count()
-
-    media = models.BookMedia.objects.count()
-    media_types = models.BookMedia.objects.values('type').\
-            annotate(count=Count('type')).\
-            order_by('type')
-    for mt in media_types:
-        mt['size'] = sum(b.file.size for b in models.BookMedia.objects.filter(type=mt['type']))
-        mt['deprecated'] = models.BookMedia.objects.filter(
-            type=mt['type'], source_sha1=None).count() if mt['type'] in ('mp3', 'ogg') else '-'
-
-    return render_to_response('catalogue/counters.html',
-                locals(), context_instance=RequestContext(request))
-
-
 def differentiate_tags(request, tags, ambiguous_slugs):
     beginning = '/'.join(tag.url_chunk for tag in tags)
     unparsed = '/'.join(ambiguous_slugs[1:])
@@ -293,6 +272,7 @@ def book_detail(request, slug):
         tag.count = theme_counter[tag.pk]
 
     extra_info = book.get_extra_info_value()
+    hide_about = extra_info.get('about', '').startswith('http://wiki.wolnepodreczniki.pl')
 
     projects = set()
     for m in book.media.filter(type='mp3'):
@@ -302,8 +282,8 @@ def book_detail(request, slug):
         if not project:
             # temporary fallback
             project = u'CzytamySłuchając'
-            
-        projects.add((project, meta.get('funded_by')))
+
+        projects.add((project, meta.get('funded_by', '')))
     projects = sorted(projects)
 
     form = forms.SearchForm()
@@ -626,7 +606,7 @@ def download_shelf(request, slug):
     if form.is_valid():
         formats = form.cleaned_data['formats']
     if len(formats) == 0:
-        formats = ['pdf', 'epub', 'odt', 'txt']
+        formats = ['pdf', 'epub', 'mobi', 'odt', 'txt']
 
     # Create a ZIP archive
     temp = tempfile.TemporaryFile()
@@ -637,6 +617,9 @@ def download_shelf(request, slug):
         if 'pdf' in formats and book.pdf_file:
             filename = book.pdf_file.path
             archive.write(filename, str('%s.pdf' % book.slug))
+        if 'mobi' in formats and book.mobi_file:
+            filename = book.mobi_file.path
+            archive.write(filename, str('%s.mobi' % book.slug))
         if book.root_ancestor not in already and 'epub' in formats and book.root_ancestor.epub_file:
             filename = book.root_ancestor.epub_file.path
             archive.write(filename, str('%s.epub' % book.root_ancestor.slug))
@@ -666,13 +649,15 @@ def shelf_book_formats(request, shelf):
     """
     shelf = get_object_or_404(models.Tag, slug=shelf, category='set')
 
-    formats = {'pdf': False, 'epub': False, 'odt': False, 'txt': False}
+    formats = {'pdf': False, 'epub': False, 'mobi': False, 'odt': False, 'txt': False}
 
     for book in collect_books(models.Book.tagged.with_all(shelf)):
         if book.pdf_file:
             formats['pdf'] = True
         if book.root_ancestor.epub_file:
             formats['epub'] = True
+        if book.mobi_file:
+            formats['mobi'] = True
         if book.txt_file:
             formats['txt'] = True
         for format in ('odt',):
@@ -779,29 +764,6 @@ def clock(request):
     return HttpResponse(datetime.now().strftime('%Y/%m/%d %H:%M:%S'))
 
 
-@cache.never_cache
-def xmls(request):
-    """"
-    Create a zip archive with all XML files.
-    This should be removed when we have real API.
-    """
-    temp = tempfile.TemporaryFile()
-    archive = zipfile.ZipFile(temp, 'w')
-
-    for book in models.Book.objects.all():
-        archive.write(book.xml_file.path, str('%s.xml' % book.slug))
-    archive.close()
-
-    response = HttpResponse(content_type='application/zip', mimetype='application/x-zip-compressed')
-    response['Content-Disposition'] = 'attachment; filename=xmls.zip'
-    response['Content-Length'] = temp.tell()
-
-    temp.seek(0)
-    response.write(temp.read())
-    return response
-
-
-
 # info views for API
 
 def book_info(request, id, lang='pl'):
@@ -811,6 +773,19 @@ def book_info(request, id, lang='pl'):
     return render_to_response('catalogue/book_info.html', locals(),
         context_instance=RequestContext(request))
 
+
 def tag_info(request, id):
     tag = get_object_or_404(models.Tag, id=id)
     return HttpResponse(tag.description)
+
+
+def download_zip(request, format, slug):
+    url = None
+    if format in ('pdf', 'epub', 'mobi'):
+        url = models.Book.zip_format(format)
+    elif format == 'audiobook' and slug is not None:
+        book = models.Book.objects.get(slug=slug)
+        url = book.zip_audiobooks()
+    else:
+        raise Http404('No format specified for zip package')
+    return HttpResponseRedirect(urlquote_plus(settings.MEDIA_URL + url, safe='/?='))