diff options
author | Erik Johnston <erikj@jki.re> | 2017-06-23 12:00:45 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-06-23 12:00:45 +0100 |
commit | 4fec80ba6fb89ad4f2e527dbaea6c0c2ec9aa4b6 (patch) | |
tree | a2bd30b908118a6e9dff04259e7e2b54d6d6b44a /synapse/rest/media/v1/filepath.py | |
parent | Merge pull request #2297 from matrix-org/erikj/user_dir_fix (diff) | |
parent | Store URL cache preview downloads seperately (diff) | |
download | synapse-4fec80ba6fb89ad4f2e527dbaea6c0c2ec9aa4b6.tar.xz |
Merge pull request #2299 from matrix-org/erikj/segregate_url_cache_downloads
Store URL cache preview downloads separately
Diffstat (limited to 'synapse/rest/media/v1/filepath.py')
-rw-r--r-- | synapse/rest/media/v1/filepath.py | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/synapse/rest/media/v1/filepath.py b/synapse/rest/media/v1/filepath.py index 0137458f71..d92b7ff337 100644 --- a/synapse/rest/media/v1/filepath.py +++ b/synapse/rest/media/v1/filepath.py @@ -71,3 +71,21 @@ class MediaFilePaths(object): self.base_path, "remote_thumbnail", server_name, file_id[0:2], file_id[2:4], file_id[4:], ) + + def url_cache_filepath(self, media_id): + return os.path.join( + self.base_path, "url_cache", + media_id[0:2], media_id[2:4], media_id[4:] + ) + + def url_cache_thumbnail(self, media_id, 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, "url_cache_thumbnails", + media_id[0:2], media_id[2:4], media_id[4:], + file_name + ) |