From a456a76aa7ab8c9174952477aa28cc5e3e718e4a Mon Sep 17 00:00:00 2001
From: Alex Pankratov <ap@swapped.ch>
Date: Wed, 10 Aug 2022 17:17:46 +0200
Subject: [PATCH] Improve board import flow in case of duplicate board.id or
 title

---
 nullboard.html | 41 ++++++++++++++++++++++++++++++++++++++---
 1 file changed, 38 insertions(+), 3 deletions(-)

diff --git a/nullboard.html b/nullboard.html
index 4eac1b0..b760753 100644
--- a/nullboard.html
+++ b/nullboard.html
@@ -3501,16 +3501,49 @@
 		if (! confirm(msg))
 			return false;
 
+		var to_open = '';
+
 		for (var i=0; i<data.length; i++)
 		{
 			var board = data[i];
+			var check_title = true;
+
+			// check ID
 
 			if (index.has(board.id))
 			{
-				console.log(`Import: board ${board.id} (${board.title}) will be assigned new ID`);
-				board.id = +new Date();
+				var which = (data.length == 1) ? "with the same ID" : board.id;
+
+				if (confirm(`Board ${which} already exists. Overwrite it?`) &&
+				    confirm(`OVERWRITE for sure?`))
+				{
+					console.log(`Import: ${board.id} (${board.title} - will overwrite existing one`);
+					check_title = false;
+				}
+				else
+				if (confirm(`Import the board under a new ID?`))
+				{
+					var new_id = +new Date();
+					console.log(`Import: ${board.id} (${board.title} - will import as ${new_id}`);
+					board.id = new_id;
+				}
+				else
+				{
+					console.log(`Import: ${board.id} (${board.title} - ID conflict, will not import`);
+					continue;
+				}
 			}
 
+			if (check_title)
+			{
+				var retitle = false;
+				index.forEach( have => { retitle |= (have.title == board.title) } );
+
+				if (retitle) board.title += ' (imported)';
+			}
+
+			// ok, do the deed
+
 			board.revision--; // save will ++ it back
 
 			if (! NB.storage.saveBoard(board)) // this updates 'index'
@@ -3518,9 +3551,11 @@
 				alert(`Failed to save board ${board.id}. Import failed.`);
 				return false;
 			}
+
+			if (! to_open) to_open = data[0].id;
 		}
 
-		openBoard(data[0].id);
+		if (to_open) openBoard(to_open);
 	}
 
 	/*