Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-12-15 15:08:48 -05:00
Code Issues Projects Releases Packages Wiki Activity

Combine the request wrappers in rest/media/v1 and http/server into a single wrapper decorator

Browse source
This commit is contained in:
Mark Haines 2015-04-21 16:35:53 +01:00
parent 1ebff9736b
commit 1967650bc4
7 changed files with 140 additions and 198 deletions
Download patch file Download diff file Expand all files Collapse all files

12
synapse/rest/media/v1/download_resource.py
View file

@ -13,7 +13,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
from .base_resource import BaseMediaResource
from .base_resource import BaseMediaResource, parse_media_id
from synapse.http.server import request_handler
from twisted.web.server import NOT_DONE_YET
from twisted.internet import defer
@ -28,15 +29,10 @@ class DownloadResource(BaseMediaResource):
self._async_render_GET(request)
return NOT_DONE_YET
@BaseMediaResource.catch_errors
@request_handler
@defer.inlineCallbacks
def _async_render_GET(self, request):
try:
server_name, media_id = request.postpath
except:
self._respond_404(request)
return
server_name, media_id = parse_media_id(request)
if server_name == self.server_name:
yield self._respond_local_file(request, media_id)
else: