tileradotorg/synapse
1
0
Fork 0
forked from MirrorHub/synapse
Code Pull requests Activity

Merge pull request #2479 from matrix-org/erikj/expire_url_cache_thumbnails

Browse source 
Support new and old style media id formats
This commit is contained in:
Erik Johnston 2017-09-28 12:58:13 +01:00 committed by GitHub
parent 7a44c01d89 ace8079086
commit 761d255fdf
1 changed files with 81 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

112
synapse/rest/media/v1/filepath.py
View file

@ -14,6 +14,9 @@
# limitations under the License. # limitations under the License.
import os import os
import re
NEW_FORMAT_ID_RE = re.compile(r"^\d\d\d\d-\d\d-\d\d")
class MediaFilePaths(object): class MediaFilePaths(object):
@ -73,21 +76,39 @@ class MediaFilePaths(object):
) )
def url_cache_filepath(self, media_id): def url_cache_filepath(self, media_id):
# Media id is of the form <DATE><RANDOM_STRING> if NEW_FORMAT_ID_RE.match(media_id):
# E.g.: 2017-09-28-fsdRDt24DS234dsf # Media id is of the form <DATE><RANDOM_STRING>
return os.path.join( # E.g.: 2017-09-28-fsdRDt24DS234dsf
self.base_path, "url_cache", return os.path.join(
media_id[:10], media_id[11:] self.base_path, "url_cache",
) media_id[:10], media_id[11:]
)
else:
return os.path.join(
self.base_path, "url_cache",
media_id[0:2], media_id[2:4], media_id[4:],
)
def url_cache_filepath_dirs_to_delete(self, media_id): def url_cache_filepath_dirs_to_delete(self, media_id):
"The dirs to try and remove if we delete the media_id file" "The dirs to try and remove if we delete the media_id file"
return [ if NEW_FORMAT_ID_RE.match(media_id):
os.path.join( return [
self.base_path, "url_cache", os.path.join(
media_id[:10], self.base_path, "url_cache",
), media_id[:10],
] ),
]
else:
return [
os.path.join(
self.base_path, "url_cache",
media_id[0:2], media_id[2:4],
),
os.path.join(
self.base_path, "url_cache",
media_id[0:2],
),
]
def url_cache_thumbnail(self, media_id, width, height, content_type, def url_cache_thumbnail(self, media_id, width, height, content_type,
method): method):
@ -99,32 +120,61 @@ class MediaFilePaths(object):
width, height, top_level_type, sub_type, method width, height, top_level_type, sub_type, method
) )
return os.path.join( if NEW_FORMAT_ID_RE.match(media_id):
self.base_path, "url_cache_thumbnails", return os.path.join(
media_id[:10], media_id[11:], self.base_path, "url_cache_thumbnails",
file_name media_id[:10], media_id[11:],
) file_name
)
else:
return os.path.join(
self.base_path, "url_cache_thumbnails",
media_id[0:2], media_id[2:4], media_id[4:],
file_name
)
def url_cache_thumbnail_directory(self, media_id): def url_cache_thumbnail_directory(self, media_id):
# Media id is of the form <DATE><RANDOM_STRING> # Media id is of the form <DATE><RANDOM_STRING>
# E.g.: 2017-09-28-fsdRDt24DS234dsf # E.g.: 2017-09-28-fsdRDt24DS234dsf
return os.path.join( if NEW_FORMAT_ID_RE.match(media_id):
self.base_path, "url_cache_thumbnails", return os.path.join(
media_id[:10], media_id[11:], self.base_path, "url_cache_thumbnails",
) media_id[:10], media_id[11:],
)
else:
return os.path.join(
self.base_path, "url_cache_thumbnails",
media_id[0:2], media_id[2:4], media_id[4:],
)
def url_cache_thumbnail_dirs_to_delete(self, media_id): def url_cache_thumbnail_dirs_to_delete(self, media_id):
"The dirs to try and remove if we delete the media_id thumbnails" "The dirs to try and remove if we delete the media_id thumbnails"
# Media id is of the form <DATE><RANDOM_STRING> # Media id is of the form <DATE><RANDOM_STRING>
# E.g.: 2017-09-28-fsdRDt24DS234dsf # E.g.: 2017-09-28-fsdRDt24DS234dsf
return [ if NEW_FORMAT_ID_RE.match(media_id):
os.path.join( return [
self.base_path, "url_cache_thumbnails", os.path.join(
media_id[:10], media_id[11:], self.base_path, "url_cache_thumbnails",
), media_id[:10], media_id[11:],
os.path.join( ),
self.base_path, "url_cache_thumbnails", os.path.join(
media_id[:10], self.base_path, "url_cache_thumbnails",
), media_id[:10],
] ),
]
else:
return [
os.path.join(
self.base_path, "url_cache_thumbnails",
media_id[0:2], media_id[2:4], media_id[4:],
),
os.path.join(
self.base_path, "url_cache_thumbnails",
media_id[0:2], media_id[2:4],
),
os.path.join(
self.base_path, "url_cache_thumbnails",
media_id[0:2],
),
]