diff --git a/opds_catalog/opds_paginator.py b/opds_catalog/opds_paginator.py index 0fdeb7cfa839ffb45b5a4511c5d46a9617f96b51..cc26dea2a70dddc72511ba384acbb9231b64578b 100644 --- a/opds_catalog/opds_paginator.py +++ b/opds_catalog/opds_paginator.py @@ -27,7 +27,7 @@ class Paginator: self.d2_last_pos = d2_MAXITEMS*self.page_num - 1; self.d2_last_pos = self.d2_last_pos if self.d2_last_pos<self.d2_count else (self.d2_count-1 if self.d2_count else 0) - self.num_pages = self.count//self.MAXITEMS + 1 if self.count%self.MAXITEMS else 0 + self.num_pages = self.count//self.MAXITEMS + 1 self.firstpage = self.page_num - self.HALF_PAGES_LINK self.lastpage = self.page_num + self.HALF_PAGES_LINK if self.firstpage<1: @@ -39,7 +39,7 @@ class Paginator: self.lastpage = self.num_pages if self.firstpage<1: self.firstpage = 1 - + self.has_previous = (self.page_num > 1) self.has_next = (self.page_num < self.num_pages) self.previous_page_number = (self.page_num-1) if self.page_num>1 else 1 diff --git a/opds_catalog/sopdscan.py b/opds_catalog/sopdscan.py index e89204cdbe73fdbc60cd4cfe339c1e80d17d00a1..5cbe5ed0d14f0ba7b2ad0c43f4c24cda50834327 100644 --- a/opds_catalog/sopdscan.py +++ b/opds_catalog/sopdscan.py @@ -192,8 +192,6 @@ class opdsScanner: zip_process_error = 1 self.bad_archives+=zip_process_error - - def processfile(self,name,full_path,file,cat,archive=0,file_size=0): (n,e)=os.path.splitext(name) if e.lower() in config.SOPDS_BOOK_EXTENSIONS.split(): diff --git a/sopds/settings.py b/sopds/settings.py index d600f35fd3e120a26a30a3d9cf192d52d93e202c..b953b805ca7b84468dd4bc4120d7770a0cf44843 100644 --- a/sopds/settings.py +++ b/sopds/settings.py @@ -135,8 +135,6 @@ AUTH_PASSWORD_VALIDATORS = [ #LANGUAGE_CODE = 'en-US' LANGUAGE_CODE = 'ru-RU' - -3 LOCALE_PATHS = ( os.path.join(BASE_DIR, 'sopds/locale'), diff --git a/sopds_web_backend/views.py b/sopds_web_backend/views.py index 578efc3a994fb498085e9cb623153fc0828d19e0..aba2941ecc87c60a6da602b2426a3aad1142262e 100644 --- a/sopds_web_backend/views.py +++ b/sopds_web_backend/views.py @@ -363,6 +363,8 @@ def CatalogsView(request): breadcrumbs_list.insert(0, (_('ROOT'), 0)) breadcrumbs_list.insert(0, (_('Catalogs'),-1)) args['breadcrumbs_cat'] = breadcrumbs_list + + print(args['paginator'], catalogs_count, books_count, page_num, config.SOPDS_MAXITEMS, HALF_PAGES_LINKS) return render(request,'sopds_catalogs.html', args)