diff --git a/.gitattributes b/.gitattributes
index a55b8b50..ff7c4955 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,3 +1,3 @@
-web.py ident export-subst
+helper.py ident export-subst
cps/static/css/libs/* linguist-vendored
cps/static/js/libs/* linguist-vendored
diff --git a/cps/cli.py b/cps/cli.py
index 5e172626..7f8d9ab3 100644
--- a/cps/cli.py
+++ b/cps/cli.py
@@ -44,5 +44,9 @@ if args.k:
print("Keyfilepath is invalid. Exiting...")
sys.exit(1)
+if (args.k and not args.c) or (not args.k and args.c):
+ print("Certfile and Keyfile have to be used together. Exiting...")
+ sys.exit(1)
+
if args.k is "":
keyfilepath = ""
diff --git a/cps/helper.py b/cps/helper.py
index 190e8d10..722a6245 100755
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -559,16 +559,11 @@ def is_sha1(sha1):
def get_current_version_info():
- try:
- with open('version', 'r') as f:
- content = f.readlines()
- content = [x.strip() for x in content]
-
- if len(content) != 2:
- return False
-
- if is_sha1(content[0]) and len(content[1]) > 0:
- return {'hash': content[0], 'datetime': content[1]}
- except FileNotFoundError:
- return False
+ content = {}
+ content[0] = '$Format:%H$'
+ content[1] = '$Format:%cI$'
+ # content[0] = 'bb7d2c6273ae4560e83950d36d64533343623a57'
+ # content[1] = '2018-09-09T10:13:08+02:00'
+ if is_sha1(content[0]) and len(content[1]) > 0:
+ return {'hash': content[0], 'datetime': content[1]}
return False
diff --git a/cps/server.py b/cps/server.py
index 37245b42..bf1c1923 100644
--- a/cps/server.py
+++ b/cps/server.py
@@ -5,6 +5,8 @@
from socket import error as SocketError
import sys
import os
+import signal
+
try:
from gevent.pywsgi import WSGIServer
from gevent.pool import Pool
@@ -26,7 +28,8 @@ class server:
restart= False
def __init__(self):
- pass
+ signal.signal(signal.SIGINT, self.killServer)
+ signal.signal(signal.SIGTERM, self.killServer)
def start_gevent(self):
try:
@@ -86,6 +89,9 @@ class server:
def setRestartTyp(self,starttyp):
self.restart=starttyp
+ def killServer(self, signum, frame):
+ self.stopServer()
+
def stopServer(self):
if gevent_present:
self.wsgiserver.close()
diff --git a/cps/templates/admin.html b/cps/templates/admin.html
index f46e6f0a..b7d23db1 100644
--- a/cps/templates/admin.html
+++ b/cps/templates/admin.html
@@ -96,8 +96,8 @@
{% if config.config_remote_login %}{% else %}{% endif %}
-
-
+
+
@@ -105,8 +105,8 @@
{{_('Administration')}}
{{_('Reconnect to Calibre DB')}}
-
{{_('Restart Calibre-Web')}}
-
{{_('Stop Calibre-Web')}}
+
{{_('Restart Calibre-Web')}}
+
{{_('Stop Calibre-Web')}}
@@ -122,8 +122,8 @@
- | {{commit}} ({{_('current version')}}) |
- / |
+ {{commit}} |
+ {{_('Current version')}} |
diff --git a/cps/templates/book_edit.html b/cps/templates/book_edit.html
index 46b0e815..e2907624 100644
--- a/cps/templates/book_edit.html
+++ b/cps/templates/book_edit.html
@@ -26,7 +26,7 @@
{% endif %}
{% endif %}
-{% if display_convertbtn and conversion_formats|length > 0 %}
+{% if source_formats|length > 0 and conversion_formats|length > 0 %}
{{_('Convert book format:')}}
{{_('Description:')}}
- {{entry.comments[0].text|safe}}
+
{% endif %}
diff --git a/cps/templates/layout.html b/cps/templates/layout.html
index 634a3426..8ccce35c 100644
--- a/cps/templates/layout.html
+++ b/cps/templates/layout.html
@@ -122,16 +122,16 @@
{{_('Recently Added')}}
{%endif%}
{% if g.user.show_sorted() %}
-
+
{{_('Sorted Books')}}
{%endif%}
@@ -139,13 +139,13 @@
{{_('Hot Books')}}
{%endif%}
{% if g.user.show_best_rated_books() %}
- {{_('Best rated Books')}}
+ {{_('Best rated Books')}}
{%endif%}
{% if g.user.show_read_and_unread() %}
{% if not g.user.is_anonymous %}
- {{_('Read Books')}}
+ {{_('Read Books')}}
{%endif%}
- {{_('Unread Books')}}
+ {{_('Unread Books')}}
{%endif%}
{% if g.user.show_random_books() %}
{{_('Discover')}}
@@ -165,11 +165,11 @@
{% if g.user.is_authenticated or g.user.is_anonymous %}
{{_('Public Shelves')}}
{% for shelf in g.public_shelfes %}
- {{shelf.name}}
+ {{shelf.name|shortentitle(40)}}
{% endfor %}
{{_('Your Shelves')}}
{% for shelf in g.user.shelf %}
- {{shelf.name}}
+ {{shelf.name|shortentitle(40)}}
{% endfor %}
{% if not g.user.is_anonymous %}
{{_('Create a Shelf')}}
diff --git a/cps/templates/register.html b/cps/templates/register.html
index bad6c47d..70bd10c7 100644
--- a/cps/templates/register.html
+++ b/cps/templates/register.html
@@ -7,15 +7,11 @@
-
-
+
{% if error %}
diff --git a/cps/templates/shelf.html b/cps/templates/shelf.html
index d70383ff..28cd20bb 100644
--- a/cps/templates/shelf.html
+++ b/cps/templates/shelf.html
@@ -4,9 +4,9 @@
{{title}}
{% if g.user.is_authenticated %}
{% if (g.user.role_edit_shelfs() and shelf.is_public ) or not shelf.is_public %}
- {{ _('Delete this Shelf') }}
- {{ _('Edit Shelf') }}
- {{ _('Change order') }}
+ {{ _('Delete this Shelf') }}
+ {{ _('Edit Shelf') }}
+ {{ _('Change order') }}
{% endif %}
{% endif %}
@@ -14,11 +14,13 @@
{% for entry in entries %}
diff --git a/cps/templates/shelf_edit.html b/cps/templates/shelf_edit.html
index 454a7c41..e9bc1523 100644
--- a/cps/templates/shelf_edit.html
+++ b/cps/templates/shelf_edit.html
@@ -14,7 +14,7 @@
{% endif %}
-
+
{% if shelf.id != None %}
{{_('Back')}}
{% endif %}
diff --git a/cps/templates/user_edit.html b/cps/templates/user_edit.html
index 5c6b308e..ecf8042e 100644
--- a/cps/templates/user_edit.html
+++ b/cps/templates/user_edit.html
@@ -22,8 +22,6 @@
) }})
-
- {% endif %}
+
+ {% if entry.has_cover %}
+  }})
+ {% endif %}
+
{{_('Description:')}}
+ {{entry.comments[0].text|safe}} +