fixed issue with the same file in two different parts of the manifest (internal and external). Switched concat to union to resolve. disable a lot more now when the download is going, including the mod checkboxes, the folder entry box, and the browse button. adding a network rate so something looks like it is happening instead of freezing at 70% when you're downloading the music mod.

Author: dpwhittaker

index.html

@@ -51,7 +51,7 @@
         background-color: #7b1b1d;
         cursor: pointer;
       }
-      button.right.disabled {
+      button.right:disabled {
         background-color: #2f2f2f;
       }
       #version {
@@ -81,27 +81,27 @@
       #play { background:url(./img/playbutton.png) no-repeat; }
       #play:hover { background:url(./img/playbuttonhov.png) no-repeat; }
       #play:active { background:url(./img/playbuttonclick.png) no-repeat; }
-      #play.disabled { background:url(./img/playbuttondis.png) no-repeat; }
+      #play:disabled { background:url(./img/playbuttondis.png) no-repeat; }
 
       #settings { background:url(./img/settingsbutton.png) no-repeat; }
       #settings:hover { background:url(./img/settingsbuttonhov.png) no-repeat; }
       #settings:active, #settings.active { background:url(./img/settingsbuttonclick.png) no-repeat; }
-      #settings.disabled { background:url(./img/settingsbuttondis.png) no-repeat; }
+      #settings:disabled { background:url(./img/settingsbuttondis.png) no-repeat; }
 
       #profcalc { background:url(./img/profcalcbutton.png) no-repeat; }
       #profcalc:hover { background:url(./img/profcalcbuttonhov.png) no-repeat; }
       #profcalc:active { background:url(./img/profcalcbuttonclick.png) no-repeat; }
-      #profcalc.disabled { background:url(./img/profcalcbuttondis.png) no-repeat; }
+      #profcalc:disabled { background:url(./img/profcalcbuttondis.png) no-repeat; }
 
       #web { background:url(./img/webbutton.png) no-repeat; }
       #web:hover { background:url(./img/webbuttonhov.png) no-repeat; }
       #web:active { background:url(./img/webbuttonclick.png) no-repeat; }
-      #web.disabled { background:url(./img/webbuttondis.png) no-repeat; }
+      #web:disabled { background:url(./img/webbuttondis.png) no-repeat; }
 
       #disc { background:url(./img/discbutton.png) no-repeat; }
       #disc:hover { background:url(./img/discbuttonhov.png) no-repeat; }
       #disc:active { background:url(./img/discbuttonclick.png) no-repeat; }
-      #disc.disabled { background:url(./img/discbuttondis.png) no-repeat; }
+      #disc:disabled { background:url(./img/discbuttondis.png) no-repeat; }
 
       #home { background:url(./img/homebutton.png) no-repeat; }
       #home:hover { background:url(./img/homebuttonhov.png) no-repeat; }
@@ -140,13 +140,13 @@
     </div>
 
     <img class="header-img" src="./img/Relics-of-Corbantis-logo.png" style="position: absolute; left: 2%; top: 2%; width: 334px; -webkit-app-region: drag"/>
-    <button id="play" class="button disabled" style="top: 23%;"></button>
+    <button id="play" class="button" disabled style="top: 23%;"></button>
     <div id="progressbox" class="button shadow" style="top: 33%;height:24px; color: black; font-size: 16px; border: 3px solid #7b1b1d; border-radius: 8px; box-sizing: border-box; background-color: #627d9f">
       <div id="progress" style="width:0%;height:100%;background-color:#cc9966;border-radius:6px"></div>
       <div id="progresstext" style="position:absolute;top:0;width:100%;height:100%;text-align:center;"></div>
     </div>
     <button id="settings" class="button" style="top: 38%;"></button>
-    <button id="profcalc" class="button disabled" style="top: 53%;"></button>
+    <button id="profcalc" class="button" disabled style="top: 53%;"></button>
     <button id="web" class="button" style="top: 68%;"></button>
     <button id="disc" class="button" style="top: 83%;"></button>
     <div id="version"></div>

install.js

@@ -15,15 +15,25 @@ module.exports.getManifest = function(mods, fullScan, emuPath, checkFiles) {
     }
     request({url:"https://github.com/dpwhittaker/RoC-Launcher/releases/download/Assets/manifest.json", json:true}, function(err, response, body) {
         if (err) return console.error(err);
+
         var allmods = [];
         for (var mod in body) if (mod != 'required') allmods.push(mod);
         if (module.exports.modList) module.exports.modList(allmods);
-        files = files.concat(body.required);
-        for (var mod of mods) files = files.concat(body[mod] || []);
+        files = unionByName(files, body.required);
+        for (var mod of mods) files = unionByName(files, body[mod] || []);
         if (checkFiles) checkFiles(files);
     });
 }
 
+function unionByName(a, b) {
+    var lookup = {};
+    for (var i of b) lookup[i.name] = true;
+    var r = [];
+    for (var i of a) if (!lookup[i.name]) r.push(i);
+    for (var i of b) r.push(i);
+    return r;
+}
+
 module.exports.install = function(swgPath, emuPath, mods, fullScan) {
     const child_process = require('child_process');
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "roc-launcher",
-  "version": "0.0.13",
+  "version": "0.0.14",
   "description": "Relics of Corbantis Official SWGEMU Launcher",
   "main": "main.js",
   "scripts": {

renderer.js

@@ -51,7 +51,7 @@ maxBtn.addEventListener('click', event => {
 closeBtn.addEventListener('click', event => remote.getCurrentWindow().close());
 
 playBtn.addEventListener('click', event => {
-    if (isDisabled(playBtn)) return;
+    if (playBtn.disabled) return;
     fs.writeFileSync(path.join(config.folder, "swgemu_login.cfg"), `[ClientGame]\r\nloginServerAddress0=${server.address}\r\nloginServerPort0=${server.port}`);
     var args = ["--",
         "-s", "ClientGame", "loginServerAddress0=" + server.address, "loginServerPort0=" + server.port,
@@ -103,37 +103,52 @@ ipc.on('selected-directory', function (event, path) {
 });
 
 installBtn.addEventListener('click', function(event) {
-    if (isDisabled(installBtn)) return;
-    disable(installBtn);
+    if (installBtn.disabled = false) return;
+    installBtn.disabled = true;
     ipc.send('open-directory-dialog', 'install-selected');
 });
 
 ipc.on('install-selected', function (event, path) {
-    disable(installBtn);
-    disable(fullscanBtn);
-    disable(playBtn);
+    disableAll();
     install.install(path, config.folder, config.mods);
 });
 
 ipc.on('downloading-update', function (event, text) {
     versionDiv.innerHTML = text;
-    disable(installBtn);
-    disable(fullscanBtn);
-    disable(playBtn);
+    disableAll();
 });
 
 ipc.on('download-progress', function(event, info) {
     install.progress(info.transferred, info.total);
 })
 
+var lastCompleted = 0;
+var lastTime = new Date();
+var rate = 0;
+var units = " B/s";
 install.progress = function(completed, total) {
+    var time = new Date();
+    var elapsed = (time - lastTime) / 1000;
+    if (elapsed >= 1) {
+        var bytes = completed - lastCompleted;
+        units = " B/s";
+        rate = bytes / elapsed;
+        if (rate > 1024) {
+            rate = rate / 1024;
+            units = " KB/s";
+        }
+        if (rate > 1024) {
+            rate = rate / 1024;
+            units = " MB/s";
+        }
+        lastCompleted = completed;
+        lastTime = time;
+    }
     if (progressBox.style.display == 'none') progressBox.style.display = 'block';
-    progressText.innerHTML = Math.trunc(completed * 100 / total) + '%';
+    progressText.innerHTML = Math.trunc(completed * 100 / total) + '% (' + rate.toPrecision(3) + units + ')';
     progressBar.style.width = (completed * 100 / total) + '%';
     if (completed == total) {
-        enable(playBtn);
-        enable(fullscanBtn);
-        enable(installBtn);
+        enableAll();
         progressBox.style.display = 'none';
     }
 }
@@ -147,6 +162,7 @@ install.modList = function(mods) {
         checkbox.id = mod.replace(/[^a-zA-Z]/g, "");
         checkbox.checked = config.mods.includes(mod);
         checkbox.onchange = modListChanged;
+        checkbox.disabled = true;
         var label = document.createElement('label');
         label.htmlFor = checkbox.id;
         label.appendChild(document.createTextNode(mod));
@@ -163,42 +179,46 @@ function modListChanged() {
         if (child.children[0].checked) config.mods.push(child.children[0].value);
     }
     saveConfig();
-    disable(fullscanBtn);
-    disable(installBtn);
-    disable(playBtn);
+    disableAll();
     install.install(config.folder, config.folder, config.mods);
 }
 
 fullscanBtn.addEventListener('click', function(event) {
-    if (isDisabled(fullscanBtn)) return;
-    disable(fullscanBtn);
-    disable(installBtn);
-    disable(playBtn);
+    if (fullscanBtn.disabled) return;
+    disableAll();
     install.install(config.folder, config.folder, config.mods, true);
 });
 
 if (fs.existsSync(path.join(config.folder, 'bottom.tre'))) {
-    disable(fullscanBtn);
-    disable(installBtn);
-    disable(playBtn);
+    disableAll();
     install.install(config.folder, config.folder, config.mods);
 } else {
-    disable(playBtn);
-    disable(fullscanBtn);
+    playBtn.disabled = true;
+    fullscanBtn.disabled = true;
     install.getManifest();
     settings.click();
 }
 
-function isDisabled(btn) {
-    return /disabled/.test(btn.className);
-}
-
-function disable(btn) {
-    if (!isDisabled(btn)) btn.className += ' disabled';
+function disableAll() {
+    folderBox.disabled = true;
+    fullscanBtn.disabled = true;
+    installBtn.disabled = true;
+    playBtn.disabled = true;
+    browseBtn.disabled = true;
+    for (var child of modListBox.children) {
+        child.children[0].disabled = true;
+    }    
 }
 
-function enable(btn) {
-    btn.className = btn.className.replace(/ ?disabled ?/,'');
+function enableAll() {
+    folderBox.disabled = false;
+    fullscanBtn.disabled = false;
+    installBtn.disabled = false;
+    playBtn.disabled = false;
+    browseBtn.disabled = false;
+    for (var child of modListBox.children) {
+        child.children[0].disabled = false;
+    }    
 }
 
 function saveConfig() {