This adds mStatus, mReason and mContent to ResponderBase and fills those in instead of passing it to member functions. The added danger here is that now code can accidently try to access these variables while they didn't already get a correct value. Affected members of ResponderBase (that now have less arguments): decode_llsd_body, decode_raw_body, completedHeaders, completed -> httpCompleted, result -> httpSuccess, errorWithContent and error -> httpFailure. New API: ResponderBase::setResult ResponderBase::getStatus() ResponderBase::getReason() ResponderBase::getContent() ResponderBase::getResponseHeaders() (returns AIHTTPReceivedHeaders though, not LLSD) ResponderBase::dumpResponse() ResponderWithCompleted::completeResult ResponderWithResult::failureResult (previously pubErrorWithContent) ResponderWithResult::successResult (previously pubResult) Not implemented: getHTTPMethod() - use getName() instead which returns the class name of the responder. completedHeaders() is still called as usual, although you can ignore it (not implement in a derived responder) and call getResponseHeaders() instead, provided you implement needsHeaders() and have it return true. However, classes derived from ResponderHeadersOnly do not have completedHeaders(), so they still must implement completedHeaders(), and then call getResponseHeaders() or just access mReceivedHeaders directly, as usual.
189 lines
6.3 KiB
C++
189 lines
6.3 KiB
C++
/**
|
|
* @file llassetuploadresponders.h
|
|
* @brief Processes responses received for asset upload requests.
|
|
*
|
|
* $LicenseInfo:firstyear=2007&license=viewergpl$
|
|
*
|
|
* Copyright (c) 2007-2009, Linden Research, Inc.
|
|
*
|
|
* Second Life Viewer Source Code
|
|
* The source code in this file ("Source Code") is provided by Linden Lab
|
|
* to you under the terms of the GNU General Public License, version 2.0
|
|
* ("GPL"), unless you have obtained a separate licensing agreement
|
|
* ("Other License"), formally executed by you and Linden Lab. Terms of
|
|
* the GPL can be found in doc/GPL-license.txt in this distribution, or
|
|
* online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
|
|
*
|
|
* There are special exceptions to the terms and conditions of the GPL as
|
|
* it is applied to this Source Code. View the full text of the exception
|
|
* in the file doc/FLOSS-exception.txt in this software distribution, or
|
|
* online at
|
|
* http://secondlifegrid.net/programs/open_source/licensing/flossexception
|
|
*
|
|
* By copying, modifying or distributing this software, you acknowledge
|
|
* that you have read and understood your obligations described above,
|
|
* and agree to abide by those obligations.
|
|
*
|
|
* ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
|
|
* WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
|
|
* COMPLETENESS OR PERFORMANCE.
|
|
* $/LicenseInfo$
|
|
*/
|
|
|
|
#ifndef LL_LLASSETUPLOADRESPONDER_H
|
|
#define LL_LLASSETUPLOADRESPONDER_H
|
|
|
|
#include "llhttpclient.h"
|
|
#include "llinventory.h"
|
|
|
|
class AIHTTPTimeoutPolicy;
|
|
extern AIHTTPTimeoutPolicy assetUploadResponder_timeout;
|
|
extern AIHTTPTimeoutPolicy newAgentInventoryVariablePriceResponder_timeout;
|
|
|
|
void on_new_single_inventory_upload_complete(LLAssetType::EType asset_type,
|
|
LLInventoryType::EType inventory_type,
|
|
const std::string inventory_type_string,
|
|
const LLUUID& item_folder_id,
|
|
const std::string& item_name,
|
|
const std::string& item_description,
|
|
const LLSD& server_response,
|
|
S32 upload_price);
|
|
|
|
// Abstract class for supporting asset upload
|
|
// via capabilities
|
|
class LLAssetUploadResponder : public LLHTTPClient::ResponderWithResult
|
|
{
|
|
public:
|
|
LLAssetUploadResponder(const LLSD& post_data,
|
|
const LLUUID& vfile_id,
|
|
LLAssetType::EType asset_type);
|
|
LLAssetUploadResponder(const LLSD& post_data,
|
|
const std::string& file_name,
|
|
LLAssetType::EType asset_type);
|
|
~LLAssetUploadResponder();
|
|
/*virtual*/ void httpFailure(void);
|
|
/*virtual*/ void httpSuccess(void);
|
|
/*virtual*/ AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return assetUploadResponder_timeout; }
|
|
|
|
virtual void uploadUpload(const LLSD& content);
|
|
virtual void uploadComplete(const LLSD& content);
|
|
virtual void uploadFailure(const LLSD& content);
|
|
|
|
protected:
|
|
LLSD mPostData;
|
|
LLAssetType::EType mAssetType;
|
|
LLUUID mVFileID;
|
|
std::string mFileName;
|
|
};
|
|
|
|
class LLNewAgentInventoryResponder : public LLAssetUploadResponder
|
|
{
|
|
void (*mCallBack)(bool, void*);
|
|
void* mUserData;
|
|
public:
|
|
LLNewAgentInventoryResponder(
|
|
const LLSD& post_data,
|
|
const LLUUID& vfile_id,
|
|
LLAssetType::EType asset_type,
|
|
void (*callback)(bool, void*) = NULL,
|
|
void* user_data = NULL);
|
|
LLNewAgentInventoryResponder(
|
|
const LLSD& post_data,
|
|
const std::string& file_name,
|
|
LLAssetType::EType asset_type);
|
|
/*virtual*/ void httpFailure(void);
|
|
virtual void uploadComplete(const LLSD& content);
|
|
virtual void uploadFailure(const LLSD& content);
|
|
/*virtual*/ char const* getName(void) const { return "LLNewAgentInventoryResponder"; }
|
|
};
|
|
|
|
// A base class which goes through and performs some default
|
|
// actions for variable price uploads. If more specific actions
|
|
// are needed (such as different confirmation messages, etc.)
|
|
// the functions onApplicationLevelError and showConfirmationDialog.
|
|
class LLNewAgentInventoryVariablePriceResponder :
|
|
public LLHTTPClient::ResponderWithResult
|
|
{
|
|
public:
|
|
LLNewAgentInventoryVariablePriceResponder(
|
|
const LLUUID& vfile_id,
|
|
LLAssetType::EType asset_type,
|
|
const LLSD& inventory_info);
|
|
|
|
LLNewAgentInventoryVariablePriceResponder(
|
|
const std::string& file_name,
|
|
LLAssetType::EType asset_type,
|
|
const LLSD& inventory_info);
|
|
virtual ~LLNewAgentInventoryVariablePriceResponder();
|
|
|
|
/*virtual*/ void httpFailure(void);
|
|
/*virtual*/ void httpSuccess(void);
|
|
/*virtual*/ AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return newAgentInventoryVariablePriceResponder_timeout; }
|
|
|
|
virtual void onApplicationLevelError(
|
|
const LLSD& error);
|
|
virtual void showConfirmationDialog(
|
|
S32 upload_price,
|
|
S32 resource_cost,
|
|
const std::string& confirmation_url);
|
|
|
|
private:
|
|
class Impl;
|
|
Impl* mImpl;
|
|
};
|
|
|
|
struct LLBakedUploadData;
|
|
class LLSendTexLayerResponder : public LLAssetUploadResponder
|
|
{
|
|
LOG_CLASS(LLSendTexLayerResponder);
|
|
public:
|
|
LLSendTexLayerResponder(const LLSD& post_data,
|
|
const LLUUID& vfile_id,
|
|
LLAssetType::EType asset_type,
|
|
LLBakedUploadData * baked_upload_data);
|
|
|
|
~LLSendTexLayerResponder();
|
|
|
|
/*virtual*/ void uploadComplete(const LLSD& content);
|
|
/*virtual*/ void httpFailure(void);
|
|
/*virtual*/ char const* getName(void) const { return "LLSendTexLayerResponder"; }
|
|
|
|
LLBakedUploadData * mBakedUploadData;
|
|
};
|
|
|
|
class LLUpdateAgentInventoryResponder : public LLAssetUploadResponder
|
|
{
|
|
public:
|
|
LLUpdateAgentInventoryResponder(const LLSD& post_data,
|
|
const LLUUID& vfile_id,
|
|
LLAssetType::EType asset_type);
|
|
LLUpdateAgentInventoryResponder(const LLSD& post_data,
|
|
const std::string& file_name,
|
|
LLAssetType::EType asset_type);
|
|
virtual void uploadComplete(const LLSD& content);
|
|
/*virtual*/ char const* getName(void) const { return "LLUpdateAgentInventoryResponder"; }
|
|
};
|
|
|
|
class LLUpdateTaskInventoryResponder : public LLAssetUploadResponder
|
|
{
|
|
public:
|
|
LLUpdateTaskInventoryResponder(const LLSD& post_data,
|
|
const LLUUID& vfile_id,
|
|
LLAssetType::EType asset_type);
|
|
LLUpdateTaskInventoryResponder(const LLSD& post_data,
|
|
const std::string& file_name,
|
|
LLAssetType::EType asset_type);
|
|
LLUpdateTaskInventoryResponder(const LLSD& post_data,
|
|
const std::string& file_name,
|
|
const LLUUID& queue_id,
|
|
LLAssetType::EType asset_type);
|
|
|
|
virtual void uploadComplete(const LLSD& content);
|
|
/*virtual*/ char const* getName(void) const { return "LLUpdateTaskInventoryResponder"; }
|
|
|
|
private:
|
|
LLUUID mQueueId;
|
|
};
|
|
|
|
#endif // LL_LLASSETUPLOADRESPONDER_H
|