TimerPool fixoutManipulator

git-svn-id: svn://db.shs.com.ru/pip@78 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5
This commit is contained in:
2015-04-07 16:26:59 +00:00
parent 6575b7e074
commit 6c987ee1ae
10 changed files with 220 additions and 72 deletions

View File

@@ -2,28 +2,101 @@
#include "shared.h"
#include "pisysteminfo.h"
const char pisd_prefix[] = "_pisd_";
extern PIScreen screen;
Daemon::Remote::Remote(const PIString & n): PIThread() {
setName(n);
ft.setName(n);
ft.setPacketSize(4000);
ft.setPacketSize(3984);
CONNECTU(&ft, sendRequest, this, ftSendRequest)
CONNECTU(&ft, receiveFinished, this, ftReceived)
CONNECTU(&ft, receiveFilesFinished, this, ftReceived)
CONNECTU(&ft, sendFilesFinished, this, ftSended)
dir_my = PIDir::current();
}
void Daemon::Remote::sendFiles(const PIString & dir, const PIStringList & fl) {
_fl = fl;
piForeach (PIString & s, _fl)
s.prepend(dir);
piCout << "send" << _fl;
startOnce();
}
void Daemon::Remote::run() {
ft.send(_fl);
}
Daemon::TileFileProgress::TileFileProgress(): PIScreenTile() {
size_policy = PIScreenTypes::Fixed;
ft = 0;
setMargins(1, 1, 1, 1);
spacing = 1;
back_format.color_back = Yellow;
label_file = new TileSimple("");
label_speed = new TileSimple("");
prog_file = new TileProgress();
prog_all = new TileProgress();
buttons = new TileButtons();
buttons->content << TileButtons::Button("Ok", CellFormat());
buttons->content << TileButtons::Button("Cancel", CellFormat());
buttons->back_format.color_back = label_file->back_format.color_back = label_speed->back_format.color_back = Yellow;
label_file->back_format.color_char = label_speed->back_format.color_char = Black;
label_file->content.resize(1);
label_speed->content.resize(1);
label_file->content[0].second = label_speed->content[0].second = CellFormat(Black, Transparent);
addTile(label_file);
addTile(label_speed);
addTile(prog_file);
addTile(prog_all);
addTile(buttons);
}
void Daemon::TileFileProgress::resizeEvent(int w, int h) {
PIScreenTile::resizeEvent(w, h);
w = ::screen.windowWidth() / 1.4;
minimumWidth = maximumWidth = w;
}
void Daemon::TileFileProgress::sizeHint(int & w, int & h) const {
PIScreenTile::sizeHint(w, h);
w = ::screen.windowWidth() / 1.4;
}
void Daemon::TileFileProgress::drawEvent(PIScreenDrawer * d) {
if (ft) {
label_file->content[0].first = ft->stateString() + ft->curFile();
PIString spd;
if (ft->isReceiving()) spd = ft->diagnostic().receiveSpeed();
else spd = ft->diagnostic().sendSpeed();
label_speed->content[0].first = spd;
if (ft->bytesFileAll() > 0)
prog_file->value = piRoundd(ft->bytesFileCur() / double(ft->bytesFileAll()) * 100.);
if (ft->bytesAll() > 0)
prog_all->value = piRoundd(ft->bytesCur() / double(ft->bytesAll()) * 100.);
}
PIScreenTile::drawEvent(d);
}
Daemon::Daemon(): PIPeer("_pisd_" + PISystemInfo::instance()->hostname + "_" + PIString(rand() % 100)), fm(this) {
Daemon::Daemon(): PIPeer(pisd_prefix + PISystemInfo::instance()->hostname + "_" + PIString(rand() % 100)), fm(this) {
setName("Daemon");
timer.setName("__S__Daemon_timer");
mode = offset = cur = height = 0;
CONNECTU(&screen, keyPressed, this, keyEvent)
CONNECTU(&timer, tickEvent, this, timerEvent)
CONNECTU(&fm, tileKey, this, fmKeyEvent)
CONNECTU(&fm, actionRequest, this, fmActionRequest)
timer.addDelimiter(5);
timer.start(200);
@@ -53,6 +126,9 @@ Daemon::Daemon(): PIPeer("_pisd_" + PISystemInfo::instance()->hostname + "_" + P
tile_fm = fm.tile();
tile_fm->hide();
tile_file_progress = new TileFileProgress();
tile_root->addTile(tile_header);
tile_root->addTile(list_daemons);
tile_root->addTile(list_actions);
@@ -189,6 +265,24 @@ void Daemon::fmKeyEvent(PIKbdListener::KeyEvent key) {
}
void Daemon::fmActionRequest(bool remote_tile, FileManager::Action type, PIVariant data) {
switch (type) {
case FileManager::Copy:
if (remote_tile) {
} else {
Remote * r = remotes.value(conn_name, 0);
if (!r) return;
r->sendFiles(fm.localDir() + PIDir::separator, data.toStringList());
tile_file_progress->ft = &(r->ft);
screen.setDialogTile(tile_file_progress);
}
break;
default: break;
};
piCout << remote_tile << type << data;
}
void Daemon::timerEvent(void * _d, int delim) {
screen.lock();
list_daemons->content.clear();
@@ -209,7 +303,7 @@ PIStringList Daemon::availableDaemons() {
available_daemons.clear();
lock();
piForeachC (PIPeer::PeerInfo & p, allPeers()) {
if (!p.name.startsWith("_pisd_")) continue;
if (!p.name.startsWith(pisd_prefix)) continue;
available_daemons << p.name.mid(6);
}
unlock();
@@ -219,7 +313,7 @@ PIStringList Daemon::availableDaemons() {
void Daemon::connectToDaemon(const PIString & dn) {
if (dn.isEmpty()) return;
conn_name = "_pisd_" + dn;
conn_name = pisd_prefix + dn;
mode = 1;
}
@@ -240,9 +334,10 @@ void Daemon::peerConnected(const PIString & name) {
/*piCout << "connected" << name;
mode = 2;
conn_name = name;*/
if (!name.startsWith(pisd_prefix)) return;
Remote * r = new Remote(name);
CONNECTU(&(r->ft), sendRequest, this, ftSendRequest)
CONNECTU(&(r->ft), receiveFinished, this, ftReceived)
CONNECTU(r, sendRequest, this, sendRequest)
CONNECTU(r, receiveFinished, this, filesReceived)
remotes.insert(name, r);
}
@@ -251,26 +346,15 @@ void Daemon::peerDisconnected(const PIString & name) {
if (name == conn_name) {
disconnect();
}
Remote * dt = remotes.value(name);
if (dt) delete dt;
Remote * dt = remotes.value(name, 0);
if (!dt) return;
delete dt;
remotes.remove(name);
}
void Daemon::ftSendRequest(PIByteArray & data) {
PIDataTransfer * dt = (PIDataTransfer*)emitter();
if (!dt) return;
PIByteArray hdr; hdr << int(DataTransfer);
data.insert(0, hdr);
send(dt->name(), data);
}
void Daemon::ftReceived(bool ok) {
if (!ok) return;
PIDataTransfer * dt = (PIDataTransfer*)emitter();
if (!dt) return;
dataReceived(emitter()->name(), dt->data());
void Daemon::filesReceived(const PIString & name, bool ok) {
}
@@ -292,6 +376,8 @@ void Daemon::dataReceived(const PIString & from, const PIByteArray & data) {
if (!r) break;
ba >> dir;
r->dir_my.cd(dir);
r->ft.setDirectory(r->dir_my);
piCout << "store to" << r->dir_my.absolutePath();
{
PIVector<PIFile::FileInfo> fil = r->dir_my.entries();
piForeach (PIFile::FileInfo & f, fil)
@@ -317,6 +403,10 @@ void Daemon::dataReceived(const PIString & from, const PIByteArray & data) {
fm.remoteRestoreDir();
}
break;
case FileTransfer:
r = remotes.value(from);
if (r) r->received(ba);
break;
};
if (!rba.isEmpty()) send(from, rba);
}