Fix updater

Update translations
Code cleaning updater

cps/admin.py

@@ -766,9 +766,6 @@ def get_updater_status():
             status['status'] = updater_thread.get_update_status()
             if status['status']  == -1:
                 status['status'] = 7
-        except AttributeError:
-            # thread is not active, occurs after restart on update
-            status['status'] = 7
         except Exception:
             status['status'] = 11
     return json.dumps(status)

cps/templates/index.html

@@ -64,11 +64,11 @@ web.    {% for entry in random %}
       <a id="desc" class="btn btn-primary" href="{{url_for('web.books_list', data=page, sort='zyx')}}"><span class="glyphicon glyphicon-font"></span><span class="glyphicon glyphicon-sort-by-alphabet-alt"></span></a>
       <a id="pub_new" class="btn btn-primary" href="{{url_for('web.books_list', data=page, sort='pubnew')}}"><span class="glyphicon glyphicon-calendar"></span><span class="glyphicon glyphicon-sort-by-order"></span></a>
       <a id="pub_old" class="btn btn-primary" href="{{url_for('web.books_list', data=page, sort='pubold')}}"><span class="glyphicon glyphicon-calendar"></span><span class="glyphicon glyphicon-sort-by-order-alt"></span></a>
-      <div class="btn-group character" role="group">
-        <a id="no_shelf" class="btn btn-primary" href="{{url_for('web.books_list', data=page, sort='pubold')}}"><span class="glyphicon glyphicon-list"></span><b>?</b></a>
-        <div id="all" class="btn btn-primary">{{_('All')}}</div>
     </div>
+        <div class="btn-group character">
+        <a id="no_shelf" class="btn btn-primary" href="{{url_for('web.books_list', data=page, sort='pubold')}}"><span class="glyphicon glyphicon-list"></span><b>{{_('Group by series')}}</b></a>
       </div>
+
   <div class="row">
     {% if entries[0] %}
     {% for entry in entries %}

cps/templates/search.html

@@ -28,6 +28,18 @@
           </div>
         {% endif %}
       {% endif %}
+      <div class="filterheader hidden-xs hidden-sm"><!-- ToDo: Implement filter for search results -->
+        <a id="new" class="btn btn-primary" href="{{url_for('web.books_list', data=page, sort='new')}}"><span class="glyphicon glyphicon-sort-by-order"></span></a>
+        <a id="old" class="btn btn-primary" href="{{url_for('web.books_list', data=page, sort='old')}}"><span class="glyphicon glyphicon-sort-by-order-alt"></span></a>
+        <a id="asc" class="btn btn-primary" href="{{url_for('web.books_list', data=page, sort='abc')}}"><span class="glyphicon glyphicon-font"></span><span class="glyphicon glyphicon-sort-by-alphabet"></span></a>
+        <a id="desc" class="btn btn-primary" href="{{url_for('web.books_list', data=page, sort='zyx')}}"><span class="glyphicon glyphicon-font"></span><span class="glyphicon glyphicon-sort-by-alphabet-alt"></span></a>
+        <a id="pub_new" class="btn btn-primary" href="{{url_for('web.books_list', data=page, sort='pubnew')}}"><span class="glyphicon glyphicon-calendar"></span><span class="glyphicon glyphicon-sort-by-order"></span></a>
+        <a id="pub_old" class="btn btn-primary" href="{{url_for('web.books_list', data=page, sort='pubold')}}"><span class="glyphicon glyphicon-calendar"></span><span class="glyphicon glyphicon-sort-by-order-alt"></span></a>
+      </div>
+      <div class="btn-group character" role="group">
+        <a id="no_shelf" class="btn btn-primary" href="{{url_for('web.books_list', data=page, sort='pubold')}}"><span class="glyphicon glyphicon-list"></span><b>?</b></a>
+        <div id="all" class="btn btn-primary">{{_('All')}}</div>
+      </div>
   {% endif %}
 
   <div class="row">

cps/updater.py

@@ -230,6 +230,7 @@ class Updater(threading.Thread):
                     app.logger.debug("Could not remove:" + item_path)
         shutil.rmtree(source, ignore_errors=True)
 
+    @classmethod
     def _nightly_version_info(self):
         content = {}
         content[0] = '$Format:%H$'
@@ -240,6 +241,7 @@ class Updater(threading.Thread):
             return {'version': content[0], 'datetime': content[1]}
         return False
 
+    @classmethod
     def _stable_version_info(self):
         return {'version': '0.6.1'} # Current version
 
@@ -341,58 +343,6 @@ class Updater(threading.Thread):
                 status['message'] = _(u'Could not fetch update information')
 
             # a new update is available
-            status['update'] = True
-            if 'body' in commit:
-                status['success'] = True
-                status['message'] = _(
-                    u'A new update is available. Click on the button below to update to the latest version.')
-
-                new_commit_date = datetime.datetime.strptime(
-                    commit['committer']['date'], '%Y-%m-%dT%H:%M:%SZ') - tz
-                parents.append(
-                    [
-                        format_datetime(new_commit_date, format='short', locale=get_locale()),
-                        commit['message'],
-                        commit['sha']
-                    ]
-                )
-
-                # it only makes sense to analyze the parents if we know the current commit hash
-                if status['current_commit_hash'] != '':
-                    try:
-                        parent_commit = commit['parents'][0]
-                        # limit the maximum search depth
-                        remaining_parents_cnt = 10
-                    except IndexError:
-                        remaining_parents_cnt = None
-
-                    if remaining_parents_cnt is not None:
-                        while True:
-                            if remaining_parents_cnt == 0:
-                                break
-
-                            # check if we are more than one update behind if so, go up the tree
-                            if commit['sha'] != status['current_commit_hash']:
-                                try:
-                                    headers = {'Accept': 'application/vnd.github.v3+json'}
-                                    r = requests.get(parent_commit['url'], headers=headers)
-                                    r.raise_for_status()
-                                    parent_data = r.json()
-
-                                    parent_commit_date = datetime.datetime.strptime(
-                                        parent_data['committer']['date'], '%Y-%m-%dT%H:%M:%SZ') - tz
-                                    parent_commit_date = format_datetime(
-                                        parent_commit_date, format='short', locale=get_locale())
-
-                                    parents.append([parent_commit_date, parent_data['message'], parent_data['sha']])
-                                    parent_commit = parent_data['parents'][0]
-                                    remaining_parents_cnt -= 1
-                                except Exception:
-                                    # it isn't crucial if we can't get information about the parent
-                                    break
-                            else:
-                                # parent is our current version
-                                break
             status['history'] = parents[::-1]
             return json.dumps(status)
         return ''

cps/web.py

@@ -563,7 +563,7 @@ def author_list():
 # ToDo wrong order function
 def render_author_books(page, book_id, order):
     entries, __, pagination = fill_indexpage(page, db.Books, db.Books.authors.any(db.Authors.id == book_id),
-                                             [order[0], db.Series.name, db.Books.series_index], db.books_series_link, db.Series)
+                                             [db.Series.name, db.Books.series_index, order[0]], db.books_series_link, db.Series)
     if entries is None:
         flash(_(u"Error opening eBook. File does not exist or file is not accessible:"), category="error")
         return redirect(url_for("web.index"))
@@ -609,8 +609,7 @@ def publisher(book_id, page):
     if publisher:
         entries, random, pagination = fill_indexpage(page, db.Books,
                                                      db.Books.publishers.any(db.Publishers.id == book_id),
-                                                     (db.Series.name, db.Books.series_index), db.books_series_link,
-                                                     db.Series)
+                                                     [db.Books.series_index])
         return render_title_template('index.html', random=random, entries=entries, pagination=pagination,
                                      title=_(u"Publisher: %(name)s", name=publisher.name), page="publisher")
     else: