PIPeer data transfers fixnsfer

git-svn-id: svn://db.shs.com.ru/pip@47 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5
This commit is contained in:
2015-03-31 08:06:02 +00:00
parent c87f73207d
commit 0701b15913
6 changed files with 88 additions and 97 deletions

View File

@@ -277,12 +277,12 @@ void Daemon::dataReceived(const PIString & from, const PIByteArray & data) {
r = remotes.value(from);
if (!r) break;
ba >> dir;
r->dir.cd(dir);
r->dir_my.cd(dir);
{
PIVector<PIFile::FileInfo> fil = r->dir.entries();
PIVector<PIFile::FileInfo> fil = r->dir_my.entries();
piForeach (PIFile::FileInfo & f, fil)
f.path = f.name();
rba << int(ReplyChangeDir) << r->dir.absolutePath() << fil;
rba << int(ReplyChangeDir) << r->dir_my.absolutePath() << fil;
}
break;
case ReplyHostInfo:
@@ -296,7 +296,7 @@ void Daemon::dataReceived(const PIString & from, const PIByteArray & data) {
{
PIVector<PIFile::FileInfo> fil;
ba >> dir >> fil;
r->dir.setDir(dir);
r->dir_remote.setDir(dir);
fm.setRemoteDir(dir);
fm.setRemoteContent(fil);
fm.remoteRestoreDir();

View File

@@ -66,9 +66,9 @@ private:
class Remote: public PIThread {
public:
Remote(const PIString & n = PIString()) {dt.setName(n); ft.setName(n); dir = PIDir::current();}
Remote(const PIString & n = PIString()) {dt.setName(n); ft.setName(n); dir_my = PIDir::current();}
void sendData(const PIByteArray & d) {_d = d; startOnce();}
PIDir dir;
PIDir dir_my, dir_remote;
PIDataTransfer dt;
PIFileTransfer ft;
PIByteArray _d;