Add entry for publishers to the left menu (+ setting for showing / hiding) + separate publisher page

cps/templates/config_view_edit.html

@@ -143,6 +143,10 @@
               <input type="checkbox" name="show_author" id="show_author" {% if content.show_author() %}checked{% endif %}>
               <label for="show_author">{{_('Show author selection')}}</label>
           </div>
+          <div class="form-group">
+              <input type="checkbox" name="show_publisher" id="show_publisher" {% if content.show_publisher() %}checked{% endif %}>
+              <label for="show_publisher">{{_('Show publisher selection')}}</label>
+          </div>
           <div class="form-group">
               <input type="checkbox" name="show_read_and_unread" id="show_read_and_unread" {% if content.show_read_and_unread() %}checked{% endif %}>
               <label for="show_read_and_unread">{{_('Show read and unread')}}</label>

cps/templates/detail.html

@@ -120,13 +120,20 @@
 
       </div>
       {% endif %}
+
       {% if entry.publishers|length > 0 %}
       <div class="publishers">
-      <p>
-          <span>{{_('Publisher')}}:{% for publisher in entry.publishers %} {{publisher.name}}{% if not loop.last %},{% endif %}{% endfor %}</span>
-      </p>
+        <p>
+          <span>{{_('Publisher')}}:
+            {% for publisher in entry.publishers %}
+              <a href="{{url_for('publisher', book_id=publisher.id ) }}">{{publisher.name}}</a>
+              {% if not loop.last %},{% endif %}
+            {% endfor %}
+          </span>
+        </p>
       </div>
-      {% endif %}
+	    {% endif %}
+
       {% if entry.pubdate[:10] != '0101-01-01' %}
         <p>{{_('Publishing date')}}: {{entry.pubdate|formatdate}} </p>
       {% endif %}

cps/templates/layout.html

@@ -159,6 +159,9 @@
               {% if g.user.show_author() %}
               <li id="nav_author" {% if page == 'author' %}class="active"{% endif %}><a href="{{url_for('author_list')}}"><span class="glyphicon glyphicon-user"></span>{{_('Authors')}}</a></li>
               {%endif%}
+              {% if g.user.show_publisher() %}
+              <li id="nav_publisher" {% if page == 'publisher' %}class="active"{% endif %}><a href="{{url_for('publisher_list')}}"><span class="glyphicon glyphicon-text-size"></span>{{_('Publishers')}}</a></li>
+              {%endif%}
               {% if g.user.filter_language() == 'all' and g.user.show_language() %}
                 <li id="nav_lang" {% if page == 'language' %}class="active"{% endif %}><a href="{{url_for('language_overview')}}"><span class="glyphicon glyphicon-flag"></span>{{_('Languages')}} </a></li>
               {%endif%}

cps/templates/user_edit.html

@@ -89,6 +89,10 @@
           <input type="checkbox" name="show_author" id="show_author" {% if content.show_author() %}checked{% endif %}>
           <label for="show_author">{{_('Show author selection')}}</label>
       </div>
+      <div class="form-group">
+          <input type="checkbox" name="show_publisher" id="show_publisher" {% if content.show_publisher() %}checked{% endif %}>
+          <label for="show_publisher">{{_('Show publisher selection')}}</label>
+      </div>
       <div class="form-group">
           <input type="checkbox" name="show_read_and_unread" id="show_read_and_unread" {% if content.show_read_and_unread() %}checked{% endif %}>
           <label for="show_read_and_unread">{{_('Show read and unread')}}</label>

cps/ub.py

@@ -41,6 +41,7 @@ SIDEBAR_READ_AND_UNREAD = 256
 SIDEBAR_RECENT = 512
 SIDEBAR_SORTED = 1024
 MATURE_CONTENT = 2048
+SIDEBAR_PUBLISHER = 4096
 
 DEFAULT_PASS = "admin123"
 DEFAULT_PORT = int(os.environ.get("CALIBRE_PORT", 8083))
@@ -136,6 +137,9 @@ class UserBase:
     def show_author(self):
         return bool((self.sidebar_view is not None)and(self.sidebar_view & SIDEBAR_AUTHOR == SIDEBAR_AUTHOR))
 
+    def show_publisher(self):
+        return bool((self.sidebar_view is not None)and(self.sidebar_view & SIDEBAR_PUBLISHER == SIDEBAR_PUBLISHER))
+
     def show_best_rated_books(self):
         return bool((self.sidebar_view is not None)and(self.sidebar_view & SIDEBAR_BEST_RATED == SIDEBAR_BEST_RATED))
 
@@ -485,6 +489,10 @@ class Config:
         return bool((self.config_default_show is not None) and
                     (self.config_default_show & SIDEBAR_AUTHOR == SIDEBAR_AUTHOR))
 
+    def show_publisher(self):
+        return bool((self.config_default_show is not None) and
+                    (self.config_default_show & SIDEBAR_PUBLISHER == SIDEBAR_PUBLISHER))
+
     def show_best_rated_books(self):
         return bool((self.config_default_show is not None) and
                     (self.config_default_show & SIDEBAR_BEST_RATED == SIDEBAR_BEST_RATED))

cps/web.py

@@ -1415,6 +1415,31 @@ def author(book_id, page):
                                  title=name, author=author_info, other_books=other_books, page="author")
 
 
+@app.route("/publisher")
+@login_required_if_no_ano
+def publisher_list():
+    if current_user.show_publisher():
+        entries = db.session.query(db.Publishers, func.count('books_publishers_link.book').label('count'))\
+            .join(db.books_publishers_link).join(db.Books).filter(common_filters())\
+            .group_by('books_publishers_link.publisher').order_by(db.Publishers.sort).all()
+        return render_title_template('list.html', entries=entries, folder='publisher',
+                                     title=_(u"Publisher list"), page="publisherlist")
+    else:
+        abort(404)
+
+
+@app.route("/publisher/<int:book_id>", defaults={'page': 1})
+@app.route('/publisher/<int:book_id>/<int:page>')
+@login_required_if_no_ano
+def publisher(book_id, page):
+    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)
+
+    name = db.session.query(db.Publishers).filter(db.Publishers.id == book_id).first().name
+    return render_title_template('index.html', random=random, entries=entries, pagination=pagination,
+                                 title=_(u"Publisher: %(name)s", name=name), page="publisher")
+
+
 def get_unique_other_books(library_books, author_books):
     # Get all identifiers (ISBN, Goodreads, etc) and filter author's books by that list so we show fewer duplicates
     # Note: Not all images will be shown, even though they're available on Goodreads.com.
@@ -2774,6 +2799,8 @@ def profile():
             content.sidebar_view += ub.SIDEBAR_BEST_RATED
         if "show_author" in to_save:
             content.sidebar_view += ub.SIDEBAR_AUTHOR
+        if "show_publisher" in to_save:
+            content.sidebar_view += ub.SIDEBAR_PUBLISHER
         if "show_read_and_unread" in to_save:
             content.sidebar_view += ub.SIDEBAR_READ_AND_UNREAD
         if "show_detail_random" in to_save:
@@ -2884,6 +2911,8 @@ def view_configuration():
             content.config_default_show = content.config_default_show + ub.SIDEBAR_RANDOM
         if "show_author" in to_save:
             content.config_default_show = content.config_default_show + ub.SIDEBAR_AUTHOR
+        if "show_publisher" in to_save:
+            content.config_default_show = content.config_default_show + ub.SIDEBAR_PUBLISHER
         if "show_best_rated" in to_save:
             content.config_default_show = content.config_default_show + ub.SIDEBAR_BEST_RATED
         if "show_read_and_unread" in to_save: