Matrix-Mirrors/synapse-product
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse-product.git synced 2024-10-01 08:25:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

Ensure only one download for a given URL is active at a time

Browse Source
This commit is contained in:
Matthew Hodgson 2016-04-03 00:47:40 +01:00
parent 7426c86eb8
commit b09e29a03c
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
synapse/rest/media/v1/preview_url_resource.py
View File

@ -23,6 +23,7 @@ from synapse.util.stringutils import random_string
from synapse.util.caches.expiringcache import ExpiringCache from synapse.util.caches.expiringcache import ExpiringCache
from synapse.http.client import SpiderHttpClient from synapse.http.client import SpiderHttpClient
from synapse.http.server import request_handler, respond_with_json, respond_with_json_bytes from synapse.http.server import request_handler, respond_with_json, respond_with_json_bytes
from synapse.util.async import ObservableDeferred
import os import os
import re import re
@ -46,6 +47,8 @@ class PreviewUrlResource(BaseMediaResource):
) )
self.cache.start() self.cache.start()
self.downloads = {}
def render_GET(self, request): def render_GET(self, request):
self._async_render_GET(request) self._async_render_GET(request)
return NOT_DONE_YET return NOT_DONE_YET
@ -86,7 +89,21 @@ class PreviewUrlResource(BaseMediaResource):
) )
return return
media_info = yield self._download_url(url, requester.user) # Ensure only one download for a given URL is active at a time
download = self.downloads.get(url)
if download is None:
download = self._download_url(url, requester.user)
download = ObservableDeferred(
download,
consumeErrors=True
)
self.downloads[url] = download
@download.addBoth
def callback(media_info):
del self.downloads[key]
return media_info
media_info = yield download.observe()
# FIXME: we should probably update our cache now anyway, so that # FIXME: we should probably update our cache now anyway, so that
# even if the OG calculation raises, we don't keep hammering on the # even if the OG calculation raises, we don't keep hammering on the