From 574741de066232fec7fd195f5e1b854efe76c145 Mon Sep 17 00:00:00 2001
From: dragonwocky <thedragonring.bod@gmail.com>
Date: Mon, 13 Jul 2020 15:28:38 +1000
Subject: [PATCH] remove: prompt deletion of ~/.notion-enhancer

---
 README.md     |  2 ++
 bin.js        |  1 +
 pkg/remove.js | 38 ++++++++++++++++++++++++++++----------
 3 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index 3e181d8..202500c 100644
--- a/README.md
+++ b/README.md
@@ -4,6 +4,8 @@ ended up here? this is a wip version of the enhancer, and this file is yet to be
 if you're interested in the project, switch back to the [master branch](https://github.com/dragonwocky/notion-enhancer).
 for support, contact me on discord `dragonwocky#8449` or open an issue here in the repo.
 
+want to contribute? check the the [contribution guidelines](CONTRIBUTING.md).
+
 <!--
 
 what?
diff --git a/bin.js b/bin.js
index 8d44e19..d3eb35e 100644
--- a/bin.js
+++ b/bin.js
@@ -14,6 +14,7 @@ const meta = require('./package.json'),
 // ' ...information'
 // ' * warning'
 // ' > prompt'
+// ' -> response'
 // ' ~~ exit'
 // '### error ###'
 
diff --git a/pkg/remove.js b/pkg/remove.js
index f795746..2ddd8c9 100644
--- a/pkg/remove.js
+++ b/pkg/remove.js
@@ -9,9 +9,17 @@ const os = require('os'),
   fs = require('fs-extra'),
   path = require('path'),
   exec = require('util').promisify(require('child_process').exec),
-  helpers = require('./helpers.js');
+  { getNotion, readline, data_folder } = require('./helpers.js');
 
-let __notion = helpers.getNotion();
+// '=== title ==='
+// ' ...information'
+// ' * warning'
+// ' > prompt'
+// ' -> response'
+// ' ~~ exit'
+// '### error ###'
+
+let __notion = getNotion();
 
 module.exports = async function (yes) {
   console.info('=== NOTION RESTORATION LOG ===');
@@ -35,14 +43,14 @@ module.exports = async function (yes) {
         if (!yes) {
           do {
             process.stdout.write(' > overwrite? [Y/n]: ');
-            write = await helpers.readline();
+            write = await readline();
           } while (write && !['y', 'n'].includes(write.toLowerCase()));
           write = !write || write.toLowerCase() == 'y';
         } else write = true;
         console.info(
           write
-            ? ' ...overwriting app.asar with app.asar.bak'
-            : ' ...removing app.asar.bak'
+            ? ' -> overwriting app.asar with app.asar.bak'
+            : ' -> removing app.asar.bak'
         );
       }
 
@@ -55,11 +63,21 @@ module.exports = async function (yes) {
       );
     } else console.warn(` * ${asar_bak} not found: step skipped.`);
 
-    const data_ = path.join(__notion, 'app');
-    if (await fs.pathExists(app_folder)) {
-      console.info(` ...removing folder ${app_folder}`);
-      file_operations.push(fs.remove(app_folder));
-    } else console.warn(` * ${app_folder} not found: step skipped.`);
+    if (await fs.pathExists(data_folder)) {
+      console.log(` ...data folder ${data_folder} found.`);
+      let write = true;
+      if (!yes) {
+        do {
+          process.stdout.write(' > delete? [Y/n]: ');
+          write = await readline();
+        } while (write && !['y', 'n'].includes(write.toLowerCase()));
+        write = !write || write.toLowerCase() == 'y';
+      } else write = true;
+      console.info(
+        write ? ` -> deleting ${data_folder}` : ` -> keeping ${data_folder}`
+      );
+      if (write) file_operations.push(fs.remove(data_folder));
+    } else console.warn(` * ${data_folder} not found: step skipped.`);
 
     await Promise.all(file_operations);