SHS/pip
4
3
Fork 0
Code Issues 67 Pull Requests 1 Actions Releases Wiki Activity

git-svn-id: svn://db.shs.com.ru/pip@231 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5

Browse Source
This commit is contained in:
Бычков Андрей
2016-08-19 12:51:03 +00:00
parent 6d7a7d3eb1
commit 4ceabcd22d
10 changed files with 147 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

100
utils/system_daemon/daemon.cpp
View File

@@ -3,8 +3,9 @@
#include "pisysteminfo.h"
const char pisd_prefix[] = "_pisd_";
const char self_name[] = "__self__";
extern PIScreen screen;
//bool Daemon::inited__ = false;
Daemon::Remote::Remote(const PIString & n): PIThread() {
setName(n);
@@ -60,6 +61,8 @@ void Daemon::Remote::run() {
void Daemon::Remote::updateDirEntries() {
//piCout << dir_my;
if (!dir_my.isExists()) dir_my = PIDir::current();
my_filelist = dir_my.entries();
piForeach (PIFile::FileInfo & f, my_filelist) f.path = f.name();
}
@@ -194,7 +197,7 @@ void Daemon::TileFileProgress::tileEvent(PIScreenTile * t, TileEvent e) {
Daemon::Daemon(): PIPeer(pisd_prefix + PISystemInfo::instance()->hostname + "_" + PIString(rand() % 100)), fm(this) {
Daemon::Daemon(): inited__(false), PIPeer(pisd_prefix + PISystemInfo::instance()->hostname + "_" + PIString(rand() % 100)), fm(this) {
setName("Daemon");
dtimer.setName("__S__Daemon_timer");
mode = offset = cur = height = 0;
@@ -202,6 +205,12 @@ Daemon::Daemon(): PIPeer(pisd_prefix + PISystemInfo::instance()->hostname + "_"
CONNECTU(&dtimer, tickEvent, this, timerEvent)
CONNECTU(&fm, tileKey, this, fmKeyEvent)
CONNECTU(&fm, actionRequest, this, fmActionRequest)
_self = new Remote(self_name);
CONNECTU(_self, sendRequest, this, localSend)
CONNECTU(_self, receiveFinished, this, closeFileDialog)
CONNECTU(_self, sendFinished, this, closeFileDialog)
localft.setName(self_name);
CONNECTU(&localft, sendRequest, _self, received)
dtimer.addDelimiter(5);
dtimer.start(200);
@@ -227,7 +236,7 @@ Daemon::Daemon(): PIPeer(pisd_prefix + PISystemInfo::instance()->hostname + "_"
tile_info = new TileSimple("daemon info");
tile_info->hide();
fm.setRemote(true);
fm.setRemote();
tile_fm = fm.tile();
tile_fm->hide();
@@ -241,7 +250,7 @@ Daemon::Daemon(): PIPeer(pisd_prefix + PISystemInfo::instance()->hostname + "_"
tile_root->addTile(tile_fm);
CONNECTU(&screen, tileEvent, this, tileEvent)
inited__ = true;
}
@@ -258,6 +267,15 @@ PIScreenTile * Daemon::tile() const {
}
void Daemon::localSend(const PIString & p_name, const PIByteArray & data) {
//piCoutObj << "localSend" << localft.stateString();
PIByteArray h; h << int(FileTransfer);
PIByteArray ba = data;
ba.remove(0, h.size());
localft.received(ba);
}
void Daemon::hideAll() {
list_actions->hide();
tile_info->hide();
@@ -355,7 +373,7 @@ void Daemon::keyEvent(PIKbdListener::KeyEvent key) {
void Daemon::fmKeyEvent(PIKbdListener::KeyEvent key) {
PIMutexLocker ml(remote_mutex);
//Remote * r = remotes.value(conn_name);
//piCout << key.key << key.modifiers;
// piCoutObj << key.key << key.modifiers;
switch (key.key) {
case PIKbdListener::Return:
{
@@ -375,7 +393,7 @@ void Daemon::fmKeyEvent(PIKbdListener::KeyEvent key) {
void Daemon::fmActionRequest(bool remote_tile, FileManager::Action type, PIVariant data) {
Remote * r = 0;
r = remotes.value(conn_name, 0);
if (!r) return;
if (!r && type != FileManager::LocalCopy) return;
switch (type) {
case FileManager::Copy:
if (remote_tile) {
@@ -406,6 +424,17 @@ void Daemon::fmActionRequest(bool remote_tile, FileManager::Action type, PIVaria
send(conn_name, ba);
}
break;
case FileManager::LocalCopy:
//piCoutObj << "localCopy";
if (remote_tile) {
localft.setDirectory(fm.localDir());
_self->sendFiles(fm.remoteDir() + PIDir::separator, data.toStringList());
} else {
localft.setDirectory(fm.remoteDir());
_self->sendFiles(fm.localDir() + PIDir::separator, data.toStringList());
}
tile_file_progress->rec = false;
tile_file_progress->show(&(_self->ft));
default: break;
};
//piCout << remote_tile << type << data;
@@ -459,67 +488,82 @@ PIString Daemon::connectedDaemon() const {
}
void Daemon::peerConnected(const PIString & name) {
void Daemon::peerConnected(const PIString & p_name) {
while (!inited__) piMSleep(5);
// PIMutexLocker ml(peers_mutex);
/*piCout << "connected" << name;
mode = 2;
conn_name = name;*/
if (!name.startsWith(pisd_prefix)) return;
Remote * r = new Remote(name);
if (!p_name.startsWith(pisd_prefix)) return;
Remote * r = new Remote(p_name);
piCoutObj << "peer connected" << p_name;
// piCout << r->methodsEH() << this->methodsEH();
CONNECTU(r, sendRequest, this, sendRequest)
CONNECTU(r, receiveFinished, this, filesRreceived)
CONNECTU(r, receiveFinished, this, filesReceived)
CONNECTU(r, receiveFinished, this, closeFileDialog)
CONNECTU(r, sendFinished, this, closeFileDialog)
CONNECTU(r, removeFinished, this, filesRemoved)
CONNECTU(r, changeDirFinished, this, dirChanged)
PIMutexLocker ml(remote_mutex);
remotes.insert(name, r);
PIMutexLocker ml2(remote_mutex);
remotes.insert(p_name, r);
}
void Daemon::peerDisconnected(const PIString & name) {
if (name == conn_name) {
void Daemon::peerDisconnected(const PIString & p_name) {
while (!inited__) piMSleep(5);
piCoutObj << "peer disconnect" << p_name;
if (p_name == conn_name) {
disconnect();
}
PIMutexLocker ml(remote_mutex);
Remote * dt = remotes.value(name, 0);
Remote * dt = remotes.value(p_name, 0);
if (!dt) return;
if (tile_file_progress->ft == &(dt->ft)) {
tile_file_progress->close(false);
}
remotes.remove(name);
remotes.remove(p_name);
delete dt;
}
void Daemon::filesReceived(const PIString & name, bool ok) {
void Daemon::filesReceived(const PIString & p_name, bool ok) {
PIMutexLocker ml(remote_mutex);
Remote * r = remotes.value(name, 0);
Remote * r = remotes.value(p_name, 0);
if (!r) return;
r->updateDir();
}
void Daemon::dirChanged(const PIString & name, const PIString & dir) {
void Daemon::dirChanged(const PIString & p_name, const PIString & dir) {
PIMutexLocker ml(remote_mutex);
Remote * r = remotes.value(name, 0);
Remote * r = remotes.value(p_name, 0);
if (!r) return;
if (r->dir_my.absolutePath() != dir) return;
sendDirToRemote(r);
}
void Daemon::filesRemoved(const PIString & name, const PIString & dir) {
void Daemon::filesRemoved(const PIString & p_name, const PIString & dir) {
PIMutexLocker ml(remote_mutex);
Remote * r = remotes.value(name, 0);
Remote * r = remotes.value(p_name, 0);
if (!r) return;
if (r->dir_my.absolutePath() != dir) return;
sendDirToRemote(r);
}
void Daemon::closeFileDialog(const PIString & name, bool ok) {
//piCout << "CLOSE" << tile_file_progress->conn_name << name << ok;
if (tile_file_progress->conn_name != name) return;
void Daemon::closeFileDialog(const PIString & p_name, bool ok) {
//piCout << "CLOSE" << tile_file_progress->conn_name << name << ok;
if (p_name == self_name) {
tile_file_progress->close(ok);
fm.clearSelectionLocal();
fm.clearSelectionRemote();
fm.updateLocalDir();
fm.updateRemoteDir();
return;
}
piCoutObj << "file transfer with" << p_name << (ok ? "success" : "failure");
if (tile_file_progress->conn_name != p_name) return;
tile_file_progress->close(ok);
// if (ok) {
if (tile_file_progress->rec) {
@@ -543,7 +587,7 @@ void Daemon::dataReceived(const PIString & from, const PIByteArray & data) {
Remote * r = remotes.value(from);
PIString dir;
int type; ba >> type;
//piCout << "rec from " << from << type;
//piCout << "rec from " << from << type << r;
switch (type) {
case RequestHostInfo:
makeMyHostInfo();
@@ -555,7 +599,7 @@ void Daemon::dataReceived(const PIString & from, const PIByteArray & data) {
r->dir_my.cd(dir);
r->ft.setDirectory(r->dir_my);
//piCout << "store to" << r->dir_my.absolutePath();
//piCout << "cd to" << dir << ", abs =" << r->dir_my.absolutePath();
piCout << "cd to" << r->dir_my.absolutePath();
r->updateDir();
// sendDirToRemote(r);
break;
@@ -657,6 +701,7 @@ void Daemon::makeOtherHostInfo() {
void Daemon::requestChDir(const PIString & d) {
if (d.isEmpty()) return;
Remote * r = remotes.value(conn_name, 0);
//piCout << "request chdir" << d << conn_name << r;
if (d.isEmpty()) return;
if (!r) return;
fm.remoteSaveDir();
@@ -664,5 +709,4 @@ void Daemon::requestChDir(const PIString & d) {
PIByteArray ba;
ba << int(RequestChangeDir) << d;
send(conn_name, ba);
//piCout << "request chdir" << d;
}