Thumbnail uploaded and cached images

1 files changed, 21 insertions, 7 deletions

diff --git a/synapse/media/v1/filepath.py b/synapse/media/v1/filepath.py
index d23564e03e..0078bc3d40 100644
--- a/synapse/media/v1/filepath.py
+++ b/synapse/media/v1/filepath.py
@@ -21,33 +21,47 @@ class MediaFilePaths(object):
     def __init__(self, base_path):
         self.base_path = base_path
 
+    def default_thumbnail(self, default_top_level, default_sub_type, width,
+                          height, content_type, method):
+        top_level_type, sub_type = content_type.split("/")
+        file_name = "%i-%i-%s-%s-%s" % (
+            width, height, top_level_type, sub_type, method
+        )
+        return os.path.join(
+            self.base_path, "default_thumbnails", default_top_level,
+            default_sub_type, file_name
+        )
+
     def local_media_filepath(self, media_id):
         return os.path.join(
-            self.base_path, "local", "content",
+            self.base_path, "local_content",
             media_id[0:2], media_id[2:4], media_id[4:]
         )
 
-    def local_media_thumbnail(self, media_id, width, height, content_type):
+    def local_media_thumbnail(self, media_id, width, height, content_type,
+                              method):
         top_level_type, sub_type = content_type.split("/")
-        file_name = "%i-%i-%s-%s" % (width, height, top_level_type, sub_type)
+        file_name = "%i-%i-%s-%s-%s" % (
+            width, height, top_level_type, sub_type, method
+        )
         return os.path.join(
-            self.base_path, "local", "thumbnails",
+            self.base_path, "local_thumbnails",
             media_id[0:2], media_id[2:4], media_id[4:],
             file_name
         )
 
     def remote_media_filepath(self, server_name, file_id):
         return os.path.join(
-            self.base_path, "remote", "content", server_name,
+            self.base_path, "remote_content", server_name,
             file_id[0:2], file_id[2:4], file_id[4:]
         )
 
     def remote_media_thumbnail(self, server_name, file_id, width, height,
-                               content_type):
+                               content_type, method):
         top_level_type, sub_type = content_type.split("/")
         file_name = "%i-%i-%s-%s" % (width, height, top_level_type, sub_type)
         return os.path.join(
-            self.base_path, "remote", "content", server_name,
+            self.base_path, "remote_thumbnail", server_name,
             file_id[0:2], file_id[2:4], file_id[4:],
             file_name
         )