Cosmetic updates to the forms module

boards/forms/__init__.py

@@ -45,7 +45,8 LABEL_TITLE = _('Title')
 LABEL_TEXT = _('Text')
 LABEL_TAG = _('Tag')
 LABEL_SEARCH = _('Search')
-LABEL_FILE = _('File')
+LABEL_FILE_1 = _('File 1')
+LABEL_FILE_2 = _('File 2')
 
 ERROR_SPEED = 'Please wait %(delay)d second before sending message'
 ERROR_SPEED_PLURAL = 'Please wait %(delay)d seconds before sending message'
@@ -168,8 +169,8 class PostForm(NeboardForm):
             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_1 = UrlFileField(required=False, label=LABEL_FILE_1)
+    file_2 = UrlFileField(required=False, label=LABEL_FILE_2)
 
     # This field is for spam prevention only
     email = forms.CharField(max_length=100, required=False, label=_('e-mail'),
@@ -185,20 +186,6 class PostForm(NeboardForm):
     need_to_ban = False
     image = None
 
-    def _update_file_extension(self, file):
-        if file:
-            mimetype =get_file_mimetype(file)
-            extension = MIMETYPE_EXTENSIONS.get(mimetype)
-            if extension:
-                filename = file.name.split(FILE_EXTENSION_DELIMITER, 1)[0]
-                new_filename = filename + FILE_EXTENSION_DELIMITER + extension
-
-                file.name = new_filename
-            else:
-                logger = logging.getLogger('boards.forms.extension')
-
-                logger.info('Unrecognized file mimetype: {}'.format(mimetype))
-
     def clean_title(self):
         title = self.cleaned_data['title']
         if title:
@@ -223,48 +210,6 class PostForm(NeboardForm):
     def clean_file_2(self):
         return self._clean_file(self.cleaned_data['file_2'])
 
-    def _clean_file(self, file):
-        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):
-        file = None
-
-        if url:
-            try:
-                file = get_image_by_alias(url, self.session)
-                self.image = file
-
-                if file is not None:
-                    return
-
-                if file is None:
-                    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
-                if REGEX_URL.match(url):
-                    logger.info('Error in forms: {}'.format(e))
-                    return url
-                else:
-                    raise e
-
-        return file
-
     def clean(self):
         cleaned_data = super(PostForm, self).clean()
 
@@ -350,6 +295,60 class PostForm(NeboardForm):
     def is_subscribe(self):
         return self.cleaned_data['subscribe']
 
+    def _update_file_extension(self, file):
+        if file:
+            mimetype = get_file_mimetype(file)
+            extension = MIMETYPE_EXTENSIONS.get(mimetype)
+            if extension:
+                filename = file.name.split(FILE_EXTENSION_DELIMITER, 1)[0]
+                new_filename = filename + FILE_EXTENSION_DELIMITER + extension
+
+                file.name = new_filename
+            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)
+
+        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):
+        file = None
+
+        if url:
+            try:
+                file = get_image_by_alias(url, self.session)
+                self.image = file
+
+                if file is not None:
+                    return
+
+                if file is None:
+                    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
+                if REGEX_URL.match(url):
+                    logger.info('Error in forms: {}'.format(e))
+                    return url
+                else:
+                    raise e
+
+        return file
+
     def _clean_text_file(self):
         text = self.cleaned_data.get('text')
         file = self.get_files()
@@ -404,9 +403,6 class PostForm(NeboardForm):
             raise forms.ValidationError(e)
 
     def _validate_hash(self, timestamp: str, iteration: str, guess: str, message: str):
-        post_time = timezone.datetime.fromtimestamp(
-            int(timestamp[:-3]), tz=timezone.get_current_timezone())
-
         payload = timestamp + message.replace('\r\n', '\n')
         difficulty = board_settings.get_int('Forms', 'PowDifficulty')
         target = str(int(2 ** (POW_HASH_LENGTH * 3) / difficulty))
@@ -420,7 +416,6 class PostForm(NeboardForm):
                 [_('Invalid PoW.')])
 
 
-
 class ThreadForm(PostForm):
 
     tags = forms.CharField(

boards/locale/ru/LC_MESSAGES/django.po

@@ -63,9 +63,13 msgstr "Метка"
 msgid "Search"
 msgstr "Поиск"
 
-#: forms.py:139
-msgid "File"
-msgstr "Файл"
+#: forms.py:48
+msgid "File 1"
+msgstr "Файл 1"
+
+#: forms.py:48
+msgid "File 2"
+msgstr "Файл 2"
 
 #: forms.py:142
 msgid "File URL"