Use one input for multiple files and multiple URLs

boards/config/default_settings.ini

@@ -17,6 +17,7 b' PowDifficulty = 0'
 PostingDelay = 30
 Autoban = false
 DefaultTag = test
+MaxFileCount = 2
 
 [Messages]
 # Thread bumplimit

boards/forms/__init__.py

@@ -5,10 +5,8 b' import time'
 
 import pytz
 from django import forms
-from django.core.files.uploadedfile import SimpleUploadedFile
-from django.core.files.uploadedfile import UploadedFile
+from django.core.files.uploadedfile import SimpleUploadedFile, UploadedFile
 from django.forms.utils import ErrorList
-from django.utils import timezone
 from django.utils.translation import ugettext_lazy as _, ungettext_lazy
 
 import boards.settings as board_settings
@@ -24,6 +22,8 b' from boards.utils import validate_file_s'
     FILE_EXTENSION_DELIMITER
 from neboard import settings
 
+SECTION_FORMS = 'Forms'
+
 POW_HASH_LENGTH = 16
 POW_LIFE_MINUTES = 5
 
@@ -45,11 +45,11 b" LABEL_TITLE = _('Title')"
 LABEL_TEXT = _('Text')
 LABEL_TAG = _('Tag')
 LABEL_SEARCH = _('Search')
-LABEL_FILE_1 = _('File 1')
-LABEL_FILE_2 = _('File 2')
+LABEL_FILE = _('File')
 
 ERROR_SPEED = 'Please wait %(delay)d second before sending message'
 ERROR_SPEED_PLURAL = 'Please wait %(delay)d seconds before sending message'
+ERROR_MANY_FILES = _('Too many files.')
 
 TAG_MAX_LENGTH = 20
 
@@ -161,16 +161,14 b' class PostForm(NeboardForm):'
     title = forms.CharField(max_length=TITLE_MAX_LENGTH, required=False,
                             label=LABEL_TITLE,
                             widget=forms.TextInput(
-                                attrs={ATTRIBUTE_PLACEHOLDER:
-                                           'test#tripcode'}))
+                                attrs={ATTRIBUTE_PLACEHOLDER: 'title#tripcode'}))
     text = forms.CharField(
         widget=FormatPanel(attrs={
             ATTRIBUTE_PLACEHOLDER: TEXT_PLACEHOLDER,
             ATTRIBUTE_ROWS: TEXTAREA_ROWS,
         }),
         required=False, label=LABEL_TEXT)
-    file_1 = UrlFileField(required=False, label=LABEL_FILE_1)
-    file_2 = UrlFileField(required=False, label=LABEL_FILE_2)
+    file = UrlFileField(required=False, label=LABEL_FILE)
 
     # This field is for spam prevention only
     email = forms.CharField(max_length=100, required=False, label=_('e-mail'),
@@ -198,35 +196,32 b' class PostForm(NeboardForm):'
     def clean_text(self):
         text = self.cleaned_data['text'].strip()
         if text:
-            max_length = board_settings.get_int('Forms', 'MaxTextLength')
+            max_length = board_settings.get_int(SECTION_FORMS, 'MaxTextLength')
             if len(text) > max_length:
                 raise forms.ValidationError(_('Text must have less than %s '
                                               'characters') % str(max_length))
         return text
 
-    def clean_file_1(self):
-        return self._clean_file(self.cleaned_data['file_1'])
-
-    def clean_file_2(self):
-        return self._clean_file(self.cleaned_data['file_2'])
+    def clean_file(self):
+        return self._clean_files(self.cleaned_data['file'])
 
     def clean(self):
         cleaned_data = super(PostForm, self).clean()
 
         if cleaned_data['email']:
-            if board_settings.get_bool('Forms', 'Autoban'):
+            if board_settings.get_bool(SECTION_FORMS, 'Autoban'):
                 self.need_to_ban = True
             raise forms.ValidationError('A human cannot enter a hidden field')
 
         if not self.errors:
             self._clean_text_file()
 
-        limit_speed = board_settings.get_bool('Forms', 'LimitPostingSpeed')
-        limit_first = board_settings.get_bool('Forms', 'LimitFirstPosting')
+        limit_speed = board_settings.get_bool(SECTION_FORMS, 'LimitPostingSpeed')
+        limit_first = board_settings.get_bool(SECTION_FORMS, 'LimitFirstPosting')
 
         settings_manager = get_settings_manager(self)
         if not self.errors and limit_speed or (limit_first and not settings_manager.get_setting('confirmed_user')):
-            pow_difficulty = board_settings.get_int('Forms', 'PowDifficulty')
+            pow_difficulty = board_settings.get_int(SECTION_FORMS, 'PowDifficulty')
             if pow_difficulty > 0:
                 # PoW-based
                 if cleaned_data['timestamp'] \
@@ -245,26 +240,16 b' class PostForm(NeboardForm):'
         Gets file from form or URL.
         """
 
-        cleaned_files = [
-                self.cleaned_data['file_1'],
-                self.cleaned_data['file_2'],
-        ]
-
         files = []
-        for file in cleaned_files:
+        for file in self.cleaned_data['file']:
             if isinstance(file, UploadedFile):
                 files.append(file)
 
         return files
 
     def get_file_urls(self):
-        cleaned_files = [
-                self.cleaned_data['file_1'],
-                self.cleaned_data['file_2'],
-        ]
-
         files = []
-        for file in cleaned_files:
+        for file in self.cleaned_data['file']:
             if type(file) == str:
                 files.append(file)
 
@@ -307,13 +292,24 b' class PostForm(NeboardForm):'
             else:
                 logger.info('Unrecognized file mimetype: {}'.format(mimetype))
 
-    def _clean_file(self, file):
-        if isinstance(file, UploadedFile):
-            file = self._clean_file_file(file)
-        else:
-            file = self._clean_file_url(file)
+    def _clean_files(self, inputs):
+        files = []
 
-        return file
+        max_file_count = board_settings.get_int(SECTION_FORMS, 'MaxFileCount')
+        if type(inputs) == list:
+            if len(inputs) > max_file_count:
+                raise forms.ValidationError(ERROR_MANY_FILES)
+            for file in inputs:
+                files.append(self._clean_file_file(file))
+        elif inputs:
+            inputs = inputs.replace('\r\n', '\n')
+            url_list = inputs.split('\n')
+            if len(url_list) > max_file_count:
+                raise forms.ValidationError(ERROR_MANY_FILES)
+            for url in url_list:
+                files.append(self._clean_file_url(url))
+
+        return files
 
     def _clean_file_file(self, file):
         validate_file_size(file.size)
@@ -362,9 +358,9 b' class PostForm(NeboardForm):'
     def _validate_posting_speed(self):
         can_post = True
 
-        posting_delay = board_settings.get_int('Forms', 'PostingDelay')
+        posting_delay = board_settings.get_int(SECTION_FORMS, 'PostingDelay')
 
-        if board_settings.get_bool('Forms', 'LimitPostingSpeed'):
+        if board_settings.get_bool(SECTION_FORMS, 'LimitPostingSpeed'):
             now = time.time()
 
             current_delay = 0
@@ -404,7 +400,7 b' class PostForm(NeboardForm):'
 
     def _validate_hash(self, timestamp: str, iteration: str, guess: str, message: str):
         payload = timestamp + message.replace('\r\n', '\n')
-        difficulty = board_settings.get_int('Forms', 'PowDifficulty')
+        difficulty = board_settings.get_int(SECTION_FORMS, 'PowDifficulty')
         target = str(int(2 ** (POW_HASH_LENGTH * 3) / difficulty))
         if len(target) < POW_HASH_LENGTH:
             target = '0' * (POW_HASH_LENGTH - len(target)) + target
@@ -430,7 +426,7 b' class ThreadForm(PostForm):'
             raise forms.ValidationError(
                 _('Inappropriate characters in tags.'))
 
-        default_tag_name = board_settings.get('Forms', 'DefaultTag')\
+        default_tag_name = board_settings.get(SECTION_FORMS, 'DefaultTag')\
                 .strip().lower()
 
         required_tag_exists = False

boards/forms/fields.py

@@ -3,14 +3,56 b' from django.utils.translation import uge'
 
 
 ATTRIBUTE_PLACEHOLDER = 'placeholder'
+ATTRIBUTE_ROWS = 'rows'
+
+URL_ROWS = 2
+
+
+class MultipleFileInput(forms.FileInput):
+    """
+    Input that allows to enter many files at once, utilizing the html5 "multiple"
+    attribute of a file input.
+    """
+    def value_from_datadict(self, data, files, name):
+        if len(files) == 0:
+            return None
+        else:
+            return files.getlist(name)
+
+    def render(self, name, value, attrs=None):
+        if not attrs:
+            attrs = dict()
+        attrs['multiple'] = ''
+
+        return super().render(name, None, attrs=attrs)
+
+
+class MultipleFileField(forms.FileField):
+    """
+    Field that allows to enter multiple files from one input.
+    """
+    def to_python(self, data):
+        if not data or len(data) == 0:
+            return None
+
+        for file in data:
+            super().to_python(file)
+
+        return data
 
 
 class UrlFileWidget(forms.MultiWidget):
+    """
+    Widget with a file input and a text input that allows to enter either a
+    file from a local system, or a URL from which the file would be downloaded.
+    """
     def __init__(self, *args, **kwargs):
         widgets = (
-                forms.ClearableFileInput(attrs={'accept': 'file/*'}),
-                forms.TextInput(attrs={ATTRIBUTE_PLACEHOLDER:
-                    'http://example.com/image.png'}),
+                MultipleFileInput(attrs={'accept': 'file/*'}),
+                forms.Textarea(attrs={
+                    ATTRIBUTE_PLACEHOLDER: 'http://example.com/image.png',
+                    ATTRIBUTE_ROWS: URL_ROWS,
+                }),
         )
         super().__init__(widgets, *args, **kwargs)
 
@@ -19,17 +61,16 b' class UrlFileWidget(forms.MultiWidget):'
 
 
 class UrlFileField(forms.MultiValueField):
+    """
+    Field with a file input and a text input that allows to enter either a
+    file from a local system, or a URL from which the file would be downloaded.
+    """
     widget = UrlFileWidget
 
     def __init__(self, *args, **kwargs):
         fields = (
-                forms.FileField(required=False, label=_('File'),
-                    widget=forms.ClearableFileInput(
-                        attrs={'accept': 'file/*'})),
-                forms.CharField(required=False, label=_('File URL'),
-                    widget=forms.TextInput(
-                        attrs={ATTRIBUTE_PLACEHOLDER:
-                            'http://example.com/image.png'})),
+                MultipleFileField(required=False, label=_('File')),
+                forms.CharField(required=False, label=_('File URL')),
         )
 
         super().__init__(
@@ -38,5 +79,5 b' class UrlFileField(forms.MultiValueField'
 
     def compress(self, data_list):
         if data_list and len(data_list) >= 2:
-           return data_list[0] or data_list[1]
+            return data_list[0] or data_list[1]
 

boards/static/js/thread.js

@@ -68,7 +68,7 b' function addQuickReply(postId) {'
         resetFormPosition();
     } else {
         var blockToInsert = null;
-        var textAreaJq = $('textarea');
+        var textAreaJq = $('textarea#id_text');
         var postLinkRaw = '[post]' + postId + '[/post]'
         var textToAdd = '';
 
@@ -101,7 +101,7 b' function addQuickReply(postId) {'
 }
 
 function addQuickQuote() {
-    var textAreaJq = $('textarea');
+    var textAreaJq = $('textarea#id_text');
 
     var quoteButton = $("#quote-button");
     var postId = quoteButton.attr('data-post-id');