From 1a10859a57741c6214cd0207d75163aeb8b5fe76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9E=97=E6=AA=8E?= <apple@apples-MacBook-Pro.local>
Date: Fri, 3 Mar 2017 12:46:19 +0800
Subject: [PATCH] When upload pub, add description to comment accord opf file

---
 cps/book_formats.py |  2 ++
 cps/epub.py         | 12 +++++++++---
 cps/uploader.py     |  2 +-
 cps/web.py          |  9 ++++++++-
 4 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/cps/book_formats.py b/cps/book_formats.py
index a88e5e0e..934638fc 100644
--- a/cps/book_formats.py
+++ b/cps/book_formats.py
@@ -64,6 +64,7 @@ def default_meta(tmp_file_path, original_file_name, original_file_extension):
         tags="",
         series="",
         series_id="",
+        comments="",
         languages="")
 
 
@@ -93,6 +94,7 @@ def pdf_meta(tmp_file_path, original_file_name, original_file_extension):
         tags="",
         series="",
         series_id="",
+        comments="",
         languages="")
 
 
diff --git a/cps/epub.py b/cps/epub.py
index 6e42add9..7e0f5665 100644
--- a/cps/epub.py
+++ b/cps/epub.py
@@ -41,6 +41,12 @@ def get_epub_info(tmp_file_path, original_file_name, original_file_extension):
     p = tree.xpath('/pkg:package/pkg:metadata', namespaces=ns)[0]
 
     epub_metadata = {}
+    try:#maybe description isn't present
+        comments = tree.xpath("//*[local-name() = 'description']/text()")[0]
+        epub_metadata['comments'] = comments
+    except:
+        epub_metadata['comments'] = ""
+
     for s in ['title', 'description', 'creator']:
         tmp = p.xpath('dc:%s/text()' % s, namespaces=ns)
         if len(tmp) > 0:
@@ -62,6 +68,7 @@ def get_epub_info(tmp_file_path, original_file_name, original_file_extension):
         epub_metadata['languages'] = ""
 
     coversection = tree.xpath("/pkg:package/pkg:manifest/pkg:item[@id='cover-image']/@href", namespaces=ns)
+    coverfile = None
     if len(coversection) > 0:
         coverfile = extractCover(zip, coversection[0], coverpath, tmp_file_path)
     else:
@@ -84,9 +91,7 @@ def get_epub_info(tmp_file_path, original_file_name, original_file_extension):
                 meta_cover_content = tree.xpath("/pkg:package/pkg:manifest/pkg:item[@id='"+meta_cover[0]+"']/@href", namespaces=ns)
                 if len(meta_cover_content) > 0:
                     coverfile = extractCover(zip, meta_cover_content[0], coverpath, tmp_file_path)
-            else:
-                coverfile = None
-
+               
     if epub_metadata['title'] is None:
         title = original_file_name
     else:
@@ -102,4 +107,5 @@ def get_epub_info(tmp_file_path, original_file_name, original_file_extension):
         tags="",
         series="",
         series_id="",
+        comments=epub_metadata['comments'],
         languages=epub_metadata['languages'])
diff --git a/cps/uploader.py b/cps/uploader.py
index 2772e033..18e4bd43 100644
--- a/cps/uploader.py
+++ b/cps/uploader.py
@@ -7,7 +7,7 @@ import hashlib
 from collections import namedtuple
 import book_formats
 
-BookMeta = namedtuple('BookMeta', 'file_path, extension, title, author, cover, description, tags, series, series_id, languages')
+BookMeta = namedtuple('BookMeta', 'file_path, extension, title, author, cover, description, tags, series, series_id, comments, languages')
 
 """
  :rtype: BookMeta
diff --git a/cps/web.py b/cps/web.py
index 566e6fce..080e770e 100755
--- a/cps/web.py
+++ b/cps/web.py
@@ -5,7 +5,7 @@ import logging
 from logging.handlers import RotatingFileHandler
 import textwrap
 from flask import Flask, render_template, request, Response, redirect, url_for, send_from_directory, \
-    make_response, g, flash, abort
+    make_response, g, flash, abort, Markup
 from flask import __version__ as flaskVersion
 import ub
 from ub import config
@@ -2232,6 +2232,13 @@ def upload():
         db_book.data.append(db_data)
 
         db.session.add(db_book)
+        db.session.flush()# flush content get db_book.id avalible
+       #add comment
+        upload_comment = Markup(meta.comments).unescape()
+        db_comment = None
+        if upload_comment != "":
+            db_comment = db.Comments(upload_comment, db_book.id) 
+            db.session.add(db_comment)
         db.session.commit()
         if db_language is not None: #display Full name instead of iso639.part3
             db_book.languages[0].language_name = meta.languages