Count total files size in a post instead of per-file basis

boards/config/default_settings.ini

@@ -17,7 +17,7 b' PowDifficulty = 0'
 PostingDelay = 30
 Autoban = false
 DefaultTag = test
-MaxFileCount = 1
+MaxFileCount = 5
 AdditionalSpoilerSpaces = false
 
 [Messages]

boards/forms/__init__.py

@@ -320,14 +320,19 b' class PostForm(NeboardForm):'
             raise forms.ValidationError(
                 ungettext_lazy(ERROR_MANY_FILES, ERROR_MANY_FILES,
                                max_file_count) % {'files': max_file_count})
+
+        size = 0
         for file_input in inputs:
             if isinstance(file_input, UploadedFile):
-                files.append(self._clean_file_file(file_input))
+                file = self._clean_file_file(file_input)
+                size += file.size
+                files.append(file)
             else:
                 files.append(self._clean_file_url(file_input))
 
         for file in files:
             self._validate_image_dimensions(file)
+        validate_file_size(size)
 
         return files
 
@@ -342,7 +347,6 b' class PostForm(NeboardForm):'
                     raise forms.ValidationError('Possible decompression bomb or large image.')
 
     def _clean_file_file(self, file):
-        validate_file_size(file.size)
         self._update_file_extension(file)
 
         return file
@@ -367,8 +371,6 b' class PostForm(NeboardForm):'
                     file = self._get_file_from_url(url)
                     if not file:
                         raise forms.ValidationError(_('Invalid URL'))
-                    else:
-                        validate_file_size(file.size)
                 self._update_file_extension(file)
             except forms.ValidationError as e:
                 # Assume we will get the plain URL instead of a file and save it

boards/locale/ru/LC_MESSAGES/django.po

@@ -480,8 +480,8 b' msgstr "\xd0\x9e\xd0\xba"'
 
 #: utils.py:120
 #, python-format
-msgid "File must be less than %s but is %s."
-msgstr "Файл должен быть менее %s, но его размер %s."
+msgid "Total file size must be less than %s but is %s."
+msgstr "Общий размер файлов должен быть менее %s, но является %s."
 
 msgid "Please wait %(delay)d second before sending message"
 msgid_plural "Please wait %(delay)d seconds before sending message"
@@ -493,8 +493,8 b' msgid "New threads"'
 msgstr "Новые темы"
 
 #, python-format
-msgid "Max file size is %(size)s."
-msgstr "Максимальный размер файла %(size)s."
+msgid "Max total file size is %(size)s."
+msgstr "Максимальный общий размер файлов %(size)s."
 
 msgid "Size of media:"
 msgstr "Размер медиа:"

boards/locale/uk/LC_MESSAGES/django.po

@@ -480,8 +480,8 b' msgstr "\xd0\xa4\xd0\xb0\xd0\xb9\xd0\xbd\xd0\xbe"'
 
 #: utils.py:120
 #, python-format
-msgid "File must be less than %s but is %s."
-msgstr "Файл мусить бути менше %s, але його розмір %s."
+msgid "Total file size must be less than %s but is %s."
+msgstr "Загальний розмір файлів мусить бути менше %s, але є %s."
 
 msgid "Please wait %(delay)d second before sending message"
 msgid_plural "Please wait %(delay)d seconds before sending message"
@@ -493,8 +493,8 b' msgid "New threads"'
 msgstr "Нові нитки"
 
 #, python-format
-msgid "Max file size is %(size)s."
-msgstr "Максимальний розмір файлу %(size)s."
+msgid "Max total file size is %(size)s."
+msgstr "Максимальний загальний розмір файлів %(size)s."
 
 msgid "Size of media:"
 msgstr "Розмір посередника:"

boards/templates/boards/all_threads.html

@@ -172,7 +172,7 b''
             <div>
                 {% trans 'Tags must be delimited by spaces. Text or image is required.' %}
                 {% with size=max_file_size|filesizeformat %}
-                    {% blocktrans %}Max file size is {{ size }}.{% endblocktrans %}
+                    {% blocktrans %}Max total file size is {{ size }}.{% endblocktrans %}
                 {% endwith %}
                 {% blocktrans %}Max file number is {{ max_files }}.{% endblocktrans %}
             </div>

boards/templates/boards/thread_normal.html

@@ -60,7 +60,7 b''
                 <div id="preview-text"></div>
                 <div>
                     {% with size=max_file_size|filesizeformat %}
-                        {% blocktrans %}Max file size is {{ size }}.{% endblocktrans %}
+                        {% blocktrans %}Max total file size is {{ size }}.{% endblocktrans %}
                     {% endwith %}
                     {% blocktrans %}Max file number is {{ max_files }}.{% endblocktrans %}
                 </div>

boards/utils.py

@@ -102,7 +102,7 b' def validate_file_size(size: int):'
     max_size = boards.settings.get_int('Forms', 'MaxFileSize')
     if 0 < max_size < size:
         raise forms.ValidationError(
-            _('File must be less than %s but is %s.')
+            _('Total file size must be less than %s but is %s.')
             % (filesizeformat(max_size), filesizeformat(size)))