Added file and url multi value field that will simplify adding many files to one post in future

boards/abstracts/fields.py

@@ -0,0 +1,42 b''
+from django import forms
+from django.utils.translation import ugettext_lazy as _, ungettext_lazy
+
+
+ATTRIBUTE_PLACEHOLDER = 'placeholder'
+
+
+class UrlFileWidget(forms.MultiWidget):
+    def __init__(self, *args, **kwargs):
+        widgets = (
+                forms.ClearableFileInput(attrs={'accept': 'file/*'}),
+                forms.TextInput(attrs={ATTRIBUTE_PLACEHOLDER:
+                    'http://example.com/image.png'}),
+        )
+        super().__init__(widgets, *args, **kwargs)
+
+    def decompress(self, value):
+        return [None, None]
+
+
+class UrlFileField(forms.MultiValueField):
+    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'})),
+        )
+
+        super().__init__(
+                fields=fields,
+                require_all_fields=False, *args, **kwargs)
+
+    def compress(self, data_list):
+        if data_list and len(data_list) >= 2:
+           return data_list[0] or data_list[1]
+

boards/forms.py

@@ -8,6 +8,7 b' import pytz'
 from django import forms
 from django.core.files.uploadedfile import SimpleUploadedFile
 from django.core.exceptions import ObjectDoesNotExist
+from django.core.files.uploadedfile import UploadedFile
 from django.forms.utils import ErrorList
 from django.utils.translation import ugettext_lazy as _, ungettext_lazy
 from django.utils import timezone
@@ -20,6 +21,7 b' from boards.models.post import TITLE_MAX'
 from boards.models import Tag, Post
 from boards.utils import validate_file_size, get_file_mimetype, \
     FILE_EXTENSION_DELIMITER
+from boards.abstracts.fields import UrlFileField
 from neboard import settings
 import boards.settings as board_settings
 import neboard
@@ -167,13 +169,7 b' class PostForm(NeboardForm):'
             ATTRIBUTE_ROWS: TEXTAREA_ROWS,
         }),
         required=False, label=LABEL_TEXT)
-    file = forms.FileField(required=False, label=_('File'),
-                             widget=forms.ClearableFileInput(
-                                 attrs={'accept': 'file/*'}))
-    file_url = forms.CharField(required=False, label=_('File URL'),
-                                widget=forms.TextInput(
-                                    attrs={ATTRIBUTE_PLACEHOLDER:
-                                               'http://example.com/image.png'}))
+    file = UrlFileField(required=False, label=_('File'))
 
     # This field is for spam prevention only
     email = forms.CharField(max_length=100, required=False, label=_('e-mail'),
@@ -224,15 +220,21 b' class PostForm(NeboardForm):'
     def clean_file(self):
         file = self.cleaned_data['file']
 
-        if file:
-            validate_file_size(file.size)
+        if isinstance(file, UploadedFile):
+            file = self._clean_file_file(file)
+        else:
+            file = self._clean_file_url(file)
+
+        return file
+
+    def _clean_file_file(self, file):
+        validate_file_size(file.size)
         self._update_file_extension(file)
 
         return file
 
-    def clean_file_url(self):
-        url = self.cleaned_data['file_url']
 
+    def _clean_file_url(self, url):
         file = None
 
         if url:
@@ -296,15 +298,13 b' class PostForm(NeboardForm):'
         """
 
         file = self.cleaned_data['file']
-        if type(self.cleaned_data['file_url']) is not str:
-            file_url = self.cleaned_data['file_url']
-        else:
-            file_url = None
-        return file or file_url
+        if isinstance(file, UploadedFile):
+            return file
 
     def get_file_url(self):
-        if not self.get_file():
-            return self.cleaned_data['file_url']
+        file = self.cleaned_data['file']
+        if type(file) == str:
+            return file
 
     def get_tripcode(self):
         title = self.cleaned_data['title']

boards/templates/boards/all_threads.html

@@ -164,7 +164,6 b''
                 <div class="form-submit">
                     <input type="submit" value="{% trans "Post" %}"/>
                     <button id="preview-button" type="button" onclick="return false;">{% trans 'Preview' %}</button>
-                    <button id="file-source-button" type="button" onclick="return false;">{% trans 'Change file source' %}</button>
                 </div>
             </form>
             </div>

boards/templates/boards/thread_normal.html

@@ -54,7 +54,6 b''
                         <div class="form-submit">
                             <input type="submit" value="{% trans "Post" %}"/>
                             <button id="preview-button" type="button" onclick="return false;">{% trans 'Preview' %}</button>
-                            <button id="file-source-button" type="button" onclick="return false;">{% trans 'Change file source' %}</button>
                         </div>
                     </form>
                 </div>