Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Matrix
- Activity
- Members
- Labels
- Container Registry
- Model registry
- Environments

Snippets Groups Projects

1f881e07

Unverified Commit 1f881e07 authored 7 years ago by Erik Johnston Committed by GitHub 7 years ago

Downloads
- Plain Diff

Merge pull request #2791 from matrix-org/erikj/media_storage_refactor

Ensure media is in local cache before thumbnailing

parents 9c935651 ce4f6613

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

synapse/rest/media/v1/media_repository.py 11 additions, 9 deletions

synapse/rest/media/v1/media_repository.py
synapse/rest/media/v1/media_storage.py 34 additions, 2 deletions

synapse/rest/media/v1/media_storage.py
synapse/rest/media/v1/thumbnail_resource.py 2 additions, 1 deletion

synapse/rest/media/v1/thumbnail_resource.py
tests/rest/media/__init__.py 14 additions, 0 deletions

tests/rest/media/__init__.py
tests/rest/media/v1/__init__.py 14 additions, 0 deletions

tests/rest/media/v1/__init__.py
tests/rest/media/v1/test_media_storage.py 81 additions, 0 deletions

tests/rest/media/v1/test_media_storage.py

with 156 additions and 12 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment