Clarified url download modes

boards/forms/__init__.py

@@ -13,6 +13,7 b' from django.core.files.uploadedfile impo'
 from django.forms.utils import ErrorList
 from django.utils.translation import ugettext_lazy as _, ungettext_lazy
 from django.core.files.images import get_image_dimensions
+from django.core.cache import cache
 
 import boards.settings as board_settings
 import neboard
@@ -186,8 +187,8 b' class PostForm(NeboardForm):'
         required=False, label=LABEL_TEXT)
     download_mode = forms.ChoiceField(
             choices=(
-                (DOWN_MODE_TRY, _('Download if possible')),
-                (DOWN_MODE_DOWNLOAD, _('Download')),
+                (DOWN_MODE_TRY, _('Download or add URL')),
+                (DOWN_MODE_DOWNLOAD, _('Download or fail')),
                 (DOWN_MODE_URL, _('Insert as URLs')),
             ),
             initial=DOWN_MODE_TRY,
@@ -393,6 +394,21 b' class PostForm(NeboardForm):'
             error_message = _('Either text or file must be entered.')
             self._add_general_error(error_message)
 
+    def _get_cache_key(self, key):
+        return '{}_{}'.format(self.session.session_key, key)
+
+    def _set_session_cache(self, key, value):
+        cache.set(self._get_cache_key(key), value)
+
+    def _get_session_cache(self, key):
+        return cache.get(self._get_cache_key(key))
+
+    def _get_last_post_time(self):
+        last = self._get_session_cache(LAST_POST_TIME)
+        if last is None:
+            last = self.session.get(LAST_POST_TIME)
+        return last
+
     def _validate_posting_speed(self):
         can_post = True
 
@@ -408,11 +424,13 b' class PostForm(NeboardForm):'
 
                 need_delay = True
             else:
-                last_post_time = self.session.get(LAST_POST_TIME)
+                last_post_time = self._get_last_post_time()
                 current_delay = int(now - last_post_time)
 
                 need_delay = current_delay < posting_delay
 
+            self._set_session_cache(LAST_POST_TIME, now)
+
             if need_delay:
                 delay = posting_delay - current_delay
                 error_message = ungettext_lazy(ERROR_SPEED, ERROR_SPEED_PLURAL,
@@ -423,6 +441,9 b' class PostForm(NeboardForm):'
 
             if can_post:
                 self.session[LAST_POST_TIME] = now
+            else:
+                # Reset the time since posting failed
+                self._set_session_cache(LAST_POST_TIME, self.session[LAST_POST_TIME])
 
     def _get_file_from_url(self, url: str) -> SimpleUploadedFile:
         """

boards/locale/ru/LC_MESSAGES/django.po

@@ -602,11 +602,11 b' msgstr "\xd0\x97\xd0\xb0\xd0\xb1\xd0\xb0\xd0\xbd\xd0\xb8\xd1\x82\xd1\x8c"'
 msgid "URL download mode"
 msgstr "Режим загрузки ссылок"
 
-msgid "Download if possible"
-msgstr "Загружать если возможно"
+msgid "Download or add URL"
+msgstr "Загрузить или добавить ссылку"
 
-msgid "Download"
-msgstr "Загружать"
+msgid "Download or fail"
+msgstr "Загрузить или отказать"
 
 msgid "Insert as URLs"
 msgstr "Вставлять как ссылки"

boards/locale/uk/LC_MESSAGES/django.po

@@ -602,11 +602,11 b' msgstr "\xd0\x97\xd0\xb0\xd0\xb1\xd0\xbb\xd0\xbe\xd0\xba\xd1\x83\xd0\xb2\xd0\xb0\xd1\x82\xd0\xb8"'
 msgid "URL download mode"
 msgstr "Режим завантаження посилань"
 
-msgid "Download if possible"
-msgstr "Завантажувати якщо можливо"
+msgid "Download or add URL"
+msgstr "Завантажити або додати посилання"
 
-msgid "Download"
-msgstr "Завантажувати"
+msgid "Download or fail"
+msgstr "Завантажити або відмовити"
 
 msgid "Insert as URLs"
 msgstr "Вставляти як посилання"