Code cosmetics

cps/ub.py

@@ -64,10 +64,7 @@ class UserBase:
             return False
 
     def role_upload(self):
-        if self.role is not None:
+        return bool((self.role is not None)and(self.role & ROLE_UPLOAD == ROLE_UPLOAD))
-            return True if self.role & ROLE_UPLOAD == ROLE_UPLOAD else False
-        else:
-            return False
 
     def role_edit(self):
         if self.role is not None:
@@ -93,11 +90,11 @@ class UserBase:
         else:
             return False
 
-    @staticmethod
+    @classmethod
     def is_active(self):
         return True
 
-    @staticmethod
+    @classmethod
     def is_anonymous(self):
         return False
 
@@ -108,58 +105,31 @@ class UserBase:
         return self.default_language
 
     def show_random_books(self):
-        if self.sidebar_view is not None:
+        return bool((self.sidebar_view is not None)and(self.sidebar_view & SIDEBAR_RANDOM == SIDEBAR_RANDOM))
-            return True if self.sidebar_view & SIDEBAR_RANDOM == SIDEBAR_RANDOM else False
-        else:
-            return False
 
     def show_language(self):
-        if self.sidebar_view is not None:
+        return bool((self.sidebar_view is not None)and(self.sidebar_view & SIDEBAR_LANGUAGE == SIDEBAR_LANGUAGE))
-            return True if self.sidebar_view & SIDEBAR_LANGUAGE == SIDEBAR_LANGUAGE else False
-        else:
-            return False
 
     def show_hot_books(self):
-        if self.sidebar_view is not None:
+        return bool((self.sidebar_view is not None)and(self.sidebar_view & SIDEBAR_HOT == SIDEBAR_HOT))
-            return True if self.sidebar_view & SIDEBAR_HOT == SIDEBAR_HOT else False
-        else:
-            return False
 
     def show_series(self):
-        if self.sidebar_view is not None:
+        return bool((self.sidebar_view is not None)and(self.sidebar_view & SIDEBAR_SERIES == SIDEBAR_SERIES))
-            return True if self.sidebar_view & SIDEBAR_SERIES == SIDEBAR_SERIES else False
-        else:
-            return False
 
     def show_category(self):
-        if self.sidebar_view is not None:
+        return bool((self.sidebar_view is not None)and(self.sidebar_view & SIDEBAR_CATEGORY == SIDEBAR_CATEGORY))
-            return True if self.sidebar_view & SIDEBAR_CATEGORY == SIDEBAR_CATEGORY else False
-        else:
-            return False
 
     def show_author(self):
-        if self.sidebar_view is not None:
+        return bool((self.sidebar_view is not None)and(self.sidebar_view & SIDEBAR_AUTHOR == SIDEBAR_AUTHOR))
-            return True if self.sidebar_view & SIDEBAR_AUTHOR == SIDEBAR_AUTHOR else False
-        else:
-            return False
 
     def show_best_rated_books(self):
-        if self.sidebar_view is not None:
+        return bool((self.sidebar_view is not None)and(self.sidebar_view & SIDEBAR_BEST_RATED == SIDEBAR_BEST_RATED))
-            return True if self.sidebar_view & SIDEBAR_BEST_RATED == SIDEBAR_BEST_RATED else False
-        else:
-            return False
 
     def show_read_and_unread(self):
-        if self.sidebar_view is not None:
+        return bool((self.sidebar_view is not None)and(self.sidebar_view & SIDEBAR_READ_AND_UNREAD == SIDEBAR_READ_AND_UNREAD))
-            return True if self.sidebar_view & SIDEBAR_READ_AND_UNREAD == SIDEBAR_READ_AND_UNREAD else False
-        else:
-            return False
 
     def show_detail_random(self):
-        if self.sidebar_view is not None:
+        return bool((self.sidebar_view is not None)and(self.sidebar_view & DETAIL_RANDOM == DETAIL_RANDOM))
-            return True if self.sidebar_view & DETAIL_RANDOM == DETAIL_RANDOM else False
-        else:
-            return False
 
     def __repr__(self):
         return '<User %r>' % self.nickname

cps/web.py

@@ -478,8 +478,8 @@ def fill_indexpage(page, database, db_filter, order):
         random = false
     off = int(int(config.config_books_per_page) * (page - 1))
     pagination = Pagination(page, config.config_books_per_page,
-                            len(db.session.query(database).filter(db_filter).filter(filter).all()))
+                            len(db.session.query(database).filter(db_filter).filter(lang_filter).all()))
-    entries = db.session.query(database).filter(db_filter).filter(filter).order_by(order).offset(off).limit(
+    entries = db.session.query(database).filter(db_filter).filter(lang_filter).order_by(order).offset(off).limit(
         config.config_books_per_page)
     return entries, random, pagination