github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-05-21 06:45:39 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

Examples/SkylarkUpload : use session variables instead of static maps to store progress data

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@6231 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
micio 2013-08-06 19:19:36 +00:00
parent 63742ac4f2
commit 5fbb33354e
1 changed files with 22 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

47
examples/SkylarkUpload/Handlers.icpp
View file

@ -1,17 +1,11 @@
#include "SkylarkUpload.h"
struct UploadStat : Moveable<UploadStat>
{
int totalSize;
int currentSize;
};
int ProgressHandler(int reason, Http &http, int size)
{
static VectorMap<String, UploadStat> stats;
// get the upload unique identifier
Value id = http["uploadid"];
String id = http["uploadid"];
String currentId = "." + id + ".currentSize";
String totalId = "." + id + ".totalSize";
// must be reentrant
INTERLOCKED {
@ -20,16 +14,20 @@ int ProgressHandler(int reason, Http &http, int size)
// got headers ?
case PROGRESS_HEADER:
{
UploadStat &stat = stats.Add(id);
stat.totalSize = size;
stat.currentSize = 0;
http
.SessionSet(currentId, 0)
.SessionSet(totalId, size)
;
break;
}
// reading contents ?
case PROGRESS_CONTENT:
{
stats.Get(id).currentSize = size;
// avoid unnnedded session storing
int oldCurrent = http[currentId];
if(oldCurrent != size)
http.SessionSet(currentId, size);
break;
}
@ -37,9 +35,7 @@ int ProgressHandler(int reason, Http &http, int size)
case PROGRESS_END:
{
// signals end by resetting total size
// we can't remove the key here, progress query
// can happen after
stats.Get(id).totalSize = 0;
http.SessionSet(totalId, 0);
break;
}
@ -47,22 +43,23 @@ int ProgressHandler(int reason, Http &http, int size)
default: // PROGRESS_QUERY
{
// check if key is there --> upload started
int i = stats.Find(id);
if(i >= 0)
int total = http[totalId];
if(!IsNull(total))
{
// upload has started
UploadStat &stat = stats[i];
if(stat.totalSize)
if(total)
{
// if upload not ended, return the progress %
// take care to NOT return 100% up to upload ended really
return min(99, (int)(100.0 * stat.currentSize / stat.totalSize));
int current = http[currentId];
return min(99, (int)(100.0 * current / total));
}
else
{
// upload ended, remove id from map and return 100%
stats.RemoveKey(id);
// upload ended, nullify session variables and return 100%
http
.SessionSet(currentId, Null)
.SessionSet(totalId, Null)
;
return 100;
}
}