github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-07-11 22:03:01 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

Updated FtpClient::WhenProgress callback to get in sync with other progress callbacks in U++, i.e. a Gate2<int, int> (kohait00's contribution)

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@1789 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
rylek 2009-12-08 15:23:58 +00:00
parent 8d8f418cfc
commit f1de6e30f4
2 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

18
uppsrc/plugin/ftp/ftp.cpp
View file

@ -37,7 +37,7 @@ bool FtpClient::Connect(const char *host, const char *user, const char *password
Close();
char perror[512];
LLOG("FtpConnect(" << host << ")");
if(WhenProgress()) {
if(WhenProgress(0,0)) {
error = "connect aborted";
return false;
}
@ -62,7 +62,7 @@ bool FtpClient::Connect(const char *host, const char *user, const char *password
int FtpClient::Callback(netbuf *nControl, int xfered, void *arg)
{
return !((FtpClient *)arg)->WhenProgress();
return !((FtpClient *)arg)->WhenProgress(0,0);
}
void FtpClient::Close()
@ -89,7 +89,7 @@ String FtpClient::Load(const char *path)
return String::GetVoid();
netbuf *ftpdata;
LLOG("FtpAccess(" << path << ")");
if(WhenProgress()) {
if(WhenProgress(0,0)) {
error = t_("aborted");
return String::GetVoid();
}
@ -99,7 +99,7 @@ String FtpClient::Load(const char *path)
}
load_data = Null;
int p = 0;
while(!WhenProgress()) {
while(!WhenProgress(0,0)) {
byte buffer[1024];
int ndata = FtpRead(buffer, sizeof(buffer), ftpdata);
LLOG("FtpRead -> " << ndata);
@ -138,14 +138,14 @@ int FtpClient::SaveCount(const char *path, String data)
if(!CheckOpen())
return 0;
LLOG("FtpAccess(" << path << ")");
if(WhenProgress())
if(WhenProgress(0,data.GetLength()))
return 0;
if(!FtpAccess(path, FTPLIB_FILE_WRITE, FTPLIB_IMAGE, ftpconn, &ftpdata)) {
error = FtpError(ftpconn);
return 0;
}
while(save_pos < data.GetLength()) {
if(WhenProgress()) {
if(WhenProgress(save_pos, data.GetLength())) {
error = NFormat(t_("write aborted after %d bytes(s)"), save_pos);
FtpClose(ftpdata);
return save_pos;
@ -165,7 +165,7 @@ int FtpClient::SaveCount(const char *path, String data)
;
#endif
}
WhenProgress();
WhenProgress(save_pos, data.GetLength());
LLOG("FtpClose");
FtpClose(ftpdata);
return save_pos;
@ -223,7 +223,7 @@ String FtpClient::List(const char *path)
return String::GetVoid();
netbuf *ftpdata;
LLOG("FtpAccess(" << path << ")");
if(WhenProgress()) {
if(WhenProgress(0,0)) {
error = t_("aborted");
return String::GetVoid();
}
@ -232,7 +232,7 @@ String FtpClient::List(const char *path)
return String::GetVoid();
}
int p = 0;
while(!WhenProgress()) {
while(!WhenProgress(0,0)) {
byte buffer[1024];
int ndata = FtpRead(buffer, sizeof(buffer), ftpdata);
LLOG("FtpRead -> " << ndata);

2
uppsrc/plugin/ftp/ftp.h
View file

@ -41,7 +41,7 @@ public:
bool CheckOpen();
public:
Gate WhenProgress;
Gate2<int, int> WhenProgress;
private:
static int Callback(netbuf *nControl, int xfered, void *arg);