PIFile: applyFileInfo

PIPeer: fixed pisd work progress ... git-svn-id: svn://db.shs.com.ru/pip@20 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5
2015-03-12 13:28:27 +00:00
parent 3ed292a602
commit fdb48aba64
14 changed files with 346 additions and 148 deletions
--- a/utils/system_daemon/daemon.cpp
+++ b/utils/system_daemon/daemon.cpp
@@ -2,89 +2,121 @@
 #include "shared.h"
 #include "pisysteminfo.h"

+extern PIScreen screen;

 Daemon::Daemon(): PIPeer("_pisd_" + PISystemInfo::instance()->hostname + "_" + PIString(rand() % 100)) {
 	setName("Daemon");
 	timer.setName("__S__Daemon_timer");
-	enabled = false;
 	mode = offset = cur = height = 0;
-	//CONNECTU(&console, keyPressed, this, keyEvent)
+	CONNECTU(&screen, keyPressed, this, keyEvent)
 	CONNECTU(&timer, tickEvent, this, timerEvent)
 	timer.addDelimiter(5);
 	timer.start(200);
+	
+	//CONNECTU(&console, keyPressed, this, keyEvent)
+	//dir.setDir("/home/peri4/Documents");
+	//TileSimple * tl;
+	
+	tile_root = new PIScreenTile();
+	tile_root->direction = Vertical;
+	
+	tile_header = new TileSimple("daemon header");
+	tile_header->size_policy = Fixed;
+	
+	list_daemons = new TileList("daemons list");
+	list_daemons->hide();
+	
+	list_actions = new TileList("actions list");
+	list_actions->hide();
+	list_actions->content << TileList::Row("Information", CellFormat());
+	list_actions->content << TileList::Row("File manager", CellFormat());
+	list_actions->content << TileList::Row("Shell", CellFormat());
+	
+	tile_info = new TileSimple("daemon info");
+	tile_info->hide();
+	
+	tile_root->addTile(tile_header);
+	tile_root->addTile(list_daemons);
+	tile_root->addTile(list_actions);
+	tile_root->addTile(tile_info);
+	
+	CONNECTU(&screen, tileEvent, this, tileEvent)
+	
 }


 PIScreenTile * Daemon::tile() const {
-	return new PIScreenTile();
+	return tile_root;
+}
+
+
+void Daemon::hideAll() {
+	list_actions->hide();
+	tile_info->hide();
+	list_daemons->hide();
+}
+
+
+void Daemon::showTile(PIScreenTile * t, const PIString & header) {
+	hideAll();
+	t->show();
+	t->setFocus();
+	tile_header->content.resize(1);
+	tile_header->content[0].first = header;
+	tile_header->content[0].second.flags = Bold;
+	if (!conn_name.isEmpty())
+		tile_header->content[0].first.insert(0, "Daemon \"" + connectedDaemon() + "\": ");
+}
+
+
+void Daemon::fillInfoTile(const Daemon::HostInfo & hi) {
+	screen.lock();
+	tile_info->content.clear();
+	tile_info->content << TileSimple::Row("Exec command: " + hi.execCommand, CellFormat());
+	tile_info->content << TileSimple::Row(" Executed on  " + hi.execDateTime.toString(), CellFormat());
+	tile_info->content << TileSimple::Row("    Hostname: " + hi.hostname, CellFormat());
+	tile_info->content << TileSimple::Row("    Username: " + hi.user, CellFormat());
+	tile_info->content << TileSimple::Row("     OS name: " + hi.OS_name, CellFormat());
+	tile_info->content << TileSimple::Row("  OS version: " + hi.OS_version, CellFormat());
+	tile_info->content << TileSimple::Row("Architecture: " + hi.architecture, CellFormat());
+	tile_info->content << TileSimple::Row("   CPU count: " + PIString::fromNumber(hi.processorsCount), CellFormat());
+	screen.unlock();
+}
+
+
+void Daemon::tileEvent(PIScreenTile * t, TileEvent e) {
+	if (t == list_daemons) {
+		if (e.type == TileList::RowPressed) {
+			connectToDaemon(list_daemons->content[e.data.toInt()].first);
+			showActionList();
+		}
+		return;
+	}
+	if (t == list_actions) {
+		if (e.type == TileList::RowPressed) {
+			switch (e.data.toInt()) {
+			case 0: mode = 2; showTile(tile_info, "Information"); break;
+			default: break;
+			}
+		}
+		return;
+	}
 }


 void Daemon::keyEvent(PIKbdListener::KeyEvent key) {
-	if (!enabled) return;
-	int num = key.key - '0';
-	switch (mode) {
-	case 0:
-		if (num >= 0 && num <= 9) {
-			connectToDaemon(dnames.value(key.key - '0'));
-			return;
-		}
-		break;
-	case 1:
-		if (num >= 0 && num <= 9) {
-			mode = num + 10;
-			updateConsole();
-			return;
-		}
-		break;
-	}
+	if (!tile_root->visible) return;
 	switch (key.key) {
-	case PIKbdListener::UpArrow:
-		/*cur--;
-		if (cur < 0) cur = 0;
-		if (cur - offset < 2) offset--;
-		if (offset < 0) offset = 0;*/
-		updateConsole();
-		break;
-	case PIKbdListener::Space:
-		/*if (cur < 0 || cur >= files.size_s()) return;
-		if (selected.contains(files[cur].name)) selected.removeOne(files[cur].name);
-		else selected << files[cur].name;*/
-	case PIKbdListener::DownArrow:
-		/*cur++;
-		if (cur >= files.size_s()) cur = files.size_s() - 1;
-		if (cur - offset >= height - 2) offset++;
-		if (offset >= files.size_s() - height) offset = files.size_s() - height;*/
-		updateConsole();
-		break;
-	case PIKbdListener::Home:
-		//cur = offset = 0;
-		updateConsole();
-		break;
-	case PIKbdListener::End:
-		//cur = files.size_s() - 1;
-		//offset = files.size_s() - height;
-		updateConsole();
-		break;
-	case PIKbdListener::Return:
-		//if (cur < files.size_s() && cur >= 0) {
-		//}
-		break;
-	case 'A':
-		updateConsole();
-		break;
-	case 'R':
-		updateConsole();
-		break;
 	case PIKbdListener::Esc:
-		//selected.clear();
-		//updateConsole();
 		if (mode == 0)
 			menuRequest();
 		else {
 			if (mode > 1) {
 				mode = 1;
-				updateConsole();
+				screen.lock();
+				tile_info->content.clear();
+				screen.unlock();
+				showActionList();
 			} else
 				disconnect();
 		}
@@ -95,16 +127,17 @@ void Daemon::keyEvent(PIKbdListener::KeyEvent key) {


 void Daemon::timerEvent(void * _d, int delim) {
-	if (!enabled) return;
-	if (delim == 1) {
-		if (mode == 0)
-			updateConsole();
-		
-	}
-	if (delim == 5) {
+	screen.lock();
+	list_daemons->content.clear();
+	availableDaemons();
+	piForeachC (PIString & i, available_daemons)
+		list_daemons->content << TileList::Row(i, CellFormat());
+	screen.unlock();
+	if (delim == 5 && mode == 2) {
 		if (conn_name.isEmpty()) return;
 		PIByteArray ba; ba << int(RequestHostInfo);
 		send(conn_name, ba);
+		//std::cout << "send " << std::hex << ba;
 	}
 }

@@ -123,14 +156,13 @@ void Daemon::connectToDaemon(const PIString & dn) {
 	if (dn.isEmpty()) return;
 	conn_name = "_pisd_" + dn;
 	mode = 1;
-	updateConsole();
 }


 void Daemon::disconnect() {
 	conn_name.clear();
 	mode = 0;
-	updateConsole();
+	showMainList();
 }


@@ -139,10 +171,16 @@ PIString Daemon::connectedDaemon() const {
 }


+void Daemon::peerConnected(const PIString & name) {
+	/*piCout << "connected" << name;
+	mode = 2;
+	conn_name = name;*/
+}
+
+
 void Daemon::peerDisconnected(const PIString & name) {
 	if (name == conn_name) {
-		conn_name.clear();
-		mode = 0;
+		disconnect();
 	}
 }

@@ -152,7 +190,7 @@ void Daemon::dataReceived(const PIString & from, const PIByteArray & data) {
 	if (data.size() < 4) return;
 	PIByteArray ba(data), rba;
 	int type; ba >> type;
-	//piCout << "rec from" << from << type;
+	//std::cout << "rec from " << from << type;
 	switch (type) {
 	case RequestHostInfo:
 		makeMyHostInfo();
@@ -161,6 +199,7 @@ void Daemon::dataReceived(const PIString & from, const PIByteArray & data) {
 	case ReplyHostInfo:
 		ba >> info_other;
 		makeOtherHostInfo();
+		fillInfoTile(info_other);
 		break;
 	};
 	if (!rba.isEmpty()) send(from, rba);
@@ -200,7 +239,6 @@ void Daemon::makeOtherHostInfo() {


 void Daemon::updateConsole() {
-	if (!enabled) return;
 	switch (mode) {
 	case 0: tabConnect(); break;
 	case 1: tabFeature(); break;
--- a/utils/system_daemon/daemon.h
+++ b/utils/system_daemon/daemon.h
@@ -13,6 +13,11 @@ public:
 	Daemon();
 	
 	struct HostInfo {
+		HostInfo() {
+			processorsCount = ID = threads = priority = -1;
+			physical_memsize = share_memsize = 0;
+			cpu_load_system = cpu_load_user = 0.;
+		}
 		PIString execCommand;
 		PIString hostname;
 		PIString user;
@@ -31,14 +36,15 @@ public:
 		float cpu_load_user;
 	};
 	
-	void enable() {enabled = true;}
-	void disable() {enabled = false;}
+	void showMainList() {showTile(list_daemons, "Select daemon");}
+	void showActionList() {showTile(list_actions, "Select action");}
 	
 	PIStringList availableDaemons() const;
 	void connectToDaemon(const PIString & dn);
 	void disconnect();
 	
 	PIString connectedDaemon() const;
+	PIString thisDaemonName() const {return selfInfo().name.mid(6);}
 	
 	PIScreenTile * tile() const;
 	
@@ -50,9 +56,14 @@ private:
 		
 	};
 	
+	EVENT_HANDLER2(void, tileEvent, PIScreenTile *, t, PIScreenTypes::TileEvent, e);
 	EVENT_HANDLER1(void, keyEvent, PIKbdListener::KeyEvent, key);
 	EVENT_HANDLER2(void, timerEvent, void * , _d, int, delim);
 	EVENT(menuRequest);
+	void hideAll();
+	void showTile(PIScreenTile * t, const PIString & header = PIString());
+	void fillInfoTile(const HostInfo & hi);
+	void peerConnected(const PIString & name);
 	void peerDisconnected(const PIString & name);
 	void dataReceived(const PIString & from, const PIByteArray & data);
 	void makeMyHostInfo();
@@ -69,7 +80,9 @@ private:
 	PIMap<int, PIString> dnames;
 	PISystemMonitor sys_mon_other;
 	HostInfo info_my, info_other;
-	bool enabled;
+	PIScreenTile * tile_root;
+	TileSimple * tile_info, * tile_header;
+	TileList * list_daemons, * list_actions;
 	int mode, offset, cur, height;
 	
 	
--- a/utils/system_daemon/file_manager.cpp
+++ b/utils/system_daemon/file_manager.cpp
@@ -1,7 +1,7 @@
 #include "file_manager.h"
 #include "shared.h"

-
+extern PIScreen screen;

 FileManager::TileDir::TileDir(): TileList() {
 	label_path = 0;
@@ -132,8 +132,8 @@ void FileManager::TileDir::resizeEvent(int w, int h) {

 FileManager::FileManager() {
 	setName("FileManager");
-	enabled = del_commit = false;
-	//CONNECTU(&console, keyPressed, this, keyEvent)
+	del_commit = false;
+	CONNECTU(&screen, keyPressed, this, keyEvent)
 	//dir.setDir("/home/peri4/Documents");
 	TileSimple * tl;
 	
@@ -183,6 +183,13 @@ PIScreenTile * FileManager::tile() const {


 void FileManager::keyEvent(PIKbdListener::KeyEvent key) {
+	if (!tile_root->visible) return;
+	switch (key.key) {
+	case PIKbdListener::Esc:
+		menuRequest();
+		break;
+	default: break;
+	}
 	/*if (!enabled) return;
 	if (key.key == 'D') {
 		if (cur >= files.size_s() || cur < 0) return;
--- a/utils/system_daemon/file_manager.h
+++ b/utils/system_daemon/file_manager.h
@@ -33,7 +33,7 @@ private:
 	EVENT(menuRequest);
 	void updateConsole();
 	
-	bool enabled, del_commit;
+	bool del_commit;
 	TileDir * panels[2];
 	PIScreenTile * tile_root;
 	PIStringList selected;
--- a/utils/system_daemon/main.cpp
+++ b/utils/system_daemon/main.cpp
@@ -43,6 +43,7 @@ public:
 		cur_peer = -1;
 		TileSimple * tile = new TileSimple("title");
 		tile->content << TileSimple::Row("pisd (PI System Daemon, PIP version " + PIPVersion() + ")", CellFormat(Black, Transparent));
+		tile->content << TileSimple::Row("This daemon: \"" + daemon_.thisDaemonName() + "\"", CellFormat(Black, Transparent));
 		tile->back_format.color_back = Yellow;
 		tile->size_policy = Fixed;
 		screen.rootTile()->addTile(tile);
@@ -131,27 +132,28 @@ public:
 		, CellFormat());
 		piForeachC(PIPeer::PeerInfo &p , daemon_.allPeers())
 			peers_tl->content << TileList::Row(p.name + " | " + PIString::fromNumber(p.dist) + 
-			" | " + PIString::fromNumber(p.ping()) + 
-			" | " + PIString::fromNumber(p.addresses.size_s()) + 
-			" | " + PIString::fromBool(p.isNeighbour())
-			, CellFormat());
+													" | " + PIString::fromNumber(p.ping()) + 
+													" | " + PIString::fromNumber(p.addresses.size_s()) + 
+													" | " + PIString::fromBool(p.isNeighbour())
+													, CellFormat());
 		PIPeer::PeerInfo pi = daemon_.selfInfo();
 		if (cur_peer >= 0 && cur_peer < daemon_.allPeers().size_s()) pi = daemon_.allPeers()[cur_peer];
 		peerinfo_tl->content << TileSimple::Row("Name: " + pi.name, CellFormat());
 		peerinfo_tl->content << TileSimple::Row("Addreses: " + PIString::fromNumber(pi.addresses.size()), CellFormat());
 		piForeachC(PIPeer::PeerInfo::Address &a , pi.addresses)
 			addrs_tl->content << TileList::Row(a.address + " | " + a.netmask + 
-			" | " + PIString::fromNumber(a.ping) + 
-			" | " + PIString::fromNumber(a.last_ping.toSeconds()) + 
-			" | " + PIString::fromBool(a.isAvailable()),  CellFormat());
-			typedef PIPair<PIString, PIVector <PIPeer::PeerInfo* > > PeerPair;
-			PIStringList peermap;
+														" | " + PIString::fromNumber(a.ping) + 
+														" | " + PIString::fromNumber(a.last_ping.toSeconds()) + 
+														" | " + PIString::fromBool(a.isAvailable()),  CellFormat());
+		typedef PIPair<PIString, PIVector <PIPeer::PeerInfo* > > PeerPair;
+		PIStringList peermap;
 		piForeachC(PeerPair &p , daemon_._peerMap()) {
 			PIString s = p.first + " | ";
 			piForeachC(PIPeer::PeerInfo * pp, p.second) s += "->" + pp->name;
+			peermap << s;
 		}
 		piForeachC(PIString &s , peermap)
-			peers_tl->content << TileList::Row(s, CellFormat());
+			peermap_tl->content << TileList::Row(s, CellFormat());
 		screen.unlock();
 	}
    void tick(void* data_, int delimiter) {
@@ -171,8 +173,8 @@ public:
 				switch (e.data.toInt()) {
 				case 0: tinfo->show(); break;
 				case 1: tfm->show(); break;
-				case 2: tdaemon->show(); break;
-				case 3: tpeer->show(); break;
+				case 2: daemon_.showMainList(); tdaemon->show(); break;
+				case 3: tpeer->show(); peers_tl->setFocus(); break;
 				case 4: PIKbdListener::exiting = true; break;
 				}
 			}
@@ -187,7 +189,8 @@ public:
 		}
 	}
 	EVENT_HANDLER1(void, keyEvent, PIKbdListener::KeyEvent, e) {
-		if (e.key == PIKbdListener::Esc) menuRequest();
+		if (tpeer->visible || tinfo->visible)
+			if (e.key == PIKbdListener::Esc) menuRequest();
 		//piCout << "key" << e.key;
 	}
 	PIScreenTile * tmenu, * tinfo, * tfm, * tdaemon, * tpeer;