Refactored post export

boards/models/post/export.py

@@ -0,0 +1,55 b''
+from boards import utils
+
+
+PARAMETER_TRUNCATED = 'truncated'
+
+DIFF_TYPE_HTML = 'html'
+DIFF_TYPE_JSON = 'json'
+
+
+class Exporter():
+    @staticmethod
+    def export(post, request, include_last_update) -> str:
+        pass
+
+
+class HtmlExporter(Exporter):
+    @staticmethod
+    def export(post, request, include_last_update):
+        if request is not None and PARAMETER_TRUNCATED in request.GET:
+            truncated = True
+            reply_link = False
+        else:
+            truncated = False
+            reply_link = True
+
+        return post.get_view(truncated=truncated, reply_link=reply_link,
+                             moderator=utils.is_moderator(request))
+
+
+class JsonExporter(Exporter):
+    @staticmethod
+    def export(post, request, include_last_update):
+        post_json = {
+            'id': post.id,
+            'title': post.title,
+            'text': post.get_raw_text(),
+            }
+        if post.images.exists():
+            post_image = post.get_first_image()
+            post_json['image'] = post_image.image.url
+            post_json['image_preview'] = post_image.image.url_200x150
+        if include_last_update:
+            post_json['bump_time'] = utils.datetime_to_epoch(
+                post.get_thread().bump_time)
+        return post_json
+
+
+EXPORTERS = {
+    DIFF_TYPE_HTML: HtmlExporter,
+    DIFF_TYPE_JSON: JsonExporter,
+}
+
+
+def get_exporter(export_type: str) -> Exporter:
+    return EXPORTERS[export_type]()

boards/models/post/__init__.py

@@ -16,6 +16,7 b' from boards.mdx_neboard import Parser'
 from boards.models import PostImage
 from boards.models.base import Viewable
 from boards import utils
+from boards.models.post.export import get_exporter, DIFF_TYPE_JSON
 from boards.models.user import Notification, Ban
 import boards.models.thread
 
@@ -49,9 +50,6 b" PARAMETER_OP_ID = 'opening_post_id'"
 PARAMETER_NEED_OPEN_LINK = 'need_open_link'
 PARAMETER_REPLY_LINK = 'reply_link'
 
-DIFF_TYPE_HTML = 'html'
-DIFF_TYPE_JSON = 'json'
-
 REFMAP_STR = '<a href="{}">&gt;&gt;{}</a>'
 
 
@@ -292,7 +290,6 b' class Post(models.Model, Viewable):'
         logging.getLogger('boards.post.delete').info(
             'Deleted post {}'.format(self))
 
-    # TODO Implement this with OOP, e.g. use the factory and HtmlPostData class
     def get_post_data(self, format_type=DIFF_TYPE_JSON, request=None,
                       include_last_update=False) -> str:
         """
@@ -300,30 +297,8 b' class Post(models.Model, Viewable):'
         API.
         """
 
-        if format_type == DIFF_TYPE_HTML:
-            if request is not None and PARAMETER_TRUNCATED in request.GET:
-                truncated = True
-                reply_link = False
-            else:
-                truncated = False
-                reply_link = True
-
-            return self.get_view(truncated=truncated, reply_link=reply_link,
-                                 moderator=utils.is_moderator(request))
-        elif format_type == DIFF_TYPE_JSON:
-            post_json = {
-                'id': self.id,
-                'title': self.title,
-                'text': self._text_rendered,
-                }
-            if self.images.exists():
-                post_image = self.get_first_image()
-                post_json['image'] = post_image.image.url
-                post_json['image_preview'] = post_image.image.url_200x150
-            if include_last_update:
-                post_json['bump_time'] = utils.datetime_to_epoch(
-                    self.get_thread().bump_time)
-            return post_json
+        return get_exporter(format_type).export(self, request,
+                                                include_last_update)
 
     def notify_clients(self, recursive=True):
         """