dandri/synapse
1
0
Fork 0
mirror of https://github.com/element-hq/synapse.git synced 2026-06-01 10:54:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make things be absolute paths again

Browse Source
This commit is contained in:
Erik Johnston
2017-10-13 11:35:44 +01:00
parent 9732ec6797
commit ae5d18617a
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
synapse/rest/media/v1/filepath.py
+7 -7
View File
@@ -172,12 +172,12 @@ class MediaFilePaths(object):
if NEW_FORMAT_ID_RE.match(media_id):
return os.path.join(
"url_cache_thumbnails",
self.primary_base_path, "url_cache_thumbnails",
media_id[:10], media_id[11:],
)
else:
return os.path.join(
"url_cache_thumbnails",
self.primary_base_path, "url_cache_thumbnails",
media_id[0:2], media_id[2:4], media_id[4:],
)
@@ -188,26 +188,26 @@ class MediaFilePaths(object):
if NEW_FORMAT_ID_RE.match(media_id):
return [
os.path.join(
"url_cache_thumbnails",
self.primary_base_path, "url_cache_thumbnails",
media_id[:10], media_id[11:],
),
os.path.join(
"url_cache_thumbnails",
self.primary_base_path, "url_cache_thumbnails",
media_id[:10],
),
]
else:
return [
os.path.join(
"url_cache_thumbnails",
self.primary_base_path, "url_cache_thumbnails",
media_id[0:2], media_id[2:4], media_id[4:],
),
os.path.join(
"url_cache_thumbnails",
self.primary_base_path, "url_cache_thumbnails",
media_id[0:2], media_id[2:4],
),
os.path.join(
"url_cache_thumbnails",
self.primary_base_path, "url_cache_thumbnails",
media_id[0:2],
),
]