Load URL if the file could not be loaded

boards/forms.py

@@ -69,6 +69,9 b' MIMETYPE_EXTENSIONS = {'
 }
 
 
+logger = logging.getLogger('boards.forms')
+
+
 def get_timezones():
     timezones = []
     for tz in pytz.common_timezones:
@@ -235,19 +238,24 b' class PostForm(NeboardForm):'
         file = None
 
         if url:
-            file = get_image_by_alias(url, self.session)
-            self.image = file
+            try:
+                file = get_image_by_alias(url, self.session)
+                self.image = file
 
-            if file is not None:
-                return
+                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)
+                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
+                logger.info('Error in forms: {}'.format(e))
+                return url
 
         return file
 
@@ -298,7 +306,6 b' class PostForm(NeboardForm):'
                 self._validate_posting_speed()
             settings_manager.set_setting('confirmed_user', True)
 
-
         return cleaned_data
 
     def get_file(self):
@@ -307,7 +314,15 b' class PostForm(NeboardForm):'
         """
 
         file = self.cleaned_data['file']
-        return file or self.cleaned_data['file_url']
+        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
+
+    def get_file_url(self):
+        if not self.get_file():
+            return self.cleaned_data['file_url']
 
     def get_tripcode(self):
         title = self.cleaned_data['title']
@@ -337,9 +352,10 b' class PostForm(NeboardForm):'
     def _clean_text_file(self):
         text = self.cleaned_data.get('text')
         file = self.get_file()
+        file_url = self.get_file_url()
         images = self.get_images()
 
-        if (not text) and (not file) and len(images) == 0:
+        if (not text) and (not file) and (not file_url) and len(images) == 0:
             error_message = _('Either text or file must be entered.')
             self._errors['text'] = self.error_class([error_message])
 

boards/models/attachment/__init__.py

@@ -23,6 +23,14 b' class AttachmentManager(models.Manager):'
 
         return attachment
 
+    def create_from_url(self, url):
+        existing = self.filter(url=url)
+        if len(existing) > 0:
+            attachment = existing[0]
+        else:
+            attachment = self.create(url=url)
+        return attachment
+
     def get_random_images(self, count, tags=None):
         images = self.filter(mimetype__in=FILE_TYPES_IMAGE).exclude(
             attachment_posts__thread__status=STATUS_ARCHIVE)
@@ -34,10 +42,11 b' class AttachmentManager(models.Manager):'
 class Attachment(models.Model):
     objects = AttachmentManager()
 
-    file = models.FileField(upload_to=get_upload_filename)
-    mimetype = models.CharField(max_length=50)
-    hash = models.CharField(max_length=36)
+    file = models.FileField(upload_to=get_upload_filename, null=True)
+    mimetype = models.CharField(max_length=50, null=True)
+    hash = models.CharField(max_length=36, null=True)
     alias = models.TextField(unique=True, null=True, blank=True)
+    url = models.TextField(null=True)
 
     def get_view(self):
         file_viewer = None
@@ -48,10 +57,10 b' class Attachment(models.Model):'
         if file_viewer is None:
             file_viewer = AbstractViewer
 
-        return file_viewer(self.file, self.mimetype, self.hash).get_view()
+        return file_viewer(self.file, self.mimetype, self.hash, self.url).get_view()
 
     def __str__(self):
-        return self.file.url
+        return self.url or self.file.url
 
     def get_random_associated_post(self):
         posts = boards.models.Post.objects.filter(attachments__in=[self])
@@ -59,10 +68,11 b' class Attachment(models.Model):'
 
     @cached_result()
     def get_size(self):
-        if self.mimetype in FILE_TYPES_IMAGE:
-            return get_image_dimensions(self.file)
-        else:
-            return 200, 150
+        if self.file:
+            if self.mimetype in FILE_TYPES_IMAGE:
+                return get_image_dimensions(self.file)
+            else:
+                return 200, 150
 
     def get_thumb_url(self):
         split = self.file.url.rsplit('.', 1)

boards/models/attachment/viewers.py

@@ -3,6 +3,7 b' from django.template.defaultfilters impo'
 from django.contrib.staticfiles.templatetags.staticfiles import static
 
 FILE_STUB_IMAGE = 'images/file.png'
+FILE_STUB_URL = 'images/url.png'
 
 FILE_TYPES_VIDEO = (
     'webm',
@@ -39,10 +40,11 b' def get_viewers():'
 
 
 class AbstractViewer:
-    def __init__(self, file, file_type, hash):
+    def __init__(self, file, file_type, hash, url):
         self.file = file
         self.file_type = file_type
         self.hash = hash
+        self.url = url
 
     @staticmethod
     def supports(file_type):
@@ -129,3 +131,17 b' class ImageViewer(AbstractViewer):'
                     str(pre_height), str(width), str(height),
                     full=self.file.url, image_meta=metadata)
 
+
+class UrlViewer(AbstractViewer):
+    @staticmethod
+    def supports(file_type):
+        return file_type is None
+
+    def get_view(self):
+        return '<div class="image">' \
+               '{}' \
+               '</div>'.format(self.get_format_view())
+    def get_format_view(self):
+        return '<a href="{}">' \
+               '<img src="{}" width="200" height="150"/>' \
+               '</a>'.format(self.url, static(FILE_STUB_URL))

boards/models/post/manager.py

@@ -28,7 +28,8 b' class PostManager(models.Manager):'
     @transaction.atomic
     def create_post(self, title: str, text: str, file=None, thread=None,
                     ip=NO_IP, tags: list=None, opening_posts: list=None,
-                    tripcode='', monochrome=False, images=[]):
+                    tripcode='', monochrome=False, images=[],
+                    file_url=None):
         """
         Creates new post
         """
@@ -79,6 +80,8 b' class PostManager(models.Manager):'
             self._add_file_to_post(file, post)
         for image in images:
             post.attachments.add(image)
+        if file_url:
+            post.attachments.add(Attachment.objects.create_from_url(file_url))
 
         post.connect_threads(opening_posts)
         post.set_global_id()

boards/views/all_threads.py

@@ -134,6 +134,7 b' class AllThreadsView(PostMixin, FileUplo'
         title = form.get_title()
         text = data[FORM_TEXT]
         file = form.get_file()
+        file_url = form.get_file_url()
         threads = data[FORM_THREADS]
         images = form.get_images()
 
@@ -145,7 +146,8 b' class AllThreadsView(PostMixin, FileUplo'
         post = Post.objects.create_post(title=title, text=text, file=file,
                                         ip=ip, tags=tags, opening_posts=threads,
                                         tripcode=form.get_tripcode(),
-                                        monochrome=monochrome, images=images)
+                                        monochrome=monochrome, images=images,
+                                        file_url = file_url)
 
         # This is required to update the threads to which posts we have replied
         # when creating this one

boards/views/thread/thread.py

@@ -128,6 +128,7 b' class ThreadView(BaseBoardView, PostMixi'
         title = form.get_title()
         text = data[FORM_TEXT]
         file = form.get_file()
+        file_url = form.get_file_url()
         threads = data[FORM_THREADS]
         images = form.get_images()
 
@@ -139,7 +140,7 b' class ThreadView(BaseBoardView, PostMixi'
                                         thread=post_thread, ip=ip,
                                         opening_posts=threads,
                                         tripcode=form.get_tripcode(),
-                                        images=images)
+                                        images=images, file_url=file_url)
         post.notify_clients()
 
         if form.is_subscribe():