From e9956c33d33450e4dbdd73ac0051eb2bbbef4c68 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Fri, 3 May 2019 20:35:19 +0800
Subject: [PATCH] =?UTF-8?q?win=E4=B8=8B=E5=A2=9E=E5=8A=A0=E5=86=85?=
 =?UTF-8?q?=E5=AD=98=E5=8D=A0=E6=AF=94=E5=92=8C=E8=BF=9B=E7=A8=8B=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E5=B9=B6=E6=8C=89=E5=86=85=E5=AD=98=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 assets/index.js | 20 ++++++++++++--------
 preload.js      | 19 ++++---------------
 2 files changed, 16 insertions(+), 23 deletions(-)

diff --git a/assets/index.js b/assets/index.js
index 45dd9ae..20aeed2 100644
--- a/assets/index.js
+++ b/assets/index.js
@@ -33,7 +33,7 @@ saveIcon = async tasks => {
             localStorage[data.Context] = data.Base64ImageData;
         });
         for (var t of tasks) {
-            if (localStorage[t.ProcessName] == undefined) window.getIco.getIcon(t.ProcessName, t.Path);
+            if (localStorage[t.ProcessName] == undefined) window.getIco.getIcon(t.ProcessName, t.Path || '');
         }
     } else {
         for (var t of tasks) {
@@ -81,21 +81,25 @@ search = (t, text) => {
     var taskinfo = '';
     if (window.isWin) {
         var icon = localStorage[t.ProcessName],
-            p = t.ProcessName.toUpperCase(),
-            d = t.Description.toUpperCase();
+            n = (t.ProcessName + t.Description).toUpperCase();
         if (icon == undefined) icon = "iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAEUSURBVFhHYxgFgw2w+vv7C9ASA+1ggViFBiIiImISEhLuREVFfaAljo+PPxsZGWkJtRYBgoICzgUHBvzz9/X97+9HIww0O9Df/09QUFAr1FoEcJ9/9ILXotP/PBec+E9TvPDUH/f5Rzqg1iKA+6an5712vvnnse3Ff5rina//uG980g61FgHcNz4877XtxT+PzU/+0xRvf/7Hff2jUQeMOmDUAaMOGHXAqANGHTDqgEHoALf190/57fvyz2v7i/9e21/SBgObZD57Pv52XX23EWotAhh1rUpw3/DwofuGB5/dNtyjCQaaD6TvXjLuWGUDtRYFsDCwsWnwGdqbcOpY0QTzGVqZAO1RAWJmsI2jYOABAwMAOrpjfXCfUOgAAAAASUVORK5CYII=";
-        if (p.includes(text) || d.includes(text)) {
-            let title = t.Description ? t.Description : t.ProcessName;
+        if (n.includes(text)) {
+            var usr = t.UserName ? t.UserName.split('\\').pop() : '',
+                title = t.Description ? t.Description : t.ProcessName,
+                mem = (parseInt(t.WorkingSet) * 100 / window.totalMem).toFixed(2),
+                path = t.Path ? t.Path : '';
             taskinfo = `<div class="taskinfo" name="${t.ProcessName}">
+                  <div class="user">${usr}</div>
                   <img src="data:image/png;base64,${icon}">
                   <div class="description">${title}</div>
-                  <div class="path">${t.Path}</div></div>`;
+                  <div class="usage">M: ${mem}%</div>
+                  <div class="path">${path}</div></div>`;
         }
     } else {
         var icon = localStorage[t.nam],
-            p = t.nam.toUpperCase();
+            n = t.nam.toUpperCase();
         if (icon == undefined) icon = "iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAACXBIWXMAABYlAAAWJQFJUiTwAAAFNWlUWHRYTUw6Y29tLmFkb2JlLnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQiPz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENvcmUgNS42LWMxNDAgNzkuMTYwNDUxLCAyMDE3LzA1LzA2LTAxOjA4OjIxICAgICAgICAiPiA8cmRmOlJERiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp0aWZmPSJodHRwOi8vbnMuYWRvYmUuY29tL3RpZmYvMS4wLyIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczpkYz0iaHR0cDovL3B1cmwub3JnL2RjL2VsZW1lbnRzLzEuMS8iIHhtbG5zOnBob3Rvc2hvcD0iaHR0cDovL25zLmFkb2JlLmNvbS9waG90b3Nob3AvMS4wLyIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0RXZ0PSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VFdmVudCMiIHRpZmY6T3JpZW50YXRpb249IjEiIHhtcDpDcmVhdGVEYXRlPSIyMDE5LTA0LTI0VDEwOjAwOjE1KzA4OjAwIiB4bXA6TW9kaWZ5RGF0ZT0iMjAxOS0wNC0yNFQxMDowMToyMyswODowMCIgeG1wOk1ldGFkYXRhRGF0ZT0iMjAxOS0wNC0yNFQxMDowMToyMyswODowMCIgZGM6Zm9ybWF0PSJpbWFnZS9wbmciIHBob3Rvc2hvcDpDb2xvck1vZGU9IjMiIHBob3Rvc2hvcDpJQ0NQcm9maWxlPSJzUkdCIElFQzYxOTY2LTIuMSIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDo5MGQzMmU1Yi02OWY4LTRhOWYtYWUxNS0wMWEwZWY2Mzc2YTQiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6OTBkMzJlNWItNjlmOC00YTlmLWFlMTUtMDFhMGVmNjM3NmE0IiB4bXBNTTpPcmlnaW5hbERvY3VtZW50SUQ9InhtcC5kaWQ6OTBkMzJlNWItNjlmOC00YTlmLWFlMTUtMDFhMGVmNjM3NmE0Ij4gPHhtcE1NOkhpc3Rvcnk+IDxyZGY6U2VxPiA8cmRmOmxpIHN0RXZ0OmFjdGlvbj0ic2F2ZWQiIHN0RXZ0Omluc3RhbmNlSUQ9InhtcC5paWQ6OTBkMzJlNWItNjlmOC00YTlmLWFlMTUtMDFhMGVmNjM3NmE0IiBzdEV2dDp3aGVuPSIyMDE5LTA0LTI0VDEwOjAxOjIzKzA4OjAwIiBzdEV2dDpzb2Z0d2FyZUFnZW50PSJBZG9iZSBQaG90b3Nob3AgQ0MgKE1hY2ludG9zaCkiIHN0RXZ0OmNoYW5nZWQ9Ii8iLz4gPC9yZGY6U2VxPiA8L3htcE1NOkhpc3Rvcnk+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+vwRiLQAAAuRJREFUWIXtlz1vHFUUhp9z52Mn67UTs7YcCSnio0AhFHSIgnSIIoqEokiIOgVtfkF+QmoqSxRUiI4SiShBCKVPhQSyowg7C14p9to7d+aeQ7E7s7vxWMGwa1PwSqMZzcc9z5zznntnxMw4T7lzjf5fAIirgwvtNh98dP1Dn+fZoqoiAq0sy39++PCno8PBLMCNW7e/jES+6O3uIK4pMTLe29Txy3r5WvUmAhhmRre7xo1btzeBOzMA+XD48XfffsNyZwkZPzBfADCM/YMBn372+SfVHTVAWfi91dVLb62trZNmKb43xHLFrcRQGtJymFfCfkm83iLseSR1xN0UC6+umXMO7z1R7zlF4feOAaiaYYaaUvRz0qsdktczit+HUBhhvyTKHEvvrTB40KNz8zLmlcGjP3Dt6JUAADYKgenEZTWAqWIGOgy0Lnd47c4blM9yyt0dunff5uCHHvF6imvFXHj/EsXTI/pfb+Oy0zWSmaGqk8zUGTDFzMAJlivlnzn+twGmht86RAclmivF1hGHj/dwyzHJlTZWnK5lzAybApiUIChqiiRC6Hv6m1u03ulgXund/wVJHdFyTHb1Igc/9iifDYnXUsqnR/8qA7MlUAMDt5IQ+p6DB6P6SuIQIPQL9r/fIVpNGT55AQLuYgJ/w4T1i5qiGhoyoIFqXRADySKibNZcEglRKwXALY8fPUXwyoQamjygip7BwmSmhKkMTABCGBMuFsLM0NAEoGHGnfOWiIzjWHMJQjirEtiMCWuA0UR0jgBBF++BavzmLgi6UA/UcfSELjANtQcqwyxKdtI8cFZq9MCiAaaz2rwankkG7FismcUIRqTOOVzjd+E/12g8dzKAqjqAEEK9zVMiUtfexrFmAJIk6QJsb2/PNXCT4jjuHgMoiuKra9fevTcYHMqi/OCcY6ndNu/9ZnVObKr3NzY23hSR1HQ0I8xrNqjGEucEs2Jnd/fXybfH/z+n56y/AJCowRn/6NLmAAAAAElFTkSuQmCC";
-        if (p.includes(text)) {
+        if (n.includes(text)) {
             taskinfo = `<div class="taskinfo" name="${t.pid}">
                   <div class="user">${t.usr}</div>
                   <img src="data:image/png;base64,${icon}">
diff --git a/preload.js b/preload.js
index 071ff1c..b4c69e4 100644
--- a/preload.js
+++ b/preload.js
@@ -10,6 +10,8 @@ isWin = os.platform() == 'win32' ? true : false;
 
 getIco = isWin ? require('icon-extractor') : require('file-icon');
 
+totalMem = os.totalmem();
+
 getLogo = () => nativeImage.createFromPath(path.join(__dirname, 'logo.png'));
 
 messageBox = (options, callback) => {
@@ -42,21 +44,8 @@ powershell = (cmd, callback) => {
 tasklist = (callback) => {
     var tasklist = [];
     if (isWin) {
-        powershell("Get-Process | Format-List ProcessName,Path,Description", (stdout, stderr) => {
-            let tasks = stdout.trim().split('\r\n\r\n');
-            for (var task of tasks) {
-                dict = {}
-                let lines = task.split('\r\n')
-                lines.forEach(line => {
-                    if (line) {
-                        let key = line.split(/\s+:\s*/)[0];
-                        let value = line.split(/\s+:\s*/)[1];
-                        dict[key] = value;
-                    }
-                })
-                tasklist.push(dict);
-            }
-            tasklist.shift();
+        powershell("Get-Process -IncludeUserName | sort-object ws -descending | Select-Object ProcessName,Path,Description,WorkingSet,UserName | ConvertTo-Json", (stdout, stderr) => {
+            tasklist = JSON.parse(stdout);
             callback(tasklist);
         });
     } else {