multiple minor cover fixes

diff --git a/apps/cover/views.py b/apps/cover/views.py
index 19d81c2..0f341ad 100644 (file)
--- a/apps/cover/views.py
+++ b/apps/cover/views.py
@@ -1,7 +1,7 @@
 # Create your views here.
 import os.path
 from django.conf import settings
 # Create your views here.
 import os.path
 from django.conf import settings

-from django.http import HttpResponse, Http404
+from django.http import HttpResponse, HttpResponseRedirect, Http404

 from catalogue.models import Chunk
 from django.views.decorators.http import require_POST
 from django.views.decorators.csrf import csrf_exempt
 from catalogue.models import Chunk
 from django.views.decorators.http import require_POST
 from django.views.decorators.csrf import csrf_exempt


@@ -10,6 +10,7 @@ from django.shortcuts import render
 
 PREVIEW_SIZE = (216, 300)
 
 
 PREVIEW_SIZE = (216, 300)
 

+

 def preview(request, book, chunk=None, rev=None):
     """Creates a cover image.
 
 def preview(request, book, chunk=None, rev=None):
     """Creates a cover image.
 


@@ -31,8 +32,11 @@ def preview(request, book, chunk=None, rev=None):
         if revision is None:
             raise Http404
     xml = revision.materialize().encode('utf-8')
         if revision is None:
             raise Http404
     xml = revision.materialize().encode('utf-8')

-    
-    info = BookInfo.from_string(xml)
+
+    try:
+        info = BookInfo.from_string(xml)
+    except:
+        return HttpResponseRedirect(os.path.join(settings.STATIC_URL, "img/sample_cover.png"))

     cover = WLCover(info)
     response = HttpResponse(mimetype=cover.mime_type())
     image = cover.image().resize(PREVIEW_SIZE, Image.ANTIALIAS)
     cover = WLCover(info)
     response = HttpResponse(mimetype=cover.mime_type())
     image = cover.image().resize(PREVIEW_SIZE, Image.ANTIALIAS)


@@ -51,7 +55,10 @@ def preview_from_xml(request):
     from librarian.dcparser import BookInfo
 
     xml = request.POST['xml']
     from librarian.dcparser import BookInfo
 
     xml = request.POST['xml']

-    info = BookInfo.from_string(xml.encode('utf-8'))
+    try:
+        info = BookInfo.from_string(xml.encode('utf-8'))
+    except:
+        return HttpResponse(os.path.join(settings.STATIC_URL, "img/sample_cover.png"))

     coverid = sha1(etree.tostring(info.to_etree())).hexdigest()
     cover = WLCover(info)
 
     coverid = sha1(etree.tostring(info.to_etree())).hexdigest()
     cover = WLCover(info)
 


@@ -74,17 +81,21 @@ def flickr(request):
 
         html = urlopen(url).read()
         match = re.search(r'<a href="([^"]*)" rel="license cc:license">Some rights reserved</a>', html)
 
         html = urlopen(url).read()
         match = re.search(r'<a href="([^"]*)" rel="license cc:license">Some rights reserved</a>', html)

-        if match:
+        try:
+            assert match

             license_url = match.group(1)
             license_url = match.group(1)

-
-        re_license = re.compile(r'http://creativecommons.org/licenses/([^/]*)/([^/]*)/.*')
-        m = re_license.match(license_url)
-        if m:
+            re_license = re.compile(r'http://creativecommons.org/licenses/([^/]*)/([^/]*)/.*')
+            m = re_license.match(license_url)
+            assert m

             license_name = 'CC %s %s' % (m.group(1).upper(), m.group(2))
             license_name = 'CC %s %s' % (m.group(1).upper(), m.group(2))

+        except AssertionError:
+            license_name = 'NIEZNANA LICENCJA'

 
         m = re.search(r'<strong class="username">By <a href="[^"]*">([^<]*)</a></strong>', html)
         if m:
             author = m.group(1)
 
         m = re.search(r'<strong class="username">By <a href="[^"]*">([^<]*)</a></strong>', html)
         if m:
             author = m.group(1)

+        else:
+            author = "NIEZNANY AUTOR"

 
         url_size = url.rstrip('/') + '/sizes/o/'
         html = urlopen(url_size).read()
 
         url_size = url.rstrip('/') + '/sizes/o/'
         html = urlopen(url_size).read()

diff --git a/apps/wiki/templates/wiki/tabs/summary_view.html b/apps/wiki/templates/wiki/tabs/summary_view.html
index 3eff0fb..9a2c742 100644 (file)
--- a/apps/wiki/templates/wiki/tabs/summary_view.html
+++ b/apps/wiki/templates/wiki/tabs/summary_view.html
@@ -5,7 +5,11 @@
     <div id="summary-view">
        <div class="summary-cover-area">
                <p><img id="summary-cover" class="book-cover"
     <div id="summary-view">
        <div class="summary-cover-area">
                <p><img id="summary-cover" class="book-cover"

-                       {% if revision %}src="{% url cover_preview chunk.book.slug chunk.slug revision %}"{% endif %}></p>
+                       {% if revision %}
+                            src="{% url cover_preview chunk.book.slug chunk.slug revision %}"
+                       {% else %}
+                            src="{% url cover_preview chunk.book.slug chunk.slug %}"
+                       {% endif %}></p>

                <p><button id="summary-cover-refresh">{% trans "Refresh from working copy" %}</button></p>
                </div>
 
                <p><button id="summary-cover-refresh">{% trans "Refresh from working copy" %}</button></p>
                </div>
 

diff --git a/lib/librarian b/lib/librarian
index cdc2733..fed2483 160000 (submodule)
--- a/lib/librarian
+++ b/lib/librarian
@@ -1 +1 @@
-Subproject commit cdc273354769f4add5f2a6e01d5526a6130a517d
+Subproject commit fed2483b39e23ecd91ec2d04495a4caac208e94c

diff --git a/redakcja/static/css/summary.css b/redakcja/static/css/summary.css
index 1520c36..5111ad5 100644 (file)
--- a/redakcja/static/css/summary.css
+++ b/redakcja/static/css/summary.css
@@ -14,7 +14,7 @@
 
 #summary-view .book-cover {
        height: 300px;
 
 #summary-view .book-cover {
        height: 300px;

-       width: 212px;
+       width: 216px;

 }
 
 #summary-view p {
 }
 
 #summary-view p {

diff --git a/redakcja/static/img/sample_cover.png b/redakcja/static/img/sample_cover.png
index eb7e7d1..f7a678e 100644 (file)
Binary files a/redakcja/static/img/sample_cover.png and b/redakcja/static/img/sample_cover.png differ