From 40c6ef3a189fe638cb07e32d0535cb504ba8f421 Mon Sep 17 00:00:00 2001
From: OzzieIsaacs <matthias1.knopp@googlemail.com>
Date: Fri, 24 Feb 2017 20:20:41 +0100
Subject: [PATCH] More generic aproach for postion of epub coverfile (#122)

---
 cps/epub.py                  | 21 ++++++++++++++-------
 cps/templates/book_edit.html | 17 -----------------
 2 files changed, 14 insertions(+), 24 deletions(-)

diff --git a/cps/epub.py b/cps/epub.py
index e6945d75..f9d46362 100644
--- a/cps/epub.py
+++ b/cps/epub.py
@@ -7,13 +7,14 @@ import os
 import uploader
 
 
-def extractCover(zip, coverFile, tmp_file_name):
+def extractCover(zip, coverFile, coverpath, tmp_file_name):
     if coverFile is None:
         return None
     else:
-        cf = zip.read("OPS/" + coverFile)
+        zipCoverPath = os.path.join(coverpath , coverFile).replace('\\','/')
+        cf = zip.read(zipCoverPath)
         prefix = os.path.splitext(tmp_file_name)[0]
-        tmp_cover_name = prefix + "." + coverFile
+        tmp_cover_name = prefix + '.' + os.path.basename(zipCoverPath)
         image = open(tmp_cover_name, 'wb')
         image.write(cf)
         image.close()
@@ -32,10 +33,11 @@ def get_epub_info(tmp_file_path, original_file_name, original_file_extension):
     txt = zip.read('META-INF/container.xml')
     tree = etree.fromstring(txt)
     cfname = tree.xpath('n:rootfiles/n:rootfile/@full-path', namespaces=ns)[0]
-
     cf = zip.read(cfname)
     tree = etree.fromstring(cf)
 
+    coverpath=os.path.dirname(cfname)
+
     p = tree.xpath('/pkg:package/pkg:metadata', namespaces=ns)[0]
 
     epub_metadata = {}
@@ -46,11 +48,16 @@ def get_epub_info(tmp_file_path, original_file_name, original_file_extension):
         else:
             epub_metadata[s] = "Unknown"
 
-    coversection = tree.xpath("/pkg:package/pkg:manifest/pkg:item[@id='cover']/@href", namespaces=ns)
+    coversection = tree.xpath("/pkg:package/pkg:manifest/pkg:item[@id='cover-image']/@href", namespaces=ns)
     if len(coversection) > 0:
-        coverfile = extractCover(zip, coversection[0], tmp_file_path)
+        coverfile = extractCover(zip, coversection[0], coverpath, tmp_file_path)
     else:
-        coverfile = None
+        coversection = tree.xpath("/pkg:package/pkg:manifest/pkg:item[@id='cover']/@href", namespaces=ns)
+        if len(coversection) > 0:
+            coverfile = extractCover(zip, coversection[0], coverpath, tmp_file_path)
+        else:
+            coverfile = None
+
     if epub_metadata['title'] is None:
         title = original_file_name
     else:
diff --git a/cps/templates/book_edit.html b/cps/templates/book_edit.html
index 16e1c0b9..32452dd8 100644
--- a/cps/templates/book_edit.html
+++ b/cps/templates/book_edit.html
@@ -109,28 +109,11 @@
   </form>
 </div>
 {% endif %}
-<div class="modal fade" id="metaModal" tabindex="-1" role="dialog" aria-labelledby="metaModalLabel">
-  <div class="modal-dialog" role="document">
-    <div class="modal-content">
-      <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-        <h4 class="modal-title" id="metaModalLabel">{{_('Get meta data')}}</h4>
-      </div>
-      <div class="modal-body" id="meta-info">
-        {{_("Loading...")}}
-      </div>
-      <div class="modal-footer">
-        <button type="button" class="btn btn-default" data-dismiss="modal">{{_('Close')}}</button>
-      </div>
-    </div>
-  </div>
-</div>
 {% endblock %}
 
 {% block js %}
 <script src="{{ url_for('static', filename='js/libs/typeahead.bundle.js') }}"></script>
 <script src="{{ url_for('static', filename='js/edit_books.js') }}"></script>
-<script src="{{ url_for('static', filename='js/douban_meta.js') }}"></script>
 {% endblock %}
 {% block header %}
 <link href="{{ url_for('static', filename='css/libs/typeahead.css') }}" rel="stylesheet" media="screen">