Merge branch 'better-process-handling'

Author: ulver2812

CHANGELOG.md

@@ -1,6 +1,22 @@
 ### Changelog
 All notable changes to this project will be documented in this file.
 
+## [1.4.0] - 2019-02-26
+### Fixed
+- With multiple folders in the backup job the S3 paths were wrong
+### Changed
+- Now processes run in sequential order for better performance
+### Added
+- Stop backup button in job list view
+- Now the AWS CLI processes are killed on app exit
+- Now the current backup running process are killed after its done
+- Bucket info: size and number of objects are shown in S3 explorer view through AWS Cloudwatch
+- More app's icons for better rendering on Win 10 OS
+- Now you can limit S3 upload speed by adjust bandwidth and concurrent requests, 
+to avoid excessive band consumption
+- Now you can set the backup max duration time, in order to stop the backup after a certain 
+amount of time regardless the real time needed to complete the backup.
+
 ## [1.3.0] - 2019-02-26
 ### Added
 - Auto updater

README.md

@@ -26,7 +26,11 @@ You can find the AWS CLI installer here: [Download AWS CLI](https://aws.amazon.c
 
 ## Windows executable (portable and installer)
 
-[Check releases](https://github.com/ulver2812/aws-s3-backup/releases) 
+[Download here](https://github.com/ulver2812/aws-s3-backup/releases) 
+
+## Changelog
+
+[Check changelog](https://github.com/ulver2812/aws-s3-backup/blob/master/CHANGELOG.md) 
 
 ## Getting Started
 
@@ -75,7 +79,7 @@ Don't forget to deactivate the "Developer Tools" by commenting `win.webContents.
 ## AWS app settings
 
 In order to use the app you need to set in the settings page an "AWS access key ID" and an "AWS secret access key" that you can create through the IAM service in the AWS console. 
-The IAM user needs a programmatic access account with a correct read/write S3 policy attached. You can use any IAM S3 policy that grant access to the buckets that you want to use with the app.
+The IAM user needs a programmatic access account with a correct read/write S3 policy attached (e.g AmazonS3FullAccess) and CloudWatch Metrics (e.g CloudWatchReadOnlyAccess). You can use any IAM S3 policy that grant access to the buckets that you want to use with the app.
 Here an example policy: [IAM S3 example policy](https://docs.aws.amazon.com/en_us/IAM/latest/UserGuide/reference_policies_examples_s3_rw-bucket.html)
 
 ## To correctly quit the app

icons/favicon.128x128.png

@@ -1,11 +1,24 @@
-import {app, BrowserWindow, BrowserWindowConstructorOptions, screen, Tray, Menu, nativeImage} from 'electron';
+import {
+  app,
+  BrowserWindow,
+  BrowserWindowConstructorOptions,
+  screen,
+  Tray,
+  Menu,
+  nativeImage,
+  ipcMain
+} from 'electron';
 import * as path from 'path';
 import * as url from 'url';
 import * as Splashscreen from '@trodi/electron-splashscreen';
 import * as contextMenuInternal from 'electron-context-menu';
+
 const {autoUpdater} = require('electron-updater');
+const sugar = require('sugar');
+const kill = require('tree-kill');
 
 let win, serve, tray;
+const awsCliProcesses = [];
 const args = process.argv.slice(1);
 serve = args.some(val => val === '--serve');
 
@@ -71,7 +84,7 @@ function createWindow() {
 }
 
 function createTray() {
-  const trayIcon = path.join(__dirname, 'icons/favicon.png');
+  const trayIcon = path.join(__dirname, 'icons/favicon.16x16.png');
   const nimage = nativeImage.createFromPath(trayIcon);
   tray = new Tray(nimage);
   const contextMenu = Menu.buildFromTemplate([
@@ -100,6 +113,16 @@ function checkForUpdate() {
   autoUpdater.checkForUpdatesAndNotify();
 }
 
+function initIpc() {
+  ipcMain.on('add-process-to-kill', (event, processPid) => {
+    awsCliProcesses.push(processPid);
+  });
+
+  ipcMain.on('remove-process-to-kill', (event, processPid) => {
+    sugar.Array.remove(awsCliProcesses, processPid);
+  });
+}
+
 try {
 
   // This method will be called when Electron has finished
@@ -113,6 +136,8 @@ try {
 
   app.on('ready', checkForUpdate);
 
+  app.on('ready', initIpc);
+
   // Quit when all windows are closed.
   app.on('window-all-closed', () => {
     // On OS X it is common for applications and their menu bar
@@ -130,6 +155,12 @@ try {
     }
   });
 
+  app.on('before-quit', function () {
+    for (const process of awsCliProcesses) {
+      kill(process);
+    }
+  });
+
 } catch (e) {
   // Catch Error
   // throw e;