diff options
author | Erik Johnston <erik@matrix.org> | 2017-06-26 14:02:44 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2017-06-26 14:02:44 +0100 |
commit | e3cbec10c10e64c8388c4030191c141a8cbe4966 (patch) | |
tree | 6a4eacab98c581406eacf47c392b7a41fa00118f /synapse/rest/media/v1/filepath.py | |
parent | Reject local events that don't round trip the DB (diff) | |
parent | Merge pull request #2301 from xwiki-labs/push-redact-content (diff) | |
download | synapse-e3cbec10c10e64c8388c4030191c141a8cbe4966.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/ensure_round_trip
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 + ) |