livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added callback to post photo with actual image url

master
Cho 2013-06-05 23:52:34 +01:00
parent 1734cabbcc
commit 4d162e1ec2
3 changed files with 52 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
indra/newview/llpanelsnapshotfacebook.cpp
View File

@ -64,6 +64,7 @@ private:
/*virtual*/ void updateControls(const LLSD& info);
void onSend();
void onImageUploaded(const std::string& image_url, const std::string& caption);
};
static LLRegisterPanelClassWrapper<LLPanelSnapshotFacebook> panel_class("llpanelsnapshotfacebook");
@ -98,9 +99,17 @@ void LLPanelSnapshotFacebook::onSend()
std::string caption = getChild<LLUICtrl>("caption")->getValue().asString();
bool add_location = getChild<LLUICtrl>("add_location_cb")->getValue().asBoolean();
LLWebProfile::uploadImage(LLFloaterSnapshot::getImageData(), caption, add_location);
LLWebProfile::uploadImage(LLFloaterSnapshot::getImageData(), caption, add_location, boost::bind(&LLPanelSnapshotFacebook::onImageUploaded, this, _1, _2));
LLFloaterSnapshot::postSave();
// test with a placeholder image, until we can figure out a way to grab the uploaded image url
LLFacebookConnect::instance().sharePhoto("http://fc02.deviantart.net/fs43/i/2009/125/a/9/Future_of_Frog_by_axcho.jpg", caption);
//LLFacebookConnect::instance().sharePhoto("http://fc02.deviantart.net/fs43/i/2009/125/a/9/Future_of_Frog_by_axcho.jpg", caption);
}
void LLPanelSnapshotFacebook::onImageUploaded(const std::string& image_url, const std::string& caption)
{
if (!image_url.empty())
{
LLFacebookConnect::instance().sharePhoto(image_url, caption);
}
}

48
indra/newview/llwebprofile.cpp
View File

@ -62,8 +62,8 @@ class LLWebProfileResponders::ConfigResponder : public LLHTTPClient::Responder
LOG_CLASS(LLWebProfileResponders::ConfigResponder);
public:
ConfigResponder(LLPointer<LLImageFormatted> imagep)
: mImagep(imagep)
ConfigResponder(LLPointer<LLImageFormatted> imagep, const std::string& caption, LLWebProfile::image_url_callback_t cb)
: mImagep(imagep), mImageCaption(caption), mImageCallback(cb)
{
}
@ -113,11 +113,13 @@ public:
// Do the actual image upload using the configuration.
LL_DEBUGS("Snapshots") << "Got upload config, POSTing image to " << upload_url << ", config=[" << config << "]" << llendl;
LLWebProfile::post(mImagep, config, upload_url);
LLWebProfile::post(mImagep, config, upload_url, mImageCaption, mImageCallback);
}
private:
LLPointer<LLImageFormatted> mImagep;
std::string mImageCaption;
LLWebProfile::image_url_callback_t mImageCallback;
};
///////////////////////////////////////////////////////////////////////////////
@ -127,6 +129,22 @@ class LLWebProfileResponders::PostImageRedirectResponder : public LLHTTPClient::
LOG_CLASS(LLWebProfileResponders::PostImageRedirectResponder);
public:
PostImageRedirectResponder(const std::string& caption, LLWebProfile::image_url_callback_t cb)
: mImageCaption(caption), mImageCallback(cb)
{
}
/*virtual*/ void completedHeader(U32 status, const std::string& reason, const LLSD& content)
{
if (status == 200)
{
std::string image_url = content.get("Location");
llinfos << "Image uploaded to " << image_url << llendl;
if (!mImageCallback.empty() && !image_url.empty())
mImageCallback(image_url, mImageCaption);
}
}
/*virtual*/ void completedRaw(
U32 status,
const std::string& reason,
@ -148,9 +166,10 @@ public:
LL_DEBUGS("Snapshots") << "Uploading image succeeded. Response: [" << body << "]" << llendl;
LLWebProfile::reportImageUploadStatus(true);
}
private:
LLPointer<LLImageFormatted> mImagep;
std::string mImageCaption;
LLWebProfile::image_url_callback_t mImageCallback;
};
@ -161,6 +180,11 @@ class LLWebProfileResponders::PostImageResponder : public LLHTTPClient::Responde
LOG_CLASS(LLWebProfileResponders::PostImageResponder);
public:
PostImageResponder(const std::string& caption, LLWebProfile::image_url_callback_t cb)
: mImageCaption(caption), mImageCallback(cb)
{
}
/*virtual*/ void completedHeader(U32 status, const std::string& reason, const LLSD& content)
{
// Viewer seems to fail to follow a 303 redirect on POST request
@ -172,7 +196,7 @@ public:
headers["Cookie"] = LLWebProfile::getAuthCookie();
const std::string& redir_url = content["location"];
LL_DEBUGS("Snapshots") << "Got redirection URL: " << redir_url << llendl;
LLHTTPClient::get(redir_url, new LLWebProfileResponders::PostImageRedirectResponder, headers);
LLHTTPClient::get(redir_url, new LLWebProfileResponders::PostImageRedirectResponder(mImageCaption, mImageCallback), headers);
}
else
{
@ -188,6 +212,10 @@ public:
const LLIOPipe::buffer_ptr_t& buffer)
{
}
private:
std::string mImageCaption;
LLWebProfile::image_url_callback_t mImageCallback;
};
///////////////////////////////////////////////////////////////////////////////
@ -197,7 +225,7 @@ std::string LLWebProfile::sAuthCookie;
LLWebProfile::status_callback_t LLWebProfile::mStatusCallback;
// static
void LLWebProfile::uploadImage(LLPointer<LLImageFormatted> image, const std::string& caption, bool add_location)
void LLWebProfile::uploadImage(LLPointer<LLImageFormatted> image, const std::string& caption, bool add_location, LLWebProfile::image_url_callback_t cb)
{
// Get upload configuration data.
std::string config_url(getProfileURL(LLStringUtil::null) + "snapshots/s3_upload_config");
@ -207,7 +235,7 @@ void LLWebProfile::uploadImage(LLPointer<LLImageFormatted> image, const std::str
LL_DEBUGS("Snapshots") << "Requesting " << config_url << llendl;
LLSD headers = LLViewerMedia::getHeaders();
headers["Cookie"] = getAuthCookie();
LLHTTPClient::get(config_url, new LLWebProfileResponders::ConfigResponder(image), headers);
LLHTTPClient::get(config_url, new LLWebProfileResponders::ConfigResponder(image, caption, cb), headers);
}
// static
@ -218,7 +246,7 @@ void LLWebProfile::setAuthCookie(const std::string& cookie)
}
// static
void LLWebProfile::post(LLPointer<LLImageFormatted> image, const LLSD& config, const std::string& url)
void LLWebProfile::post(LLPointer<LLImageFormatted> image, const LLSD& config, const std::string& url, const std::string& caption, LLWebProfile::image_url_callback_t cb)
{
if (dynamic_cast<LLImagePNG*>(image.get()) == 0)
{
@ -284,7 +312,7 @@ void LLWebProfile::post(LLPointer<LLImageFormatted> image, const LLSD& config, c
memcpy(data, body.str().data(), size);
// Send request, successful upload will trigger posting metadata.
LLHTTPClient::postRaw(url, data, size, new LLWebProfileResponders::PostImageResponder(), headers);
LLHTTPClient::postRaw(url, data, size, new LLWebProfileResponders::PostImageResponder(caption, cb), headers);
}
// static

5
indra/newview/llwebprofile.h
View File

@ -48,8 +48,9 @@ class LLWebProfile
public:
typedef boost::function<void(bool ok)> status_callback_t;
typedef boost::function<void(const std::string& image_url, const std::string& caption)> image_url_callback_t;
static void uploadImage(LLPointer<LLImageFormatted> image, const std::string& caption, bool add_location);
static void uploadImage(LLPointer<LLImageFormatted> image, const std::string& caption, bool add_location, image_url_callback_t cb = image_url_callback_t());
static void setAuthCookie(const std::string& cookie);
static void setImageUploadResultCallback(status_callback_t cb) { mStatusCallback = cb; }
@ -58,7 +59,7 @@ private:
friend class LLWebProfileResponders::PostImageResponder;
friend class LLWebProfileResponders::PostImageRedirectResponder;
static void post(LLPointer<LLImageFormatted> image, const LLSD& config, const std::string& url);
static void post(LLPointer<LLImageFormatted> image, const LLSD& config, const std::string& url, const std::string& caption, image_url_callback_t cb);
static void reportImageUploadStatus(bool ok);
static std::string getAuthCookie();