Merged with default

boards/forms.py

@@ -212,7 +212,7 b' class PostForm(NeboardForm):'
             for thread_id in threads_id_list:
                 try:
                     thread = Post.objects.get(id=int(thread_id))
-                    if not thread.is_opening():
+                    if not thread.is_opening() or thread.get_thread().archived:
                         raise ObjectDoesNotExist()
                     threads.append(thread)
                 except (ObjectDoesNotExist, ValueError):

boards/management/commands/cleanimages.py

@@ -1,19 +1,30 b''
+import os
+
 from django.core.management import BaseCommand
 from django.db import transaction
-from django.db.models import Count
 
-from boards.models import Tag
+from boards.models.image import IMAGES_DIRECTORY, PostImage, IMAGE_THUMB_SIZE
+from neboard.settings import MEDIA_ROOT
 
 
 __author__ = 'neko259'
 
 
 class Command(BaseCommand):
-    help = 'Removed tags that have no threads'
+    help = 'Remove image files whose models were deleted'
 
     @transaction.atomic
     def handle(self, *args, **options):
-        empty = Tag.objects.annotate(num_threads=Count('thread'))\
-                .filter(num_threads=0).order_by('-required', 'name')
-        print('Removing {} empty tags'.format(empty.count()))
-        empty.delete()
+        count = 0
+        thumb_prefix = '.{}x{}'.format(*IMAGE_THUMB_SIZE)
+
+        model_files = os.listdir(MEDIA_ROOT + IMAGES_DIRECTORY)
+        for file in model_files:
+            image_name = file if thumb_prefix not in file else file.replace(thumb_prefix, '')
+            found = PostImage.objects.filter(image=IMAGES_DIRECTORY + image_name).exists()
+
+            if not found:
+                print('Missing {}'.format(image_name))
+                os.remove(MEDIA_ROOT + IMAGES_DIRECTORY + file)
+                count += 1
+        print('Deleted {} image files.'.format(count))
  No newline at end of file

boards/urls.py

@@ -1,4 +1,5 b''
 from django.conf.urls import patterns, url
+from django.views.i18n import javascript_catalog
 
 from boards import views
 from boards.rss import AllThreadsFeed, TagThreadsFeed, ThreadPostsFeed
@@ -52,7 +53,7 b" urlpatterns = patterns('',"
     url(r'^thread/(?P<post_id>\d+)/rss/$', ThreadPostsFeed()),
 
     # i18n
-    url(r'^jsi18n/$', 'boards.views.cached_js_catalog', js_info_dict,
+    url(r'^jsi18n/$', javascript_catalog, js_info_dict,
         name='js_info_dict'),
 
     # API

neboard/settings.py

@@ -46,6 +46,8 b' USE_L10N = True'
 # If you set this to False, Django will not use timezone-aware datetimes.
 USE_TZ = True
 
+USE_ETAGS = True
+
 # Absolute filesystem path to the directory that will hold user-uploaded files.
 # Example: "/home/media/media.lawrence.com/media/"
 MEDIA_ROOT = './media/' 
@@ -109,6 +111,7 b' TEMPLATE_CONTEXT_PROCESSORS = ('
 )
 
 MIDDLEWARE_CLASSES = (
+    'django.middleware.http.ConditionalGetMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.middleware.locale.LocaleMiddleware',
     'django.middleware.common.CommonMiddleware',
@@ -142,7 +145,6 b' INSTALLED_APPS = ('
     # Uncomment the next line to enable admin documentation:
     # 'django.contrib.admindocs',
     'django.contrib.humanize',
-    'django_cleanup',
 
     'debug_toolbar',
 

requirements.txt

@@ -4,6 +4,5 b' adjacent'
 haystack
 pillow
 django>=1.7
-django_cleanup
 bbcode
 ecdsa