Receive images #21
Merged
Receive images #21
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
I added an extra /join in the upload url - synapse seems to ignore it but we'd better remove it! Signed-off-by: Dr. David Alan Gilbert <[email protected]>
richvdh
reviewed
Nov 3, 2016
| @@ -105,6 +105,8 @@ typedef struct { | |||
| gchar *content_type; | |||
| gboolean got_headers; | |||
| JsonParser *json_parser; | |||
| const char *body; | |||
There was a problem hiding this comment.
need to initialise these in _response_parser_data_new
| @@ -444,6 +450,17 @@ static const char *type_guess(PurpleStoredImage *image) | |||
| } | |||
| } | |||
|
|
|||
| /** | |||
| * Check if the declared image type is an image type we recongise. | |||
| /** | ||
| * Check if the declared image type is an image type we recongise. | ||
| */ | ||
| static gboolean check_image_type(const char *content_type) |
There was a problem hiding this comment.
nit: i'd prefer a less ambiguous name here: is_image_type or something
| PURPLE_MESSAGE_RECV | PURPLE_MESSAGE_IMAGES, | ||
| g_strdup_printf("<IMG ID=\"%d\">", img_id), rid->timestamp / 1000); | ||
| } else { | ||
| serv_got_chat_in(rid->conv->account->gc, g_str_hash(rid->room_id), |
There was a problem hiding this comment.
it would be nice to show the fallback (event.body) here?
ditto in _image_download_bad_response and _image_download_error
There was a problem hiding this comment.
OK, I think I've fixed that and the other comments; and pushed to this same branch - do you see that?
When a response can't be parsed as JSON pass the body and length to the callback. Also add the content_type. Signed-off-by: Dr. David Alan Gilbert <[email protected]>
Download a file given a URI. Signed-off-by: Dr. David Alan Gilbert <[email protected]>
penguin42
force-pushed
the
send-images
branch
from
14f6ac5 to
ede071e
Compare
Download images received in events, adding them to Purple's image cache. There are probably improvements that can be made in failure paths and also in trying to use thumbnails. Signed-off-by: Dr. David Alan Gilbert <[email protected]>
penguin42
force-pushed
the
send-images
branch
from
ede071e to
4addb8e
Compare
|
Sorry for sitting on this. LGTM! |
|
(and thanks!) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is at the 'seems to work' level; I get the feeling it could probably do with a bit more testing and perhaps a bit more thought on things like what gets free'd where; but have a look.