From 06826bccd29703397948b82eb87e080b99880398 Mon Sep 17 00:00:00 2001 From: Guillaume Gomez Date: Fri, 7 Sep 2018 11:47:53 +0200 Subject: [PATCH 1/3] Add filtering input for processes --- src/index.html | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/src/index.html b/src/index.html index cdb8117..813c984 100644 --- a/src/index.html +++ b/src/index.html @@ -43,6 +43,13 @@ .progress-bar-ours { background-color: #69D2E7; } +.i-filter { + padding: 4px; + border-radius: 3px; + border: 1px solid #ccc; + width: 100%; + outline-color: #51afd0; +} @@ -215,6 +222,7 @@

{{ sysinfo.hostname }} — {{ sysinfo.uptime }}

+ @@ -306,6 +314,7 @@

{{ sysinfo.hostname }} — {{ sysinfo.uptime }}

'#E0E4CC', '#F9CDAD', '#C02942', '#F38630', '#C8C8A9', '#542437', '#FA6900', '#83AF9B', '#A7DBD8', ], + procFilter: '', }, created: function() { this.fetchData(); @@ -502,7 +511,7 @@

{{ sysinfo.hostname }} — {{ sysinfo.uptime }}

}; }, sortBy: function(sortKey) { - this.reverse = (this.sortKey == this.columns[sortKey]) ? ! this.reverse : true; + this.reverse = (this.sortKey == this.columns[sortKey]) ? !this.reverse : true; this.sortKey = this.columns[sortKey]; }, }, @@ -512,8 +521,13 @@

{{ sysinfo.hostname }} — {{ sysinfo.uptime }}

return []; } var self = this; + var filter = self.procFilter.trim().toLowerCase(); var order = self.reverse ? -1 : 1; - return this.sysinfo.process_list.sort(function(a, b) { + return this.sysinfo.process_list.filter(function(a) { + return filter.length === 0 || + (a['pid'] + '').indexOf(filter) !== -1 || + a['name'].toLowerCase().indexOf(filter) !== -1; + }).sort(function(a, b) { a = a[self.sortKey]; b = b[self.sortKey]; return (a === b ? 0 : a > b ? 1 : -1) * order; From 538ecac9e28442784e89ae6e34b17fe8eb1f0779 Mon Sep 17 00:00:00 2001 From: Guillaume Gomez Date: Mon, 10 Sep 2018 10:43:06 +0200 Subject: [PATCH 2/3] add message when server started --- src/web.rs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/web.rs b/src/web.rs index 6b8cf9f..1769b43 100644 --- a/src/web.rs +++ b/src/web.rs @@ -162,5 +162,9 @@ pub fn start_web_server(sock_addr: Option) -> HttpResult { }); let mut iron = Iron::new(SysinfoIronHandler(data_handler)); iron.threads = 4; - iron.http(sock_addr.unwrap_or("localhost:3000".to_owned())) + let ret = iron.http(sock_addr.unwrap_or("localhost:3000".to_owned())); + if ret.is_ok() { + println!("Started server on port 3000"); + } + ret } From e34b5630853283b9e3c89be2a224d066fe00c8af Mon Sep 17 00:00:00 2001 From: Guillaume Gomez Date: Mon, 10 Sep 2018 10:48:31 +0200 Subject: [PATCH 3/3] extend filtering --- src/index.html | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/index.html b/src/index.html index 813c984..90aa8e8 100644 --- a/src/index.html +++ b/src/index.html @@ -222,7 +222,7 @@

{{ sysinfo.hostname }} — {{ sysinfo.uptime }}

- +
@@ -526,7 +526,9 @@

{{ sysinfo.hostname }} — {{ sysinfo.uptime }}

return this.sysinfo.process_list.filter(function(a) { return filter.length === 0 || (a['pid'] + '').indexOf(filter) !== -1 || - a['name'].toLowerCase().indexOf(filter) !== -1; + a['name'].toLowerCase().indexOf(filter) !== -1 || + (a['uid'] + '').indexOf(filter) !== -1 || + (a['gid'] + '').indexOf(filter) !== -1; }).sort(function(a, b) { a = a[self.sortKey]; b = b[self.sortKey];