Moved imageboard settings to the boards settings module. Added setting to disable archive

boards/__init__.py

@@ -0,0 +1,1 b''
+import settings
  No newline at end of file

boards/context_processors.py

@@ -1,7 +1,6 b''
-from boards import utils
+from boards import utils, settings
 from boards.models import Post
 from boards.models.post import SETTING_MODERATE
-import neboard
 
 __author__ = 'neko259'
 
@@ -25,7 +24,7 b' def user_and_ui_processor(request):'
     else:
         context['moderator'] = False
 
-    context['version'] = neboard.settings.VERSION
-    context['site_name'] = neboard.settings.SITE_NAME
+    context['version'] = settings.VERSION
+    context['site_name'] = settings.SITE_NAME
 
     return context
  No newline at end of file

boards/forms.py

@@ -9,7 +9,7 b' from django.utils.translation import uge'
 
 from boards.mdx_neboard import formatters
 from boards.models.post import TITLE_MAX_LENGTH
-from boards.models import User, Post, PostImage
+from boards.models import User, PostImage
 from neboard import settings
 from boards import utils
 import boards.settings as board_settings

boards/models/post.py

@@ -96,7 +96,7 b' class PostManager(models.Manager):'
             map(thread.add_tag, tags)
 
         if new_thread:
-            Thread.objects.archive_oldest_threads()
+            Thread.objects.process_oldest_threads()
         self.connect_replies(post)
 
         logger.info('Created post #%d' % post.id)

boards/models/thread.py

@@ -3,7 +3,7 b' from django.db.models import Count'
 from django.utils import timezone
 from django.core.cache import cache
 from django.db import models
-from neboard import settings
+from boards import settings
 
 __author__ = 'neko259'
 
@@ -15,10 +15,10 b" CACHE_KEY_OPENING_POST = 'opening_post_i"
 
 
 class ThreadManager(models.Manager):
-    def archive_oldest_threads(self):
+    def process_oldest_threads(self):
         """
          Preserves maximum thread count. If there are too many threads,
-         archive the old ones.
+         archive or delete the old ones.
          """
 
         threads = Thread.objects.filter(archived=False).order_by('-bump_time')
@@ -29,11 +29,20 b' class ThreadManager(models.Manager):'
             old_threads = threads[thread_count - num_threads_to_delete:]
 
             for thread in old_threads:
+                if settings.ARCHIVE_THREADS:
+                    self._archive_thread(thread)
+                else:
+                    self._delete_thread(thread)
+
+            logger.info('Processed %d old threads' % num_threads_to_delete)
+
+    def _archive_thread(self, thread):
                 thread.archived = True
                 thread.last_edit_time = timezone.now()
                 thread.save(update_fields=['archived', 'last_edit_time'])
 
-            logger.info('Archived %d old threads' % num_threads_to_delete)
+    def _delete_thread(self, thread):
+        thread.delete_with_posts()
 
 
 class Thread(models.Model):
@@ -89,6 +98,7 b' class Thread(models.Model):'
 
         return post_count < settings.MAX_POSTS_PER_THREAD
 
+    # TODO Do it in the 'delete' method
     def delete_with_posts(self):
         """
         Completely deletes thread and all its posts

boards/rss.py

@@ -2,7 +2,7 b' from django.contrib.syndication.views im'
 from django.core.urlresolvers import reverse
 from django.shortcuts import get_object_or_404
 from boards.models import Post, Tag, Thread
-from neboard import settings
+from boards import settings
 
 __author__ = 'neko259'
 

boards/settings.py

@@ -1,4 +1,18 b''
+VERSION = '1.8.1 Kara'
+SITE_NAME = 'Neboard'
+
 CACHE_TIMEOUT = 600  # Timeout for caching, if cache is used
 LOGIN_TIMEOUT = 3600  # Timeout between login tries
 MAX_TEXT_LENGTH = 30000  # Max post length in characters
 MAX_IMAGE_SIZE = 8 * 1024 * 1024  # Max image size
+
+# Thread bumplimit
+MAX_POSTS_PER_THREAD = 10
+# Old posts will be archived or deleted if this value is reached
+MAX_THREAD_COUNT = 5
+THREADS_PER_PAGE = 3
+DEFAULT_THEME = 'md'
+LAST_REPLIES_COUNT = 3
+
+# Enable archiving threads instead of deletion when the thread limit is reached
+ARCHIVE_THREADS = True
  No newline at end of file

boards/tests.py

@@ -9,7 +9,8 b' from django.core.urlresolvers import rev'
 
 from boards.models import Post, Tag, Thread
 from boards import urls
-from neboard import settings
+from boards import settings
+import neboard
 
 PAGE_404 = 'boards/404.html'
 
@@ -187,8 +188,8 b' class PagesTest(TestCase):'
 class FormTest(TestCase):
     def test_post_validation(self):
         # Disable captcha for the test
-        captcha_enabled = settings.ENABLE_CAPTCHA
-        settings.ENABLE_CAPTCHA = False
+        captcha_enabled = neboard.settings.ENABLE_CAPTCHA
+        neboard.settings.ENABLE_CAPTCHA = False
 
         client = Client()
 
@@ -211,10 +212,10 b' class FormTest(TestCase):'
                                                       'where it should fail')
 
         # Change posting delay so we don't have to wait for 30 seconds or more
-        old_posting_delay = settings.POSTING_DELAY
+        old_posting_delay = neboard.settings.POSTING_DELAY
         # Wait fot the posting delay or we won't be able to post
         settings.POSTING_DELAY = 1
-        time.sleep(settings.POSTING_DELAY + 1)
+        time.sleep(neboard.settings.POSTING_DELAY + 1)
         response = client.post(THREAD_PAGE_ONE, {'text': TEST_TEXT,
                                                  'tags': valid_tags})
         self.assertEqual(HTTP_CODE_REDIRECT, response.status_code,

boards/utils.py

@@ -2,14 +2,14 b''
 This module contains helper functions and helper classes.
 """
 import hashlib
+import time
+
 from django.utils import timezone
+import boards
 
 from neboard import settings
-from boards.models import Post, User
-from boards.models.post import SETTING_MODERATE
+from boards.models import User
 from boards.models.user import RANK_USER
-import time
-import neboard
 
 
 KEY_CAPTCHA_FAILS = 'key_captcha_fails'
@@ -124,6 +124,6 b' def get_theme(request, user=None):'
         user = get_user(request)
     theme = user.get_setting('theme')
     if not theme:
-        theme = neboard.settings.DEFAULT_THEME
+        theme = boards.settings.DEFAULT_THEME
 
     return theme
  No newline at end of file

boards/views/all_threads.py

@@ -3,7 +3,7 b' import string'
 from django.db import transaction
 from django.shortcuts import render, redirect
 
-from boards import utils
+from boards import utils, settings
 from boards.abstracts.paginator import get_paginator
 from boards.forms import ThreadForm, PlainErrorList
 from boards.models import Post, Thread, Ban, Tag
@@ -35,7 +35,7 b' class AllThreadsView(PostMixin, BaseBoar'
             form = ThreadForm(error_class=PlainErrorList)
 
         paginator = get_paginator(self.get_threads(),
-                                  neboard.settings.THREADS_PER_PAGE)
+                                  settings.THREADS_PER_PAGE)
         paginator.current_page = int(page)
 
         threads = paginator.page(page).object_list

boards/views/thread.py

@@ -4,13 +4,12 b' from django.http import Http404'
 from django.shortcuts import get_object_or_404, render, redirect
 from django.views.generic.edit import FormMixin
 
-from boards import utils
+from boards import utils, settings
 from boards.forms import PostForm, PlainErrorList
 from boards.models import Post, Ban
 from boards.views.banned import BannedView
 from boards.views.base import BaseBoardView, PARAMETER_FORM
 from boards.views.posting_mixin import PostMixin
-import neboard
 
 
 MODE_GALLERY = 'gallery'
@@ -44,16 +43,16 b' class ThreadView(BaseBoardView, PostMixi'
         context["last_update"] = utils.datetime_to_epoch(
             thread_to_show.last_edit_time)
         context[PARAMETER_THREAD] = thread_to_show
-        context[PARAMETER_MAX_REPLIES] = neboard.settings.MAX_POSTS_PER_THREAD
+        context[PARAMETER_MAX_REPLIES] = settings.MAX_POSTS_PER_THREAD
 
         if MODE_NORMAL == mode:
             context[PARAMETER_BUMPABLE] = thread_to_show.can_bump()
             if context[PARAMETER_BUMPABLE]:
-                context['posts_left'] = neboard.settings.MAX_POSTS_PER_THREAD \
+                context['posts_left'] = settings.MAX_POSTS_PER_THREAD \
                         - thread_to_show.get_reply_count()
                 context['bumplimit_progress'] = str(
                     float(context['posts_left']) /
-                    neboard.settings.MAX_POSTS_PER_THREAD * 100)
+                    settings.MAX_POSTS_PER_THREAD * 100)
 
             context['opening_post'] = opening_post
 

neboard/__init__.py

@@ -0,0 +1,1 b''
+import settings
  No newline at end of file

neboard/settings.py

@@ -221,12 +221,6 b" HAYSTACK_SIGNAL_PROCESSOR = 'haystack.si"
 MARKUP_FIELD_TYPES = (
     ('markdown', markdown_extended),
 )
-# Custom imageboard settings
-# TODO These should me moved to
-MAX_POSTS_PER_THREAD = 10  # Thread bumplimit
-MAX_THREAD_COUNT = 5  # Old threads will be deleted to preserve this count
-THREADS_PER_PAGE = 3
-SITE_NAME = 'Neboard'
 
 THEMES = [
     ('md', 'Mystic Dark'),
@@ -235,10 +229,7 b' THEMES = ['
     ('pg', 'Photon Gray'),
 ]
 
-DEFAULT_THEME = 'md'
-
 POPULAR_TAGS = 10
-LAST_REPLIES_COUNT = 3
 
 ENABLE_CAPTCHA = False
 # if user tries to post before CAPTCHA_DEFAULT_SAFE_TIME. Captcha will be shown
@@ -247,13 +238,8 b' POSTING_DELAY = 20 # seconds'
 
 COMPRESS_HTML = True
 
-VERSION = '1.8.0 Kara'
-
 # Debug mode middlewares
 if DEBUG:
-
-    SITE_NAME += ' DEBUG'
-
     MIDDLEWARE_CLASSES += (
         'boards.profiler.ProfilerMiddleware',
         'debug_toolbar.middleware.DebugToolbarMiddleware',