# HG changeset patch # User neko259 # Date 2017-12-11 16:21:46 # Node ID 3c9f075c0b687cb397ffb7cc0d1726f50b83b2c3 # Parent a3d63355f5874b71327214c803d375e2c6b80d0c Some more constant extracts diff --git a/boards/abstracts/settingsmanager.py b/boards/abstracts/settingsmanager.py --- a/boards/abstracts/settingsmanager.py +++ b/boards/abstracts/settingsmanager.py @@ -3,6 +3,7 @@ from boards.models import Tag, TagAlias, from boards.models.attachment import AttachmentSticker from boards.models.thread import FAV_THREAD_NO_UPDATES from boards.models.tag import DEFAULT_LOCALE +from boards.settings import SECTION_VIEW MAX_TRIPCODE_COLLISIONS = 50 @@ -135,7 +136,7 @@ class SettingsManager: def add_or_read_fav_thread(self, opening_post): threads = self.get_fav_threads() - max_fav_threads = settings.get_int('View', 'MaxFavoriteThreads') + max_fav_threads = settings.get_int(SECTION_VIEW, 'MaxFavoriteThreads') if (str(opening_post.id) in threads) or (len(threads) < max_fav_threads): thread = opening_post.get_thread() # Don't check for new posts if the thread is archived already diff --git a/boards/forms/__init__.py b/boards/forms/__init__.py --- a/boards/forms/__init__.py +++ b/boards/forms/__init__.py @@ -27,8 +27,8 @@ from boards.models.attachment.viewers im from boards.models.post import TITLE_MAX_LENGTH from boards.utils import validate_file_size, get_file_mimetype, \ FILE_EXTENSION_DELIMITER, get_tripcode_from_text +from boards.settings import SECTION_FORMS -SECTION_FORMS = 'Forms' POW_HASH_LENGTH = 16 POW_LIFE_MINUTES = 5 diff --git a/boards/settings.py b/boards/settings.py --- a/boards/settings.py +++ b/boards/settings.py @@ -6,6 +6,7 @@ CONFIG_SETTINGS = 'boards/config/setting SECTION_FORMS = 'Forms' +SECTION_VIEW = 'View' VALUE_TRUE = 'true' diff --git a/boards/utils.py b/boards/utils.py --- a/boards/utils.py +++ b/boards/utils.py @@ -17,7 +17,7 @@ from django.utils.translation import uge import boards from neboard import settings from boards.abstracts.constants import FILE_DIRECTORY -from boards.settings import get_bool +from boards.settings import get_bool, SECTION_FORMS CACHE_KEY_DELIMITER = '_' @@ -103,7 +103,7 @@ def get_file_hash(file) -> str: def validate_file_size(size: int): - max_size = boards.settings.get_int('Forms', 'MaxFileSize') + max_size = boards.settings.get_int(SECTION_FORMS, 'MaxFileSize') if 0 < max_size < size: raise forms.ValidationError( _('Total file size must be less than %s but is %s.') diff --git a/boards/views/all_threads.py b/boards/views/all_threads.py --- a/boards/views/all_threads.py +++ b/boards/views/all_threads.py @@ -14,6 +14,7 @@ from boards.models import Post, Thread from boards.views.base import BaseBoardView, CONTEXT_FORM from boards.views.mixins import FileUploadMixin, PaginatedMixin, \ DispatcherMixin, PARAMETER_METHOD +from boards.settings import SECTION_VIEW, SECTION_FORMS FORM_TAGS = 'tags' FORM_TEXT = 'text' @@ -68,7 +69,7 @@ class AllThreadsView(FileUploadMixin, Ba threads = threads.distinct() paginator = get_paginator(threads, - settings.get_int('View', 'ThreadsPerPage')) + settings.get_int(SECTION_VIEW, 'ThreadsPerPage')) paginator.current_page = int(page) try: @@ -80,7 +81,7 @@ class AllThreadsView(FileUploadMixin, Ba params[CONTEXT_FORM] = form params[PARAMETER_MAX_FILE_SIZE] = self.get_max_upload_size() params[PARAMETER_RSS_URL] = self.get_rss_url() - params[PARAMETER_MAX_FILES] = settings.get_int('Forms', 'MaxFileCount') + params[PARAMETER_MAX_FILES] = settings.get_int(SECTION_FORMS, 'MaxFileCount') paginator.set_url(self.get_reverse_url(), request.GET.dict()) params.update(self.get_page_context(paginator, page))