diff options
| author | Mark Haines <mark.haines@matrix.org> | 2014-12-02 19:51:47 +0000 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2014-12-02 19:51:47 +0000 |
| commit | 5da65085d106e98cf7b762836cb300d01226bf92 (patch) | |
| tree | a6de5abe0e3485800f382221e861961578a82d2f /synapse/storage/media_repository.py | |
| parent | Write the upload portion of version 1 of the media repository (diff) | |
| download | synapse-5da65085d106e98cf7b762836cb300d01226bf92.tar.xz | |
Get uploads working with new media repo
Diffstat (limited to 'synapse/storage/media_repository.py')
| -rw-r--r-- | synapse/storage/media_repository.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/synapse/storage/media_repository.py b/synapse/storage/media_repository.py index 73ceba3f2c..db03619a80 100644 --- a/synapse/storage/media_repository.py +++ b/synapse/storage/media_repository.py @@ -20,10 +20,15 @@ class MediaRepositoryStore(SQLBaseStore): """Persistence for attachments and avatars""" def get_local_media(self, media_id): + """Get the metadata for a local piece of media + Returns: + None if the media_id doesn't exist. + """ return self._simple_select_one( "local_media_repository", {"media_id": media_id}, ("media_type", "media_length", "upload_name", "created_ts"), + True, ) def store_local_media(self, media_id, media_type, time_now_ms, upload_name, @@ -36,7 +41,7 @@ class MediaRepositoryStore(SQLBaseStore): "created_ts": time_now_ms, "upload_name": upload_name, "media_length": media_length, - "user_id": user_id, + "user_id": user_id.to_string(), } ) |