From 15d70139246329f52012fadd6e2c25bbb8c9387a Mon Sep 17 00:00:00 2001
From: Will Bradley <bradley.will@gmail.com>
Date: Sun, 15 Apr 2018 23:34:23 -0700
Subject: [PATCH] Require path before screenshot; auto-name files within
 folder, no user-selected filenames.

---
 index.html  |  2 +-
 renderer.js | 39 ++++++++++++++++++++++++---------------
 2 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/index.html b/index.html
index 3b72ba7..7a28e6b 100644
--- a/index.html
+++ b/index.html
@@ -16,7 +16,7 @@
             <textarea id="description" name="description" placeholder="Incident Description..." rows="10" cols="30"></textarea>
         </form>
 
-        <label id="screenshot-path">Path:</label><br>
+        <label id="screenshot-path">Path: NONE</label><br>
         <button id="path-button" class="btn btn-primary">Select Path</button><br>
         <button id="screen-shot" class="btn btn-primary">Take Screenshot</button>
     </div>
diff --git a/renderer.js b/renderer.js
index 60627d2..2bd0b00 100644
--- a/renderer.js
+++ b/renderer.js
@@ -14,21 +14,24 @@ const screenshotMsg = document.getElementById('screenshot-path');
 const pathButton = document.getElementById('path-button');
 const casenameField = document.getElementById('casename');
 
-var screenshotPath = '';
+var directoryPath = '';
 var caseName = '';
 
 pathButton.addEventListener('click', function(event) {
-    dialog.showSaveDialog({
-            filters: [
-                { name: 'png', extensions: ['png'] }
+    dialog.showOpenDialog({
+            title: 'Choose a folder for DocumentIt to save in',
+            buttonLabel: 'Select Path',
+            properties: [
+                'openDirectory',
+                'createDirectory',
             ]
         },
-        function(fileName) {
-            if (fileName === undefined) {
+        function(paths) {
+            if (paths === undefined || paths.length === 0) {
                 return;
             }
-            screenshotPath = fileName;
-            screenshotMsg.textContent = screenshotPath;
+            directoryPath = paths[0]; // paths is an array, get the first (only) one
+            screenshotMsg.textContent = "Path: "+directoryPath;
         });
 });
 
@@ -38,29 +41,35 @@ screenshot.addEventListener('click', function(event) {
     let options = { types: ['screen'], thumbnailSize: thumbSize };
 
     desktopCapturer.getSources(options, function(error, sources) {
-        if (error) return console.log(error.message);
+        if (error) return displayError(error.message);
 
         sources.forEach(function(source) {
             if (source.name === 'Entire Screen' || source.name === 'Entire screen' || source.name === 'Screen 1') {
 
                 caseName = casenameField.value;
-                if (screenshotPath === '') {
-                    timestamp = new Date().getTime();
-                    screenshotPath = path.join(os.tmpdir(), caseName + '-' + timestamp + '.png');
+                if (directoryPath === '') {
+                    return displayError("Please Select a Path to save the screenshot to.");
                 }
 
+                timestamp = new Date().getTime();
+                screenshotPath = path.join(directoryPath, caseName + '-' + timestamp + '.png');
+
                 fs.writeFile(screenshotPath, source.thumbnail.toPng(), function(error) {
-                    if (error) return console.log(error.message);
+                    if (error) return displayError(error.message);
 
                     shell.openExternal('file://' + screenshotPath);
-                    var message = 'Saved screenshot to: ' + screenshotPath;
-                    screenshotMsg.textContent = message;
+                    screenshotMsg.textContent = 'Saved screenshot to: ' + screenshotPath;
                 })
             }
         });
     });
 });
 
+function displayError(message) {
+    screenshotMsg.textContent = "ERROR: "+message;
+    return console.log(message);
+}
+
 function determineScreenShot() {
     const screenSize = electronScreen.getPrimaryDisplay().workAreaSize;
     const maxDimension = Math.max(screenSize.width, screenSize.height);