1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
|
/**
* @file llassetupload.cpp
* @brief Serializes asset upload request
*
* $LicenseInfo:firstyear=2007&license=viewerlgpl$
* Second Life Viewer Source Code
* Copyright (C) 2010, Linden Research, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation;
* version 2.1 of the License only.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
* Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
* $/LicenseInfo$
*/
#include "llviewerprecompiledheaders.h"
#include "llassetuploadqueue.h"
#include "llviewerregion.h"
#include "llviewerobjectlist.h"
#include "llassetuploadresponders.h"
#include "llsd.h"
#include <iostream>
class LLAssetUploadChainResponder : public LLUpdateTaskInventoryResponder
{
public:
LLAssetUploadChainResponder(const LLSD& post_data,
const std::string& file_name,
const LLUUID& queue_id,
U8* data,
U32 data_size,
std::string script_name,
LLAssetUploadQueueSupplier *supplier) :
LLUpdateTaskInventoryResponder(post_data, file_name, queue_id, LLAssetType::AT_LSL_TEXT),
mSupplier(supplier),
mData(data),
mDataSize(data_size),
mScriptName(script_name)
{
}
virtual ~LLAssetUploadChainResponder()
{
if(mSupplier)
{
LLAssetUploadQueue *queue = mSupplier->get();
if (queue)
{
// Give ownership of supplier back to queue.
queue->mSupplier = mSupplier;
mSupplier = NULL;
}
}
delete mSupplier;
delete mData;
}
virtual void errorWithContent(U32 statusNum, const std::string& reason, const LLSD& content)
{
LL_WARNS() << "LLAssetUploadChainResponder Error [status:"
<< statusNum << "]: " << content << LL_ENDL;
LLUpdateTaskInventoryResponder::errorWithContent(statusNum, reason, content);
LLAssetUploadQueue *queue = mSupplier->get();
if (queue)
{
queue->request(&mSupplier);
}
}
virtual void result(const LLSD& content)
{
LLUpdateTaskInventoryResponder::result(content);
LLAssetUploadQueue *queue = mSupplier->get();
if (queue)
{
// Responder is reused across 2 phase upload,
// so only start next upload after 2nd phase complete.
std::string state = content["state"];
if(state == "complete")
{
queue->request(&mSupplier);
}
}
}
virtual void uploadUpload(const LLSD& content)
{
std::string uploader = content["uploader"];
mSupplier->log(std::string("Compiling " + mScriptName).c_str());
LL_INFOS() << "Compiling " << LL_ENDL;
// postRaw takes ownership of mData and will delete it.
LLHTTPClient::postRaw(uploader, mData, mDataSize, this);
mData = NULL;
mDataSize = 0;
}
virtual void uploadComplete(const LLSD& content)
{
// Bytecode save completed
if (content["compiled"])
{
mSupplier->log("Compilation succeeded");
LL_INFOS() << "Compiled!" << LL_ENDL;
}
else
{
LLSD compile_errors = content["errors"];
for(LLSD::array_const_iterator line = compile_errors.beginArray();
line < compile_errors.endArray(); line++)
{
std::string str = line->asString();
str.erase(std::remove(str.begin(), str.end(), '\n'), str.end());
mSupplier->log(str);
LL_INFOS() << content["errors"] << LL_ENDL;
}
}
LLUpdateTaskInventoryResponder::uploadComplete(content);
}
LLAssetUploadQueueSupplier *mSupplier;
U8* mData;
U32 mDataSize;
std::string mScriptName;
};
LLAssetUploadQueue::LLAssetUploadQueue(LLAssetUploadQueueSupplier *supplier) :
mSupplier(supplier)
{
}
//virtual
LLAssetUploadQueue::~LLAssetUploadQueue()
{
delete mSupplier;
}
// Takes ownership of supplier.
void LLAssetUploadQueue::request(LLAssetUploadQueueSupplier** supplier)
{
if (mQueue.empty())
return;
UploadData data = mQueue.front();
mQueue.pop_front();
LLSD body;
body["task_id"] = data.mTaskId;
body["item_id"] = data.mItemId;
body["is_script_running"] = data.mIsRunning;
body["target"] = data.mIsTargetMono? "mono" : "lsl2";
body["experience"] = data.mExperienceId;
std::string url = "";
LLViewerObject* object = gObjectList.findObject(data.mTaskId);
if (object)
{
url = object->getRegion()->getCapability("UpdateScriptTask");
LLHTTPClient::post(url, body,
new LLAssetUploadChainResponder(
body, data.mFilename, data.mQueueId,
data.mData, data.mDataSize, data.mScriptName, *supplier));
}
*supplier = NULL;
}
void LLAssetUploadQueue::queue(const std::string& filename,
const LLUUID& task_id,
const LLUUID& item_id,
BOOL is_running,
BOOL is_target_mono,
const LLUUID& queue_id,
U8* script_data,
U32 data_size,
std::string script_name,
const LLUUID& experience_id)
{
UploadData data;
data.mTaskId = task_id;
data.mItemId = item_id;
data.mIsRunning = is_running;
data.mIsTargetMono = is_target_mono;
data.mQueueId = queue_id;
data.mFilename = filename;
data.mData = script_data;
data.mDataSize = data_size;
data.mScriptName = script_name;
data.mExperienceId = experience_id;
mQueue.push_back(data);
if(mSupplier)
{
request(&mSupplier);
}
}
LLAssetUploadQueueSupplier::~LLAssetUploadQueueSupplier()
{
}
|
