From ad40a2b5a67df5d9cac7051c34f1a3f7467e56dd Mon Sep 17 00:00:00 2001 From: OzzieIsaacs Date: Fri, 17 Feb 2017 18:22:08 +0100 Subject: [PATCH 1/7] Bugfix parsing publishing date with milliseconds (#114) --- cps/web.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cps/web.py b/cps/web.py index 1c16f6ae..c119de05 100755 --- a/cps/web.py +++ b/cps/web.py @@ -283,7 +283,7 @@ def mimetype_filter(val): @app.template_filter('formatdate') def formatdate(val): conformed_timestamp = re.sub(r"[:]|([-](?!((\d{2}[:]\d{2})|(\d{4}))$))", '', val) - formatdate = datetime.datetime.strptime(conformed_timestamp[:-5], "%Y%m%d %H%M%S") + formatdate = datetime.datetime.strptime(conformed_timestamp[:15], "%Y%m%d %H%M%S") return format_date(formatdate, format='medium',locale=get_locale()) From 075c4c58e7adf174b2ba7347186c8260534b10fd Mon Sep 17 00:00:00 2001 From: Ozzie Isaacs Date: Fri, 17 Feb 2017 22:54:14 +0100 Subject: [PATCH 2/7] Revert os.rename to os.renames --- cps/helper.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cps/helper.py b/cps/helper.py index f9251147..00ec9553 100755 --- a/cps/helper.py +++ b/cps/helper.py @@ -263,7 +263,7 @@ def update_dir_stucture(book_id, calibrepath): if authordir != new_authordir: new_author_path = os.path.join(os.path.join(calibrepath, new_authordir), os.path.basename(path)) - os.rename(path, new_author_path) + os.renames(path, new_author_path) book.path = new_authordir + '/' + book.path.split('/')[1] db.session.commit() From e71264961233888fe90ec1acc25de01a1836d50d Mon Sep 17 00:00:00 2001 From: OzzieIsaacs Date: Sat, 18 Feb 2017 10:38:16 +0100 Subject: [PATCH 3/7] Improvement for #83, higher contrast of hamburger menu Improvement for #84, search is excluded from mobile view --- cps/static/css/style.css | 2 ++ cps/templates/layout.html | 24 +++++++++++++----------- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/cps/static/css/style.css b/cps/static/css/style.css index 071980b3..5e6ea314 100644 --- a/cps/static/css/style.css +++ b/cps/static/css/style.css @@ -36,6 +36,8 @@ span.glyphicon.glyphicon-tags {padding-right: 5px;color: #999;vertical-align: te -moz-box-shadow: 0 5px 8px -6px #777; box-shadow: 0 5px 8px -6px #777; } +.navbar-default .navbar-toggle .icon-bar {background-color: #000;} +.navbar-default .navbar-toggle {border-color: #000;} .btn-file {position: relative; overflow: hidden;} .btn-file input[type=file] {position: absolute; top: 0; right: 0; min-width: 100%; min-height: 100%; font-size: 100px; text-align: right; filter: alpha(opacity=0); opacity: 0; outline: none; background: white; cursor: inherit; display: block;} diff --git a/cps/templates/layout.html b/cps/templates/layout.html index 7e63b93b..71bd7941 100644 --- a/cps/templates/layout.html +++ b/cps/templates/layout.html @@ -52,17 +52,19 @@ Calibre Web + {% if g.user.is_authenticated or g.user.is_anonymous() %} + + {% endif %}
{% if g.user.is_authenticated or g.user.is_anonymous() %} {% endif %} @@ -80,11 +82,11 @@ {% endif %} {% endif %} {% if g.user.role_admin() %} -
  • {{_('Admin')}}
    • +
    • {% endif %} -
  • {{g.user.nickname}}
    • +
    • {% if not g.user.is_anonymous() %} -
  • {{_('Logout')}}
    • +
    • {% endif %} {% endif %} {% if g.allow_registration and not g.user.is_authenticated %} From 02b005854696747482688bd594fc79def77a7eb8 Mon Sep 17 00:00:00 2001 From: OzzieIsaacs Date: Sat, 18 Feb 2017 18:48:57 +0100 Subject: [PATCH 4/7] Updated wand (#116) --- vendor/wand/api.py | 8 ++++---- vendor/wand/drawing.py | 2 +- vendor/wand/exceptions.py | 30 +++++++++++++++++++++--------- vendor/wand/image.py | 11 +++++++++++ vendor/wand/version.py | 18 +++++++++--------- 5 files changed, 46 insertions(+), 23 deletions(-) diff --git a/vendor/wand/api.py b/vendor/wand/api.py index 19cf6d2e..2c18513d 100644 --- a/vendor/wand/api.py +++ b/vendor/wand/api.py @@ -180,8 +180,8 @@ try: libraries = load_library() except (OSError, IOError): msg = 'http://docs.wand-py.org/en/latest/guide/install.html' - if sys.platform.startswith('freebsd'): - msg = 'pkg_add -r' + if sys.platform.startswith(('dragonfly', 'freebsd')): + msg = 'pkg install' elif sys.platform == 'win32': msg += '#install-imagemagick-on-windows' elif sys.platform == 'darwin': @@ -1397,7 +1397,7 @@ try: library.MagickAutoOrientImage.argtypes = [ctypes.c_void_p] except AttributeError: # MagickAutoOrientImage was added in 6.8.9+, we have a fallback function - # so we pass silently if we cant import it + # so we pass silently if we cannot import it pass @@ -1418,7 +1418,7 @@ else: except OSError: # In case of El Capitan SIP libc = ctypes.cdll.LoadLibrary('/usr/lib/libc.dylib') - elif platform.system() == 'FreeBSD': + elif sys.platform.startswith(('dragonfly', 'freebsd')): libc = ctypes.cdll.LoadLibrary(ctypes.util.find_library('c')) else: libc = ctypes.cdll.LoadLibrary('libc.so.6') diff --git a/vendor/wand/drawing.py b/vendor/wand/drawing.py index 4581dd86..0b5663e6 100644 --- a/vendor/wand/drawing.py +++ b/vendor/wand/drawing.py @@ -1573,7 +1573,7 @@ class Drawing(Resource): def rectangle(self, left=None, top=None, right=None, bottom=None, width=None, height=None, radius=None, xradius=None, yradius=None): - """Draws a rectangle using the current :attr:`stoke_color`, + """Draws a rectangle using the current :attr:`stroke_color`, :attr:`stroke_width`, and :attr:`fill_color`. .. sourcecode:: text diff --git a/vendor/wand/exceptions.py b/vendor/wand/exceptions.py index ff241460..185414e4 100644 --- a/vendor/wand/exceptions.py +++ b/vendor/wand/exceptions.py @@ -18,16 +18,28 @@ class WandException(Exception): """All Wand-related exceptions are derived from this class.""" -class WandWarning(WandException, Warning): - """Base class for Wand-related warnings.""" +class BaseWarning(WandException, Warning): + """Base class for Wand-related warnings. + .. versionadded:: 0.4.4 -class WandError(WandException): - """Base class for Wand-related errors.""" + """ + + +class BaseError(WandException): + """Base class for Wand-related errors. + .. versionadded:: 0.4.4 + + """ -class WandFatalError(WandException): - """Base class for Wand-related fatal errors.""" + +class BaseFatalError(WandException): + """Base class for Wand-related fatal errors. + + .. versionadded:: 0.4.4 + + """ class WandLibraryVersionError(WandException): @@ -91,9 +103,9 @@ DOMAIN_MAP = [ #: (:class:`list`) The list of (base_class, suffix) pairs (for each code). #: It would be zipped with :const:`DOMAIN_MAP` pairs' last element. CODE_MAP = [ - (WandWarning, 'Warning'), - (WandError, 'Error'), - (WandFatalError, 'FatalError') + (BaseWarning, 'Warning'), + (BaseError, 'Error'), + (BaseFatalError, 'FatalError') ] diff --git a/vendor/wand/image.py b/vendor/wand/image.py index f94b2212..f73f8e3a 100644 --- a/vendor/wand/image.py +++ b/vendor/wand/image.py @@ -2757,6 +2757,17 @@ class Image(BaseImage): self.sequence = Sequence(self) self.raise_exception() + def destroy(self): + """Manually remove :class:`~.sequence.SingleImage`'s in + the :class:`~.sequence.Sequence`, allowing it to + be properly garbage collected after using a ``with Image()`` context + manager. + + """ + for i in range(0, len(self.sequence)): + self.sequence.pop() + super(Image, self).destroy() + def read(self, file=None, filename=None, blob=None, resolution=None): """Read new image into Image() object. diff --git a/vendor/wand/version.py b/vendor/wand/version.py index baf34fa0..4d918136 100644 --- a/vendor/wand/version.py +++ b/vendor/wand/version.py @@ -57,7 +57,7 @@ __all__ = ('VERSION', 'VERSION_INFO', 'MAGICK_VERSION', #: #: .. versionchanged:: 0.1.9 #: Becomes :class:`tuple`. (It was string before.) -VERSION_INFO = (0, 4, 3) +VERSION_INFO = (0, 4, 4) #: (:class:`basestring`) The version string e.g. ``'0.1.2'``. #: @@ -94,20 +94,20 @@ if libmagick: #: .. versionadded:: 0.2.1 MAGICK_VERSION_INFO = tuple(int(v or 0) for v in _match.groups()) - #: (:class:`datetime.date`) The release date of the linked ImageMagick - #: library. The same to the result of :c:func:`GetMagickReleaseDate` - #: function. + #: (:class:`basestring`) The date string e.g. ``'2012-06-03'`` of + #: :const:`MAGICK_RELEASE_DATE_STRING`. This value is the exactly same + #: string to the result of :c:func:`GetMagickReleaseDate` function. #: #: .. versionadded:: 0.2.1 MAGICK_RELEASE_DATE_STRING = text(libmagick.GetMagickReleaseDate()) - #: (:class:`basestring`) The date string e.g. ``'2012-06-03'`` of - #: :const:`MAGICK_RELEASE_DATE_STRING`. This value is the exactly same - #: string to the result of :c:func:`GetMagickReleaseDate` function. + _match = re.match(r'^(\d{4})-?(\d\d)-?(\d\d)$', MAGICK_RELEASE_DATE_STRING) + #: (:class:`datetime.date`) The release date of the linked ImageMagick + #: library. Equivalent to the result of :c:func:`GetMagickReleaseDate` + #: function. #: #: .. versionadded:: 0.2.1 - MAGICK_RELEASE_DATE = datetime.date( - *map(int, MAGICK_RELEASE_DATE_STRING.split('-'))) + MAGICK_RELEASE_DATE = datetime.date(*map(int, _match.groups())) c_quantum_depth = ctypes.c_size_t() libmagick.GetMagickQuantumDepth(ctypes.byref(c_quantum_depth)) From 3cadde6579070023995c5cc501be4ac58ed4eb06 Mon Sep 17 00:00:00 2001 From: OzzieIsaacs Date: Sat, 18 Feb 2017 20:12:07 +0100 Subject: [PATCH 5/7] Fix for (#117) --- cps/helper.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cps/helper.py b/cps/helper.py index 00ec9553..beee00c7 100755 --- a/cps/helper.py +++ b/cps/helper.py @@ -222,14 +222,14 @@ def get_valid_filename(value, replace_whitespace=True): if use_unidecode: value=(unidecode.unidecode(value)).strip() else: - value=value.replace('§','SS') - value=value.replace('ß','ss') + value=value.replace(u'§',u'SS') + value=value.replace(u'ß',u'ss') value = unicodedata.normalize('NFKD', value) re_slugify = re.compile('[\W\s-]', re.UNICODE) value = unicode(re_slugify.sub('', value).strip()) if replace_whitespace: #*+:\"/<>? werden durch _ ersetzt - value = re.sub('[\*\+:\\\"/<>\?]+', '_', value, flags=re.U) + value = re.sub('[\*\+:\\\"/<>\?]+', u'_', value, flags=re.U) value = value[:128] return value From 709fa88c628cffabcfaedf9a57927dc424cd6adf Mon Sep 17 00:00:00 2001 From: OzzieIsaacs Date: Mon, 20 Feb 2017 19:52:00 +0100 Subject: [PATCH 6/7] Navbar reduced to icons on smaller screens Feedback updater improved (#81) --- cps.py | 3 +- cps/helper.py | 256 ++++++++------- cps/static/css/style.css | 4 + cps/static/js/main.js | 68 +++- cps/templates/admin.html | 43 ++- cps/templates/layout.html | 2 +- cps/translations/de/LC_MESSAGES/messages.mo | Bin 297131 -> 297758 bytes cps/translations/de/LC_MESSAGES/messages.po | 300 +++++++++-------- cps/translations/es/LC_MESSAGES/messages.mo | Bin 297331 -> 297894 bytes cps/translations/es/LC_MESSAGES/messages.po | 300 +++++++++-------- cps/translations/fr/LC_MESSAGES/messages.mo | Bin 298502 -> 299049 bytes cps/translations/fr/LC_MESSAGES/messages.po | 300 +++++++++-------- cps/translations/pl/LC_MESSAGES/messages.mo | Bin 297016 -> 297558 bytes cps/translations/pl/LC_MESSAGES/messages.po | 302 ++++++++++-------- .../zh_Hans_CN/LC_MESSAGES/messages.mo | Bin 299192 -> 299763 bytes .../zh_Hans_CN/LC_MESSAGES/messages.po | 302 ++++++++++-------- cps/web.py | 60 ++-- messages.pot | 298 +++++++++-------- 18 files changed, 1297 insertions(+), 941 deletions(-) diff --git a/cps.py b/cps.py index 4c8bfbe2..00d0f356 100755 --- a/cps.py +++ b/cps.py @@ -3,7 +3,6 @@ import os import sys -import time base_path = os.path.dirname(os.path.abspath(__file__)) # Insert local directories into path @@ -22,7 +21,7 @@ if __name__ == '__main__': http_server.listen(web.ub.config.config_port) IOLoop.instance().start() - if web.global_task == 0: + if web.helper.global_task == 0: print("Performing restart of Calibre-web") os.execl(sys.executable, sys.executable, *sys.argv) else: diff --git a/cps/helper.py b/cps/helper.py index beee00c7..20d9402a 100755 --- a/cps/helper.py +++ b/cps/helper.py @@ -6,7 +6,7 @@ import ub from flask import current_app as app import logging import smtplib -import tempfile +from tempfile import gettempdir import socket import sys import os @@ -21,13 +21,22 @@ from email.MIMEText import MIMEText from email.generator import Generator from flask_babel import gettext as _ import subprocess +import threading import shutil +import requests +import zipfile +from tornado.ioloop import IOLoop + try: import unidecode use_unidecode=True except: use_unidecode=False +# Global variables +global_task = None +updater_thread = None + def update_download(book_id, user_id): check = ub.session.query(ub.Downloads).filter(ub.Downloads.user_id == user_id).filter(ub.Downloads.book_id == book_id).first() @@ -267,117 +276,146 @@ def update_dir_stucture(book_id, calibrepath): book.path = new_authordir + '/' + book.path.split('/')[1] db.session.commit() +class Updater(threading.Thread): -def file_to_list(file): - return [x.strip() for x in open(file, 'r') if not x.startswith('#EXT')] - -def one_minus_two(one, two): - return [x for x in one if x not in set(two)] - -def reduce_dirs(delete_files, new_list): - new_delete = [] - for file in delete_files: - parts = file.split(os.sep) - sub = '' - for i in range(len(parts)): - sub = os.path.join(sub, parts[i]) - if sub == '': - sub = os.sep - count = 0 - for song in new_list: - if song.startswith(sub): - count += 1 + def __init__(self): + threading.Thread.__init__(self) + self.status=0 + + def run(self): + global global_task + self.status=1 + r = requests.get('https://api.github.com/repos/janeczku/calibre-web/zipball/master', stream=True) + fname = re.findall("filename=(.+)", r.headers['content-disposition'])[0] + self.status=2 + z = zipfile.ZipFile(StringIO(r.content)) + self.status=3 + tmp_dir = gettempdir() + z.extractall(tmp_dir) + self.status=4 + self.update_source(os.path.join(tmp_dir,os.path.splitext(fname)[0]),ub.config.get_main_dir) + self.status=5 + global_task = 0 + db.session.close() + db.engine.dispose() + ub.session.close() + ub.engine.dispose() + self.status=6 + # stop tornado server + server = IOLoop.instance() + server.add_callback(server.stop) + self.status=7 + + def get_update_status(self): + return self.status + + def file_to_list(self, file): + return [x.strip() for x in open(file, 'r') if not x.startswith('#EXT')] + + def one_minus_two(self, one, two): + return [x for x in one if x not in set(two)] + + def reduce_dirs(self, delete_files, new_list): + new_delete = [] + for file in delete_files: + parts = file.split(os.sep) + sub = '' + for i in range(len(parts)): + sub = os.path.join(sub, parts[i]) + if sub == '': + sub = os.sep + count = 0 + for song in new_list: + if song.startswith(sub): + count += 1 + break + if count == 0: + if sub != '\\': + new_delete.append(sub) break - if count == 0: - if sub != '\\': - new_delete.append(sub) - break - return list(set(new_delete)) - -def reduce_files(remove_items, exclude_items): - rf = [] - for item in remove_items: - if not item in exclude_items: - rf.append(item) - return rf - -def moveallfiles(root_src_dir, root_dst_dir): - change_permissions = True - if sys.platform == "win32" or sys.platform == "darwin": - change_permissions=False - else: - app.logger.debug('Update on OS-System : '+sys.platform ) - #print('OS-System: '+sys.platform ) - new_permissions=os.stat(root_dst_dir) - #print new_permissions - for src_dir, dirs, files in os.walk(root_src_dir): - dst_dir = src_dir.replace(root_src_dir, root_dst_dir, 1) - if not os.path.exists(dst_dir): - os.makedirs(dst_dir) - #print('Create-Dir: '+dst_dir) - if change_permissions: - #print('Permissions: User '+str(new_permissions.st_uid)+' Group '+str(new_permissions.st_uid)) - os.chown(dst_dir,new_permissions.st_uid,new_permissions.st_gid) - for file_ in files: - src_file = os.path.join(src_dir, file_) - dst_file = os.path.join(dst_dir, file_) - if os.path.exists(dst_file): + return list(set(new_delete)) + + def reduce_files(self, remove_items, exclude_items): + rf = [] + for item in remove_items: + if not item in exclude_items: + rf.append(item) + return rf + + def moveallfiles(self, root_src_dir, root_dst_dir): + change_permissions = True + if sys.platform == "win32" or sys.platform == "darwin": + change_permissions = False + else: + app.logger.debug('Update on OS-System : ' + sys.platform) + # print('OS-System: '+sys.platform ) + new_permissions = os.stat(root_dst_dir) + # print new_permissions + for src_dir, dirs, files in os.walk(root_src_dir): + dst_dir = src_dir.replace(root_src_dir, root_dst_dir, 1) + if not os.path.exists(dst_dir): + os.makedirs(dst_dir) + # print('Create-Dir: '+dst_dir) if change_permissions: - permission=os.stat(dst_file) - #print('Remove file before copy: '+dst_file) - os.remove(dst_file) + # print('Permissions: User '+str(new_permissions.st_uid)+' Group '+str(new_permissions.st_uid)) + os.chown(dst_dir, new_permissions.st_uid, new_permissions.st_gid) + for file_ in files: + src_file = os.path.join(src_dir, file_) + dst_file = os.path.join(dst_dir, file_) + if os.path.exists(dst_file): + if change_permissions: + permission = os.stat(dst_file) + # print('Remove file before copy: '+dst_file) + os.remove(dst_file) + else: + if change_permissions: + permission = new_permissions + shutil.move(src_file, dst_dir) + # print('Move File '+src_file+' to '+dst_dir) + if change_permissions: + try: + os.chown(dst_file, permission.st_uid, permission.st_uid) + # print('Permissions: User '+str(new_permissions.st_uid)+' Group '+str(new_permissions.st_uid)) + except: + e = sys.exc_info() + # print('Fail '+str(dst_file)+' error: '+str(e)) + return + + def update_source(self, source, destination): + # destination files + old_list = list() + exclude = ( + ['vendor' + os.sep + 'kindlegen.exe', 'vendor' + os.sep + 'kindlegen', '/app.db', 'vendor', '/update.py']) + for root, dirs, files in os.walk(destination, topdown=True): + for name in files: + old_list.append(os.path.join(root, name).replace(destination, '')) + for name in dirs: + old_list.append(os.path.join(root, name).replace(destination, '')) + # source files + new_list = list() + for root, dirs, files in os.walk(source, topdown=True): + for name in files: + new_list.append(os.path.join(root, name).replace(source, '')) + for name in dirs: + new_list.append(os.path.join(root, name).replace(source, '')) + + delete_files = self.one_minus_two(old_list, new_list) + + rf = self.reduce_files(delete_files, exclude) + + remove_items = self.reduce_dirs(rf, new_list) + + self.moveallfiles(source, destination) + + for item in remove_items: + item_path = os.path.join(destination, item[1:]) + if os.path.isdir(item_path): + app.logger.debug("Delete dir " + item_path) + shutil.rmtree(item_path) else: - if change_permissions: - permission=new_permissions - shutil.move(src_file, dst_dir) - #print('Move File '+src_file+' to '+dst_dir) - if change_permissions: try: - os.chown(dst_file, permission.st_uid, permission.st_uid) - #print('Permissions: User '+str(new_permissions.st_uid)+' Group '+str(new_permissions.st_uid)) + app.logger.debug("Delete file " + item_path) + os.remove(item_path) except: - e = sys.exc_info() - #print('Fail '+str(dst_file)+' error: '+str(e)) - return - - -def update_source(source,destination): - # destination files - old_list=list() - exclude = (['vendor' + os.sep + 'kindlegen.exe','vendor' + os.sep + 'kindlegen','/app.db','vendor','/update.py']) - for root, dirs, files in os.walk(destination, topdown=True): - for name in files: - old_list.append(os.path.join(root, name).replace(destination, '')) - for name in dirs: - old_list.append(os.path.join(root, name).replace(destination, '')) - # source files - new_list = list() - for root, dirs, files in os.walk(source, topdown=True): - for name in files: - new_list.append(os.path.join(root, name).replace(source, '')) - for name in dirs: - new_list.append(os.path.join(root, name).replace(source, '')) - - delete_files = one_minus_two(old_list, new_list) - #print('raw delete list', delete_files) - - rf= reduce_files(delete_files, exclude) - #print('reduced delete list', rf) - - remove_items = reduce_dirs(rf, new_list) - #print('delete files', remove_items) - - moveallfiles(source, destination) - - for item in remove_items: - item_path = os.path.join(destination, item[1:]) - if os.path.isdir(item_path): - print("Delete dir "+ item_path) - shutil.rmtree(item_path) - else: - try: - print("Delete file "+ item_path) - os.remove(item_path) - except: - print("Could not remove:"+item_path) - shutil.rmtree(source, ignore_errors=True) + app.logger.debug("Could not remove:" + item_path) + shutil.rmtree(source, ignore_errors=True) diff --git a/cps/static/css/style.css b/cps/static/css/style.css index 5e6ea314..921a35ff 100644 --- a/cps/static/css/style.css +++ b/cps/static/css/style.css @@ -47,3 +47,7 @@ span.glyphicon.glyphicon-tags {padding-right: 5px;color: #999;vertical-align: te .btn-primary:hover, .btn-primary:focus, .btn-primary:active, .btn-primary.active, .open .dropdown-toggle.btn-primary{ background-color: #1C5484; } .btn-primary.disabled, .btn-primary[disabled], fieldset[disabled] .btn-primary, .btn-primary.disabled:hover, .btn-primary[disabled]:hover, fieldset[disabled] .btn-primary:hover, .btn-primary.disabled:focus, .btn-primary[disabled]:focus, fieldset[disabled] .btn-primary:focus, .btn-primary.disabled:active, .btn-primary[disabled]:active, fieldset[disabled] .btn-primary:active, .btn-primary.disabled.active, .btn-primary[disabled].active, fieldset[disabled] .btn-primary.active { background-color: #89B9E2; } .btn-toolbar>.btn+.btn, .btn-toolbar>.btn-group+.btn, .btn-toolbar>.btn+.btn-group, .btn-toolbar>.btn-group+.btn-group { margin-left:0px; } + +.spinner {margin:0 41%;} +.spinner2 {margin:0 41%;} + diff --git a/cps/static/js/main.js b/cps/static/js/main.js index a2d56c9e..74e1a1d8 100644 --- a/cps/static/js/main.js +++ b/cps/static/js/main.js @@ -1,3 +1,6 @@ +var displaytext; +var updateTimerID; +var updateText; $(function() { $('.discover .row').isotope({ @@ -31,7 +34,9 @@ $(function() { url: window.location.pathname+"/../../shutdown", data: {"parameter":0}, success: function(data) { - return alert(data.text);} + $('#spinner').show(); + displaytext=data.text; + window.setTimeout(restartTimer, 3000);} }); }); $("#shutdown").click(function() { @@ -50,17 +55,66 @@ $(function() { dataType: 'json', url: window.location.pathname+"/../../get_update_status", success: function(data) { - if (data.status == true) { - $("#check_for_update").addClass('hidden'); - $("#perform_update").removeClass('hidden'); - }else{ $("#check_for_update").html(button_text); - };} + if (data.status == true) { + $("#check_for_update").addClass('hidden'); + $("#perform_update").removeClass('hidden'); + $("#update_info").removeClass('hidden'); + $("#update_info").find('span').html(data.commit); + } + } + }); + }); + $("#perform_update").click(function() { + $('#spinner2').show(); + $.ajax({ + type: "POST", + dataType: 'json', + data: { start: "True"}, + url: window.location.pathname+"/../../get_updater_status", + success: function(data) { + updateText=data.text + $("#UpdateprogressDialog #Updatecontent").html(updateText[data.status]); + console.log(data.status); + updateTimerID=setInterval(updateTimer, 2000);} }); }); - }); + +function restartTimer() { + $('#spinner').hide(); + $('#RestartDialog').modal('hide'); +} + +function updateTimer() { + $.ajax({ + dataType: 'json', + url: window.location.pathname+"/../../get_updater_status", + success: function(data) { + console.log(data.status); + $("#UpdateprogressDialog #Updatecontent").html(updateText[data.status]); + if (data.status >6){ + clearInterval(updateTimerID); + $('#spinner2').hide(); + $('#UpdateprogressDialog #updateFinished').removeClass('hidden'); + $("#check_for_update").removeClass('hidden'); + $("#perform_update").addClass('hidden'); + } + }, + error: function() { + console.log('Done'); + clearInterval(updateTimerID); + $('#spinner2').hide(); + $("#UpdateprogressDialog #Updatecontent").html(updateText[7]); + $('#UpdateprogressDialog #updateFinished').removeClass('hidden'); + $("#check_for_update").removeClass('hidden'); + $("#perform_update").addClass('hidden'); + } + }); +} + + $(window).resize(function(event) { $('.discover .row').isotope('reLayout'); }); diff --git a/cps/templates/admin.html b/cps/templates/admin.html index 31c167ee..b386e4ff 100644 --- a/cps/templates/admin.html +++ b/cps/templates/admin.html @@ -2,6 +2,7 @@ {% block body %}

    {{_('User list')}}

    +
    @@ -76,11 +77,13 @@
    {{_('Configuration')}}

    {{_('Administration')}}

    {% if not development %} -

    {{_('Current commit timestamp')}}: {{commit}}

    -
    {{_('Restart Calibre-web')}}
    -
    {{_('Stop Calibre-web')}}
    -
    {{_('Check for update')}}
    - +
    {{_('Current commit timestamp')}}: {{commit}}
    + +

    +
    {{_('Restart Calibre-web')}}
    +
    {{_('Stop Calibre-web')}}
    +
    {{_('Check for update')}}
    + {% endif %} @@ -88,15 +91,17 @@
    -
    -
    +

    {{_('Do you really want to restart Calibre-web?')}}

    - + +

    +
    -
    - + {% endblock %} diff --git a/cps/templates/layout.html b/cps/templates/layout.html index 71bd7941..76553ace 100644 --- a/cps/templates/layout.html +++ b/cps/templates/layout.html @@ -65,7 +65,7 @@
    {% if g.user.is_authenticated or g.user.is_anonymous() %} {% endif %}
    {{_('Nickname')}}