Refactored attachment viewers to store view htmls as constants

boards/models/attachment/viewers.py

@@ -52,6 +52,36 b' URL_PROTOCOLS = {'
 CSS_CLASS_IMAGE = 'image'
 CSS_CLASS_THUMB = 'thumb'
 
+ABSTRACT_VIEW = '<div class="image">'\
+        '{}'\
+        '<div class="image-metadata"><a href="{}" download >{}, {}</a>'\
+        ' <a class="file-menu" href="#" data-type="{}" data-search-url="{}" data-filename="{}">🔍 </a></div>'\
+        '</div>'
+URL_VIEW = '<div class="image">' \
+        '{}' \
+        '<div class="image-metadata">{}</div>' \
+        '</div>'
+ABSTRACT_FORMAT_VIEW = '<a href="{}">'\
+        '<img class="url-image" src="{}" width="{}" height="{}"/>'\
+        '</a>'
+VIDEO_FORMAT_VIEW = '<video width="200" height="150" controls src="{}"></video>'
+AUDIO_FORMAT_VIEW = '<audio controls src="{}"></audio>'
+IMAGE_FORMAT_VIEW = '<a class="{}" href="{full}">' \
+        '<img class="post-image-preview"' \
+        ' src="{}"' \
+        ' alt="{}"' \
+        ' width="{}"' \
+        ' height="{}"' \
+        ' data-width="{}"' \
+        ' data-height="{}" />' \
+        '</a>'
+SVG_FORMAT_VIEW = '<a class="thumb" href="{}">'\
+        '<img class="post-image-preview" width="200" height="150" src="{}" />'\
+        '</a>'
+URL_FORMAT_VIEW = '<a href="{}">' \
+        '<img class="url-image" src="{}" width="{}" height="{}"/>' \
+        '</a>'
+
 
 def get_viewers():
     return AbstractViewer.__subclasses__()
@@ -87,13 +117,9 b' class AbstractViewer:'
         else:
             search_url = ''
 
-        return '<div class="image">'\
-               '{}'\
-               '<div class="image-metadata"><a href="{}" download >{}, {}</a>'\
-               ' <a class="file-menu" href="#" data-type="{}" data-search-url="{}" data-filename="{}">🔍 </a></div>'\
-               '</div>'.format(self.get_format_view(), self.file.url,
-                               self.file_type, filesizeformat(self.file.size),
-                               self.file_type, search_url, self.file.name)
+        return ABSTRACT_VIEW.format(self.get_format_view(), self.file.url,
+                self.file_type, filesizeformat(self.file.size),
+                self.file_type, search_url, self.file.name)
 
     def get_format_view(self):
         image_name = PLAIN_FILE_FORMATS.get(self.file_type, self.file_type)
@@ -106,9 +132,7 b' class AbstractViewer:'
 
         w, h = get_static_dimensions(image)
 
-        return '<a href="{}">'\
-               '<img class="url-image" src="{}" width="{}" height="{}"/>'\
-               '</a>'.format(self.file.url, static(image), w, h)
+        return ABSTRACT_FORMAT_VIEW.format(self.file.url, static(image), w, h)
 
 
 class VideoViewer(AbstractViewer):
@@ -117,8 +141,7 b' class VideoViewer(AbstractViewer):'
         return file_type in FILE_TYPES_VIDEO
 
     def get_format_view(self):
-        return '<video width="200" height="150" controls src="{}"></video>'\
-               .format(self.file.url)
+        return VIDEO_FORMAT_VIEW.format(self.file.url)
 
 
 class AudioViewer(AbstractViewer):
@@ -127,7 +150,7 b' class AudioViewer(AbstractViewer):'
         return file_type in FILE_TYPES_AUDIO
 
     def get_format_view(self):
-        return '<audio controls src="{}"></audio>'.format(self.file.url)
+        return AUDIO_FORMAT_VIEW.format(self.file.url)
 
 
 class SvgViewer(AbstractViewer):
@@ -136,9 +159,7 b' class SvgViewer(AbstractViewer):'
         return file_type == FILE_TYPE_SVG
 
     def get_format_view(self):
-        return '<a class="thumb" href="{}">'\
-               '<img class="post-image-preview" width="200" height="150" src="{}" />'\
-               '</a>'.format(self.file.url, self.file.url)
+        return SVG_FORMAT_VIEW.format(self.file.url, self.file.url)
 
 
 class ImageViewer(AbstractViewer):
@@ -164,21 +185,12 b' class ImageViewer(AbstractViewer):'
         w, h = 200, 150
         thumb_url = '%s.%sx%s.%s' % (split[0], w, h, split[1])
 
-        return '<a class="{}" href="{full}">' \
-               '<img class="post-image-preview"' \
-               ' src="{}"' \
-               ' alt="{}"' \
-               ' width="{}"' \
-               ' height="{}"' \
-               ' data-width="{}"' \
-               ' data-height="{}" />' \
-               '</a>' \
-            .format(CSS_CLASS_THUMB,
-                    thumb_url,
-                    self.hash,
-                    str(pre_width),
-                    str(pre_height), str(width), str(height),
-                    full=self.file.url, image_meta=metadata)
+        return IMAGE_FORMAT_VIEW.format(CSS_CLASS_THUMB,
+                thumb_url,
+                self.hash,
+                str(pre_width),
+                str(pre_height), str(width), str(height),
+                full=self.file.url, image_meta=metadata)
 
 
 class UrlViewer(AbstractViewer):
@@ -187,10 +199,7 b' class UrlViewer(AbstractViewer):'
         return file_type is None
 
     def get_view(self):
-        return '<div class="image">' \
-               '{}' \
-               '<div class="image-metadata">{}</div>' \
-               '</div>'.format(self.get_format_view(), get_domain(self.url))
+        return URL_VIEW.format(self.get_format_view(), get_domain(self.url))
 
     def get_format_view(self):
         protocol = self.url.split(':')[0]
@@ -208,9 +217,7 b' class UrlViewer(AbstractViewer):'
         image = static(image_path)
         w, h = get_static_dimensions(image_path)
 
-        return '<a href="{}">' \
-               '<img class="url-image" src="{}" width="{}" height="{}"/>' \
-               '</a>'.format(self.url, image, w, h)
+        return URL_FORMAT_VIEW.format(self.url, image, w, h)
 
     @cached_result()
     def _find_image_for_domains(self, domain):