From 241cb23effdb6cbda7c99115fbea27dfe3119c8c Mon Sep 17 00:00:00 2001
From: veronie <wiebke@timm.xyz>
Date: Sun, 14 Feb 2021 16:04:32 +0100
Subject: [PATCH 1/3] started to implement import from bgg1tool.

---
 xyz.veronie.bgg.ui/Application.e4xmi          |  2 +
 .../src/xyz/veronie/bgg/result/BggApi.java    |  5 +
 .../bgg/ui/dialogs/LoadGameListDialog.java    | 30 +++++-
 .../ui/handlers/ImportResultTxtHandler.java   | 96 +++++++++++++++++++
 4 files changed, 131 insertions(+), 2 deletions(-)
 create mode 100644 xyz.veronie.bgg.ui/src/xyz/veronie/bgg/ui/handlers/ImportResultTxtHandler.java

diff --git a/xyz.veronie.bgg.ui/Application.e4xmi b/xyz.veronie.bgg.ui/Application.e4xmi
index 32eaa62..be08761 100644
--- a/xyz.veronie.bgg.ui/Application.e4xmi
+++ b/xyz.veronie.bgg.ui/Application.e4xmi
@@ -17,8 +17,10 @@
   </children>
   <handlers xmi:id="_a0tuEGAUEeuNUoCJDLJTzQ" elementId="xyz.veronie.bgg.ui.handler.save" contributionURI="bundleclass://xyz.veronie.bgg.ui/xyz.veronie.bgg.ui.handlers.HandleSaveGamelist" command="_lA5t8F9TEeuvNqpgCDWpdQ"/>
   <handlers xmi:id="_xJXjUG3zEeuCP7xCflu8WA" elementId="xyz.veronie.bgg.ui.handler.load" contributionURI="bundleclass://xyz.veronie.bgg.ui/xyz.veronie.bgg.ui.handlers.HandleLoadGamelist" command="_qyrHAG3zEeuCP7xCflu8WA"/>
+  <handlers xmi:id="_y97SUG7REeutwMlAyj2x8w" elementId="xyz.veronie.bgg.ui.handler.importResultTxt" contributionURI="bundleclass://xyz.veronie.bgg.ui/xyz.veronie.bgg.ui.handlers.ImportResultTxtHandler" command="_rkauIG7REeutwMlAyj2x8w"/>
   <commands xmi:id="_lA5t8F9TEeuvNqpgCDWpdQ" elementId="xyz.veronie.bgg.ui.command.save" commandName="Save" description="save game list"/>
   <commands xmi:id="_qyrHAG3zEeuCP7xCflu8WA" elementId="xyz.veronie.bgg.ui.command.load" commandName="Load" description="load game list"/>
+  <commands xmi:id="_rkauIG7REeutwMlAyj2x8w" elementId="xyz.veronie.bgg.ui.command.importResultTxt" commandName="ImportResultTxt" description="Import result.txt from bgg1tool"/>
   <addons xmi:id="_Lw_ZsUqSEeqT5sxfmvJ5Tg" elementId="org.eclipse.e4.core.commands.service" contributionURI="bundleclass://org.eclipse.e4.core.commands/org.eclipse.e4.core.commands.CommandServiceAddon"/>
   <addons xmi:id="_Lw_ZskqSEeqT5sxfmvJ5Tg" elementId="org.eclipse.e4.ui.contexts.service" contributionURI="bundleclass://org.eclipse.e4.ui.services/org.eclipse.e4.ui.services.ContextServiceAddon"/>
   <addons xmi:id="_Lw_Zs0qSEeqT5sxfmvJ5Tg" elementId="org.eclipse.e4.ui.bindings.service" contributionURI="bundleclass://org.eclipse.e4.ui.bindings/org.eclipse.e4.ui.bindings.BindingServiceAddon"/>
diff --git a/xyz.veronie.bgg.ui/src/xyz/veronie/bgg/result/BggApi.java b/xyz.veronie.bgg.ui/src/xyz/veronie/bgg/result/BggApi.java
index 7600914..3353aeb 100644
--- a/xyz.veronie.bgg.ui/src/xyz/veronie/bgg/result/BggApi.java
+++ b/xyz.veronie.bgg.ui/src/xyz/veronie/bgg/result/BggApi.java
@@ -11,6 +11,7 @@ import java.net.URL;
 import java.net.URLEncoder;
 import java.util.ArrayList;
 import java.util.Iterator;
+import java.util.List;
 import java.util.Map.Entry;
 
 import javax.inject.Inject;
@@ -61,6 +62,10 @@ public class BggApi {
 		}
 	}
 	
+	public ArrayList<Thing> getThings(List<Integer> ids) {
+		// TODO: retrieve a list of things from BGG with the given ids
+		return new ArrayList<Thing>();
+	}
 	
 
 	public ArrayList<Thing> getThingsForUser(String user) throws IllegalArgumentException {
diff --git a/xyz.veronie.bgg.ui/src/xyz/veronie/bgg/ui/dialogs/LoadGameListDialog.java b/xyz.veronie.bgg.ui/src/xyz/veronie/bgg/ui/dialogs/LoadGameListDialog.java
index d93b044..9994d12 100644
--- a/xyz.veronie.bgg.ui/src/xyz/veronie/bgg/ui/dialogs/LoadGameListDialog.java
+++ b/xyz.veronie.bgg.ui/src/xyz/veronie/bgg/ui/dialogs/LoadGameListDialog.java
@@ -2,6 +2,9 @@ package xyz.veronie.bgg.ui.dialogs;
 
 import java.util.List;
 
+import org.eclipse.core.commands.ParameterizedCommand;
+import org.eclipse.e4.core.commands.ECommandService;
+import org.eclipse.e4.core.commands.EHandlerService;
 import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.jface.viewers.ArrayContentProvider;
@@ -26,6 +29,7 @@ import org.eclipse.swt.widgets.TableColumn;
 import org.eclipse.wb.swt.SWTResourceManager;
 
 import xyz.veronie.bgg.ui.helpers.BatColors;
+import org.eclipse.swt.widgets.Button;
 
 public class LoadGameListDialog extends Dialog {
 	private String selectedName;
@@ -112,6 +116,21 @@ public class LoadGameListDialog extends Dialog {
 		});
 
 		column.pack();
+		
+		Composite otherActionsComposite = new Composite(container, SWT.NONE);
+		otherActionsComposite.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false, 1, 1));
+		otherActionsComposite.setLayout(new GridLayout(1, false));
+		
+		Button btnImport = new Button(otherActionsComposite, SWT.NONE);
+		btnImport.addMouseListener(new MouseAdapter() {
+			@Override
+			public void mouseUp(MouseEvent e) {
+				importFromBggTool1Result();
+			}
+		});
+		btnImport.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false, 1, 1));
+		btnImport.setBounds(0, 0, 75, 25);
+		btnImport.setText("Import from BggTool1 result.txt...");
 
 		return container;
 	}
@@ -122,7 +141,15 @@ public class LoadGameListDialog extends Dialog {
 		this.close();
 	}
 
-	
+	private void importFromBggTool1Result() {
+//		ECommandService commandService, EHandlerService handlerService
+//		ParameterizedCommand cmd =
+//			    commandService.createCommand("xyz.veronie.bgg.ui.command.importResultTxt", null);
+//		if (handlerService.canExecute(cmd)){
+//		    handlerService.executeHandler(cmd);
+//		}
+	}
+
 	/**
 	 * Create contents of the button bar.
 	 * @param parent
@@ -146,5 +173,4 @@ public class LoadGameListDialog extends Dialog {
 	public String getSelectedName() {
 		return selectedName;
 	}
-    
 }
diff --git a/xyz.veronie.bgg.ui/src/xyz/veronie/bgg/ui/handlers/ImportResultTxtHandler.java b/xyz.veronie.bgg.ui/src/xyz/veronie/bgg/ui/handlers/ImportResultTxtHandler.java
new file mode 100644
index 0000000..2c9025f
--- /dev/null
+++ b/xyz.veronie.bgg.ui/src/xyz/veronie/bgg/ui/handlers/ImportResultTxtHandler.java
@@ -0,0 +1,96 @@
+ 
+package xyz.veronie.bgg.ui.handlers;
+
+import java.io.BufferedReader;
+import java.io.FileNotFoundException;
+import java.io.FileReader;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.e4.core.di.annotations.CanExecute;
+import org.eclipse.e4.core.di.annotations.Execute;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.widgets.FileDialog;
+import org.eclipse.swt.widgets.MessageBox;
+import org.eclipse.swt.widgets.Shell;
+
+public class ImportResultTxtHandler {
+	
+	private Shell shell;
+
+
+	@Execute
+	public void execute(Shell shell) {
+		this.shell = shell;
+		
+		FileDialog dialog = new FileDialog(shell, SWT.OPEN);
+		dialog.setText("Select a result.txt from bgg1tool");
+		String[] exfilters = { "*.txt" };
+		dialog.setFilterExtensions(exfilters);
+		String resultPath = dialog.open();
+		
+		if(resultPath != null && !resultPath.isEmpty()) {
+			List<Integer> thingIds = parseResultTxtIds(resultPath);
+			
+		}
+	}
+	
+	
+	private List<Integer> parseResultTxtIds(String resultPath) {
+		FileReader input = null;
+		String myLine = null;
+		try {
+			input = new FileReader(resultPath);
+			
+			BufferedReader bufferedReader = new BufferedReader(input);
+			
+		    List<Integer> ids = new ArrayList<Integer>();
+			while ( (myLine = bufferedReader.readLine()) != null)
+			{    
+			    String[] tokens = myLine.split(",");
+			    if(tokens.length > 1) {
+			    	ids.add(Integer.parseInt(tokens[0]));
+			    }
+			}
+			
+			bufferedReader.close();
+			System.out.println("TRACE: " + ids);
+			return ids;
+			
+		} catch (FileNotFoundException e) {
+			MessageBox msgBox = new MessageBox(shell, SWT.ICON_ERROR | SWT.OK);
+			msgBox.setMessage("Could not open file '" + resultPath + "'.");
+			msgBox.open();
+			e.printStackTrace();
+		} catch (IOException e) {
+			MessageBox msgBox = new MessageBox(shell, SWT.ICON_ERROR | SWT.OK);
+			String msg = "Error while parsing '" + resultPath + "'.\r\n" +
+					"It must have comma separated lines starting with an integer number.\r\n";
+			msgBox.setMessage(msg);
+			msgBox.open();
+			e.printStackTrace();
+		}
+		catch (NumberFormatException e) {
+			MessageBox msgBox = new MessageBox(shell, SWT.ICON_ERROR | SWT.OK);
+			String msg = "Error while parsing '" + resultPath + "'.\r\n" +
+					"It must have comma separated lines starting with an integer number.\r\n";
+			if(myLine != null) {
+				msg.concat("The offending line reads\r\n" + myLine);
+			}
+			msgBox.setMessage(msg);
+			msgBox.open();
+			e.printStackTrace();
+		}
+		
+		return null;
+	}
+
+
+	@CanExecute
+	public boolean canExecute() {
+		
+		return true;
+	}
+		
+}
\ No newline at end of file

From 052e195c16b35bac3dd27513673de500bcc02a48 Mon Sep 17 00:00:00 2001
From: veronie <wiebke@timm.xyz>
Date: Mon, 15 Feb 2021 16:25:08 +0100
Subject: [PATCH 2/3] Import from result.txt kind of functional now. TODO:
 update table properly, don't freeze while parsing xml...

---
 .../bgg/localdb/LocalDbAdapterService.java    |  1 -
 .../veronie/bgg/localdb/SqliteController.java |  1 +
 .../src/xyz/veronie/bgg/result/BggApi.java    | 55 ++++++++++++--
 .../xyz/veronie/bgg/result/ThingProvider.java |  8 ++
 .../bgg/ui/dialogs/LoadGameListDialog.java    | 46 +++++++++---
 .../bgg/ui/handlers/HandleLoadGamelist.java   |  7 +-
 .../ui/handlers/ImportResultTxtHandler.java   | 75 +++++++++++++++----
 7 files changed, 161 insertions(+), 32 deletions(-)

diff --git a/xyz.veronie.bgg.ui/src/xyz/veronie/bgg/localdb/LocalDbAdapterService.java b/xyz.veronie.bgg.ui/src/xyz/veronie/bgg/localdb/LocalDbAdapterService.java
index 76cbbc0..3c0e042 100644
--- a/xyz.veronie.bgg.ui/src/xyz/veronie/bgg/localdb/LocalDbAdapterService.java
+++ b/xyz.veronie.bgg.ui/src/xyz/veronie/bgg/localdb/LocalDbAdapterService.java
@@ -36,6 +36,5 @@ public class LocalDbAdapterService {
 	public List<String> loadThingListNames() throws SQLException {
 		return sqliteController.getThingLists();
 	}
-
 	
 }
diff --git a/xyz.veronie.bgg.ui/src/xyz/veronie/bgg/localdb/SqliteController.java b/xyz.veronie.bgg.ui/src/xyz/veronie/bgg/localdb/SqliteController.java
index 2ab7f5b..ad74389 100644
--- a/xyz.veronie.bgg.ui/src/xyz/veronie/bgg/localdb/SqliteController.java
+++ b/xyz.veronie.bgg.ui/src/xyz/veronie/bgg/localdb/SqliteController.java
@@ -266,4 +266,5 @@ public class SqliteController {
 	}
 
 
+
 }
diff --git a/xyz.veronie.bgg.ui/src/xyz/veronie/bgg/result/BggApi.java b/xyz.veronie.bgg.ui/src/xyz/veronie/bgg/result/BggApi.java
index 3353aeb..137e7f3 100644
--- a/xyz.veronie.bgg.ui/src/xyz/veronie/bgg/result/BggApi.java
+++ b/xyz.veronie.bgg.ui/src/xyz/veronie/bgg/result/BggApi.java
@@ -62,9 +62,20 @@ public class BggApi {
 		}
 	}
 	
+	/// retrieve a list of things from BGG with the given ids
 	public ArrayList<Thing> getThings(List<Integer> ids) {
-		// TODO: retrieve a list of things from BGG with the given ids
-		return new ArrayList<Thing>();
+		StringBuilder urlStr = new StringBuilder();
+		urlStr.append(BASE_URL + "thing?id=");
+		
+		String sep = "";
+		for (Integer integer : ids) {
+			urlStr.append(sep + integer.toString());
+			if(sep.isEmpty()) {
+				sep = ",";
+			}
+		}
+		
+		return getThings(urlStr.toString());
 	}
 	
 
@@ -209,7 +220,7 @@ public class BggApi {
 					if (nNode.getNodeType() == Node.ELEMENT_NODE) {
 						Element eElement = (Element) nNode;
 						
-						// thing
+						// thing when fetching by user
 						if( eElement.hasAttribute("objecttype") 
 								&& eElement.getAttribute("objecttype").equals("thing"))
 						{
@@ -221,12 +232,45 @@ public class BggApi {
 										getValue(eElement, "image"),
 										getValue(eElement, "thumbnail"),
 										getValue(eElement, "comment"),
-										Integer.parseInt(getValue(eElement, "numplays"))				
+										Integer.parseInt(getValue(eElement, "numplays"))	
 										);
-								Thing thing = new Thing(id, tmd);
+								Thing thing =  new Thing(id, tmd);
 								things.add(thing);
 							}						
 						} 
+						// when fetching things by id, type is boardgame
+						else if(eElement.hasAttribute("type") &&
+							eElement.getAttribute("type").equals("boardgame")) 
+						{
+							Integer id = Integer.parseInt(eElement.getAttribute("id"));
+							if(id != 0) {
+								String name = "";
+								NodeList nameList = eElement.getElementsByTagName("name");
+								for(int n = 0; n < nameList.getLength(); n++) {
+									Node nameNode = nameList.item(n);
+									if (nNode.getNodeType() == Node.ELEMENT_NODE) {
+										Element nameElement = (Element) nameNode;
+										if(nameElement.hasAttribute("type") 
+												&& nameElement.getAttribute("type").equals("primary")) 
+										{
+											name = nameElement.getAttribute("value");
+											break;
+										}
+									}
+								}
+								
+								ThingMetaData tmd = new ThingMetaData(
+										id,
+										name,
+										getValue(eElement, "image"),
+										getValue(eElement, "thumbnail"),
+										getValue(eElement, "comment"),
+										null
+										);
+								Thing thing =  new Thing(id, tmd);
+								things.add(thing);
+							}				
+						}							
 						// family has "type"
 						else if(eElement.hasAttribute("type") 
 								&& eElement.getAttribute("type").equals("boardgamefamily")) 
@@ -317,6 +361,7 @@ public class BggApi {
 		return null;
 	}
 
+
 	private void checkForErrors(Document doc) throws IllegalArgumentException {
 		NodeList nList = doc.getElementsByTagName("error");
 		if(nList.getLength() > 0) {
diff --git a/xyz.veronie.bgg.ui/src/xyz/veronie/bgg/result/ThingProvider.java b/xyz.veronie.bgg.ui/src/xyz/veronie/bgg/result/ThingProvider.java
index 5966b13..c7b0da3 100644
--- a/xyz.veronie.bgg.ui/src/xyz/veronie/bgg/result/ThingProvider.java
+++ b/xyz.veronie.bgg.ui/src/xyz/veronie/bgg/result/ThingProvider.java
@@ -97,6 +97,14 @@ public class ThingProvider {
 		// TODO: handle unsaved current list
 		this.things = localDbAdapterService.loadThingList(name);
 	}
+
+	/// store things as a new list
+	public void storeThings(List<Thing> importThings, String listName) throws SQLException {
+		if(importThings != null && !importThings.isEmpty()) {
+			this.things = importThings;
+			localDbAdapterService.storeThingList(importThings, listName);
+		}
+	}
 	
 	public int numberOfThings() {
 		return things.size();
diff --git a/xyz.veronie.bgg.ui/src/xyz/veronie/bgg/ui/dialogs/LoadGameListDialog.java b/xyz.veronie.bgg.ui/src/xyz/veronie/bgg/ui/dialogs/LoadGameListDialog.java
index 9994d12..0cbe166 100644
--- a/xyz.veronie.bgg.ui/src/xyz/veronie/bgg/ui/dialogs/LoadGameListDialog.java
+++ b/xyz.veronie.bgg.ui/src/xyz/veronie/bgg/ui/dialogs/LoadGameListDialog.java
@@ -2,9 +2,13 @@ package xyz.veronie.bgg.ui.dialogs;
 
 import java.util.List;
 
+import javax.inject.Inject;
+
 import org.eclipse.core.commands.ParameterizedCommand;
 import org.eclipse.e4.core.commands.ECommandService;
 import org.eclipse.e4.core.commands.EHandlerService;
+import org.eclipse.e4.core.di.annotations.Optional;
+import org.eclipse.e4.ui.di.UIEventTopic;
 import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.jface.viewers.ArrayContentProvider;
@@ -20,6 +24,7 @@ import org.eclipse.swt.events.MouseEvent;
 import org.eclipse.swt.graphics.Point;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Label;
@@ -28,26 +33,38 @@ import org.eclipse.swt.widgets.Table;
 import org.eclipse.swt.widgets.TableColumn;
 import org.eclipse.wb.swt.SWTResourceManager;
 
+import xyz.veronie.bgg.types.EventConstants;
 import xyz.veronie.bgg.ui.helpers.BatColors;
-import org.eclipse.swt.widgets.Button;
 
+@SuppressWarnings("restriction")
 public class LoadGameListDialog extends Dialog {
 	private String selectedName;
 
 	private List<String> thingLists;
 
+	private ECommandService commandService;
+
+	private EHandlerService handlerService;
+
 	/**
 	 * Create the dialog.
 	 * @param parentShell
+	 * @param handlerService 
+	 * @param commandService 
 	 */
-	public LoadGameListDialog(Shell parentShell, List<String> thingLists) {
+	public LoadGameListDialog(Shell parentShell, List<String> thingLists, 
+			ECommandService commandService, EHandlerService handlerService) 
+	{
 		super(parentShell);
 		this.thingLists = thingLists;
+		this.commandService = commandService;
+		this.handlerService = handlerService;
 		setShellStyle(SWT.BORDER | SWT.RESIZE | SWT.APPLICATION_MODAL);
 	}
 
 	/**
 	 * Create contents of the dialog.
+	 * 
 	 * @param parent
 	 */
 	@Override
@@ -130,7 +147,7 @@ public class LoadGameListDialog extends Dialog {
 		});
 		btnImport.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false, 1, 1));
 		btnImport.setBounds(0, 0, 75, 25);
-		btnImport.setText("Import from BggTool1 result.txt...");
+		btnImport.setText("Import from bgg1tool result.txt...");
 
 		return container;
 	}
@@ -142,12 +159,12 @@ public class LoadGameListDialog extends Dialog {
 	}
 
 	private void importFromBggTool1Result() {
-//		ECommandService commandService, EHandlerService handlerService
-//		ParameterizedCommand cmd =
-//			    commandService.createCommand("xyz.veronie.bgg.ui.command.importResultTxt", null);
-//		if (handlerService.canExecute(cmd)){
-//		    handlerService.executeHandler(cmd);
-//		}
+		ParameterizedCommand cmd =
+			    commandService.createCommand("xyz.veronie.bgg.ui.command.importResultTxt", null);
+		if (handlerService.canExecute(cmd)){
+		    handlerService.executeHandler(cmd);
+		}
+		closeDialogOk();
 	}
 
 	/**
@@ -173,4 +190,15 @@ public class LoadGameListDialog extends Dialog {
 	public String getSelectedName() {
 		return selectedName;
 	}
+	
+	
+	// TODO: is not called
+	@Inject
+   	@Optional
+   	private void subscribeTopicThingsSaved
+   	    (@UIEventTopic(EventConstants.TOPIC_RESULT_CHANGED)
+   	        String listName) {
+		System.out.println("LoadGameListDialog: TOPIC_RESULT_CHANGED");
+		closeDialogOk();
+   	}
 }
diff --git a/xyz.veronie.bgg.ui/src/xyz/veronie/bgg/ui/handlers/HandleLoadGamelist.java b/xyz.veronie.bgg.ui/src/xyz/veronie/bgg/ui/handlers/HandleLoadGamelist.java
index 112e212..b5254e5 100644
--- a/xyz.veronie.bgg.ui/src/xyz/veronie/bgg/ui/handlers/HandleLoadGamelist.java
+++ b/xyz.veronie.bgg.ui/src/xyz/veronie/bgg/ui/handlers/HandleLoadGamelist.java
@@ -6,6 +6,8 @@ import java.util.List;
 
 import javax.inject.Inject;
 
+import org.eclipse.e4.core.commands.ECommandService;
+import org.eclipse.e4.core.commands.EHandlerService;
 import org.eclipse.e4.core.di.annotations.CanExecute;
 import org.eclipse.e4.core.di.annotations.Execute;
 import org.eclipse.e4.core.services.events.IEventBroker;
@@ -18,13 +20,14 @@ import xyz.veronie.bgg.result.ThingProvider;
 import xyz.veronie.bgg.types.EventConstants;
 import xyz.veronie.bgg.ui.dialogs.LoadGameListDialog;
 
+@SuppressWarnings("restriction")
 public class HandleLoadGamelist {
 	
 	@Inject
 	ThingProvider thingProvider;
 	
 	@Execute
-	public void execute(Shell shell, IEventBroker eventBroker) {
+	public void execute(Shell shell, IEventBroker eventBroker, ECommandService commandService, EHandlerService handlerService) {
 		
 		try {
 			List<String> thingLists = thingProvider.getThingListNames();
@@ -36,7 +39,7 @@ public class HandleLoadGamelist {
 				return;
 			}
 			
-			LoadGameListDialog loadDialog = new LoadGameListDialog(shell, thingLists);
+			LoadGameListDialog loadDialog = new LoadGameListDialog(shell, thingLists, commandService, handlerService);
 			loadDialog.open();
 			
 			int returnCode = loadDialog.getReturnCode();
diff --git a/xyz.veronie.bgg.ui/src/xyz/veronie/bgg/ui/handlers/ImportResultTxtHandler.java b/xyz.veronie.bgg.ui/src/xyz/veronie/bgg/ui/handlers/ImportResultTxtHandler.java
index 2c9025f..5ca2fe1 100644
--- a/xyz.veronie.bgg.ui/src/xyz/veronie/bgg/ui/handlers/ImportResultTxtHandler.java
+++ b/xyz.veronie.bgg.ui/src/xyz/veronie/bgg/ui/handlers/ImportResultTxtHandler.java
@@ -5,23 +5,32 @@ import java.io.BufferedReader;
 import java.io.FileNotFoundException;
 import java.io.FileReader;
 import java.io.IOException;
+import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
 
 import org.eclipse.e4.core.di.annotations.CanExecute;
 import org.eclipse.e4.core.di.annotations.Execute;
+import org.eclipse.e4.core.services.events.IEventBroker;
+import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.FileDialog;
 import org.eclipse.swt.widgets.MessageBox;
 import org.eclipse.swt.widgets.Shell;
 
+import xyz.veronie.bgg.result.BggApi;
+import xyz.veronie.bgg.result.Thing;
+import xyz.veronie.bgg.result.ThingProvider;
+import xyz.veronie.bgg.types.EventConstants;
+import xyz.veronie.bgg.ui.dialogs.SaveGameListDialog;
+
 public class ImportResultTxtHandler {
 	
 	private Shell shell;
 
 
 	@Execute
-	public void execute(Shell shell) {
+	public void execute(Shell shell, ThingProvider thingProvider, BggApi bggApi, IEventBroker eventBroker) {
 		this.shell = shell;
 		
 		FileDialog dialog = new FileDialog(shell, SWT.OPEN);
@@ -32,7 +41,27 @@ public class ImportResultTxtHandler {
 		
 		if(resultPath != null && !resultPath.isEmpty()) {
 			List<Integer> thingIds = parseResultTxtIds(resultPath);
-			
+			if(thingIds != null && !thingIds.isEmpty()) {
+				SaveGameListDialog saveDialog = new SaveGameListDialog(shell);
+				saveDialog.open();
+	
+				int returnCode = saveDialog.getReturnCode();
+				if(returnCode == Dialog.OK) {
+					String listName = saveDialog.getEntryText();
+					try {
+						eventBroker.send(EventConstants.TOPIC_STATUS, "Fetching entries from BGG...");
+						List<Thing> things = bggApi.getThings(thingIds);
+						thingProvider.storeThings(things, listName);
+						eventBroker.send(EventConstants.TOPIC_RESULT_CHANGED, listName);
+						eventBroker.send(EventConstants.TOPIC_STATUS, "Fetched " + Integer.toString(things.size()) + " things.");
+					} catch (SQLException e) {
+						MessageBox msgErrorBox = new MessageBox(shell, SWT.ICON_ERROR | SWT.OK);
+						msgErrorBox.setMessage("Could not save imported result.txt as game list.");
+						msgErrorBox.open();
+						e.printStackTrace();
+					}
+				}
+			}
 		}
 	}
 	
@@ -40,6 +69,8 @@ public class ImportResultTxtHandler {
 	private List<Integer> parseResultTxtIds(String resultPath) {
 		FileReader input = null;
 		String myLine = null;
+		int lineNo = 0;
+		int errNo = 0;
 		try {
 			input = new FileReader(resultPath);
 			
@@ -47,14 +78,38 @@ public class ImportResultTxtHandler {
 			
 		    List<Integer> ids = new ArrayList<Integer>();
 			while ( (myLine = bufferedReader.readLine()) != null)
-			{    
+			{   				
 			    String[] tokens = myLine.split(",");
 			    if(tokens.length > 1) {
-			    	ids.add(Integer.parseInt(tokens[0]));
+			    	if(tokens[0].equals("id")) continue; // header line
+			    	try {
+			    		ids.add(Integer.parseInt(tokens[0]));
+			    		lineNo++;
+			    	}
+			    	catch (NumberFormatException e) {
+			    		errNo++;
+			    		System.out.println("WARN: Could not parse id from line " + Integer.toString(lineNo) 
+			    			+ ", line starts with '" + tokens[0] + "'");
+			    	}
 			    }
 			}
 			
 			bufferedReader.close();
+			
+			if(ids != null) {
+				MessageBox msgBox = new MessageBox(shell, SWT.ICON_INFORMATION | SWT.OK);
+				StringBuilder msg = new StringBuilder();
+				msg.append("Parsing successful. Found ").append(Integer.toString(lineNo)).append(" things.");
+				if(errNo > 0) {
+					msg.append("Skipped ").append(Integer.toString(errNo)).append(" line(s).\n\r");
+				} else {
+					msg.append("\n\r");
+				}
+				msg.append("Next, you will be asked to save the imported list as a new game list.");
+				msgBox.setMessage(msg.toString());
+				msgBox.open();
+			}
+			
 			System.out.println("TRACE: " + ids);
 			return ids;
 			
@@ -71,17 +126,7 @@ public class ImportResultTxtHandler {
 			msgBox.open();
 			e.printStackTrace();
 		}
-		catch (NumberFormatException e) {
-			MessageBox msgBox = new MessageBox(shell, SWT.ICON_ERROR | SWT.OK);
-			String msg = "Error while parsing '" + resultPath + "'.\r\n" +
-					"It must have comma separated lines starting with an integer number.\r\n";
-			if(myLine != null) {
-				msg.concat("The offending line reads\r\n" + myLine);
-			}
-			msgBox.setMessage(msg);
-			msgBox.open();
-			e.printStackTrace();
-		}
+
 		
 		return null;
 	}

From 135e56bda6dd3b93ba178a8b382b316e3b5d2c5f Mon Sep 17 00:00:00 2001
From: veronie <wiebke@timm.xyz>
Date: Tue, 16 Feb 2021 15:51:24 +0100
Subject: [PATCH 3/3] Import from result.txt done.

Added a File menu with save, load, import.
---
 xyz.veronie.bgg.ui/Application.e4xmi          |  15 +++-
 xyz.veronie.bgg.ui/icons/noun_Save_16x16.png  | Bin 0 -> 1414 bytes
 .../icons/noun_import_16x16.png               | Bin 0 -> 1432 bytes
 .../icons/noun_import_60x60.png               | Bin 0 -> 1870 bytes
 xyz.veronie.bgg.ui/icons/noun_open_16x16.png  | Bin 0 -> 1429 bytes
 xyz.veronie.bgg.ui/plugin.xml                 |  12 ----
 .../veronie/bgg/localdb/SqliteController.java |   2 +-
 .../src/xyz/veronie/bgg/result/BggApi.java    |   4 +-
 .../xyz/veronie/bgg/result/ThingProvider.java |   3 +-
 .../bgg/ui/dialogs/LoadGameListDialog.java    |  52 +-------------
 .../ui/handlers/ImportResultTxtHandler.java   |  65 ++++++++----------
 ...Gamelist.java => LoadGamelistHandler.java} |   4 +-
 ...Gamelist.java => SaveGamelistHandler.java} |   6 +-
 .../src/xyz/veronie/bgg/ui/parts/BatMain.java |   1 +
 14 files changed, 54 insertions(+), 110 deletions(-)
 create mode 100644 xyz.veronie.bgg.ui/icons/noun_Save_16x16.png
 create mode 100644 xyz.veronie.bgg.ui/icons/noun_import_16x16.png
 create mode 100644 xyz.veronie.bgg.ui/icons/noun_import_60x60.png
 create mode 100644 xyz.veronie.bgg.ui/icons/noun_open_16x16.png
 rename xyz.veronie.bgg.ui/src/xyz/veronie/bgg/ui/handlers/{HandleLoadGamelist.java => LoadGamelistHandler.java} (92%)
 rename xyz.veronie.bgg.ui/src/xyz/veronie/bgg/ui/handlers/{HandleSaveGamelist.java => SaveGamelistHandler.java} (89%)

diff --git a/xyz.veronie.bgg.ui/Application.e4xmi b/xyz.veronie.bgg.ui/Application.e4xmi
index be08761..002cfe8 100644
--- a/xyz.veronie.bgg.ui/Application.e4xmi
+++ b/xyz.veronie.bgg.ui/Application.e4xmi
@@ -7,7 +7,13 @@
         <tags>View</tags>
       </children>
     </children>
-    <mainMenu xmi:id="_wtXeQEs0EeqGDvPDavxXPQ" elementId="org.eclipse.ui.main.menu"/>
+    <mainMenu xmi:id="_FagzMHBjEeuk7d_98DxC5A" elementId="org.eclipse.ui.main.menu">
+      <children xsi:type="menu:Menu" xmi:id="_Lvh0gHBjEeuk7d_98DxC5A" elementId="xyz.veronie.bgg.ui.menu.file" label="File" mnemonics="F">
+        <children xsi:type="menu:HandledMenuItem" xmi:id="_2_HOsHBkEeuk7d_98DxC5A" elementId="xyz.veronie.bgg.ui.handledmenuitem.save" label="Save..." iconURI="platform:/plugin/xyz.veronie.bgg.ui/icons/noun_Save_16x16.png" tooltip="Save the currently displayed thing list to the internal storage" command="_lA5t8F9TEeuvNqpgCDWpdQ"/>
+        <children xsi:type="menu:HandledMenuItem" xmi:id="_T6z-cHBkEeuk7d_98DxC5A" elementId="xyz.veronie.bgg.ui.handledmenuitem.loadlist" label="Load..." iconURI="platform:/plugin/xyz.veronie.bgg.ui/icons/noun_open_16x16.png" tooltip="Load a thing list from the internal storage" command="_qyrHAG3zEeuCP7xCflu8WA"/>
+        <children xsi:type="menu:HandledMenuItem" xmi:id="_RRC8UHBjEeuk7d_98DxC5A" elementId="xyz.veronie.bgg.ui.handledmenuitem.importresult" label="Import..." iconURI="platform:/plugin/xyz.veronie.bgg.ui/icons/noun_import_16x16.png" tooltip="Import a result.txt file written by bgg1tool int the thing list" mnemonics="" command="_rkauIG7REeutwMlAyj2x8w"/>
+      </children>
+    </mainMenu>
     <trimBars xmi:id="_I6MLEFv-EeqNgfoocONcgg" elementId="xyz.veronie.bgg.ui.trimbar.bottom" side="Bottom">
       <children xsi:type="menu:ToolControl" xmi:id="_JQ6B8Fv-EeqNgfoocONcgg" elementId="xyz.veronie.bgg.ui.toolcontrol.status" contributionURI="bundleclass://xyz.veronie.bgg.ui/xyz.veronie.bgg.ui.parts.StatusBar"/>
     </trimBars>
@@ -15,9 +21,12 @@
       <children xsi:type="menu:ToolBar" xmi:id="_AX9yMIucEeqEpr8WQZMuMQ" elementId="xyz.veronie.bgg.ui.toolbar.testbar"/>
     </trimBars>
   </children>
-  <handlers xmi:id="_a0tuEGAUEeuNUoCJDLJTzQ" elementId="xyz.veronie.bgg.ui.handler.save" contributionURI="bundleclass://xyz.veronie.bgg.ui/xyz.veronie.bgg.ui.handlers.HandleSaveGamelist" command="_lA5t8F9TEeuvNqpgCDWpdQ"/>
-  <handlers xmi:id="_xJXjUG3zEeuCP7xCflu8WA" elementId="xyz.veronie.bgg.ui.handler.load" contributionURI="bundleclass://xyz.veronie.bgg.ui/xyz.veronie.bgg.ui.handlers.HandleLoadGamelist" command="_qyrHAG3zEeuCP7xCflu8WA"/>
+  <handlers xmi:id="_a0tuEGAUEeuNUoCJDLJTzQ" elementId="xyz.veronie.bgg.ui.handler.save" contributionURI="bundleclass://xyz.veronie.bgg.ui/xyz.veronie.bgg.ui.handlers.SaveGamelistHandler" command="_lA5t8F9TEeuvNqpgCDWpdQ"/>
+  <handlers xmi:id="_xJXjUG3zEeuCP7xCflu8WA" elementId="xyz.veronie.bgg.ui.handler.load" contributionURI="bundleclass://xyz.veronie.bgg.ui/xyz.veronie.bgg.ui.handlers.LoadGamelistHandler" command="_qyrHAG3zEeuCP7xCflu8WA"/>
   <handlers xmi:id="_y97SUG7REeutwMlAyj2x8w" elementId="xyz.veronie.bgg.ui.handler.importResultTxt" contributionURI="bundleclass://xyz.veronie.bgg.ui/xyz.veronie.bgg.ui.handlers.ImportResultTxtHandler" command="_rkauIG7REeutwMlAyj2x8w"/>
+  <menuContributions xmi:id="_AitwEHBeEeuk7d_98DxC5A" elementId="xyz.veronie.bgg.ui.menucontribution.gamelists" accessibilityPhrase="Game Lists" positionInParent="0">
+    <children xsi:type="menu:HandledMenuItem" xmi:id="_JvwHYHBeEeuk7d_98DxC5A" elementId="importResult" label="Import..." tooltip="Import thing list from bgg1tool result.txt file" command="_rkauIG7REeutwMlAyj2x8w"/>
+  </menuContributions>
   <commands xmi:id="_lA5t8F9TEeuvNqpgCDWpdQ" elementId="xyz.veronie.bgg.ui.command.save" commandName="Save" description="save game list"/>
   <commands xmi:id="_qyrHAG3zEeuCP7xCflu8WA" elementId="xyz.veronie.bgg.ui.command.load" commandName="Load" description="load game list"/>
   <commands xmi:id="_rkauIG7REeutwMlAyj2x8w" elementId="xyz.veronie.bgg.ui.command.importResultTxt" commandName="ImportResultTxt" description="Import result.txt from bgg1tool"/>
diff --git a/xyz.veronie.bgg.ui/icons/noun_Save_16x16.png b/xyz.veronie.bgg.ui/icons/noun_Save_16x16.png
new file mode 100644
index 0000000000000000000000000000000000000000..440a12e652370e8342d5ab16b0b82e7bf87e10fd
GIT binary patch
literal 1414
zcmV;11$p|3P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0008(dQ@0+Qek%>
zaB^>EX>4U6ba`-PAZ2)IW&i+q+U=KZlH525hX3mnIf4Ko&~apaROJSH{JfIgp6;3K
zCaK+DTWyssj4)sxtey$uukSN_!$Bo;NNS!-&Jjl{sc?nh@jS}DQcU}L-Nc9Rq7U~1
zLnWByytR7SSLpTQfkzBFUiHDR752*!-H!JmEAo>2bCS^Wsi$-~D&rJ#aeGenxE!_1
zaHn#e=}zmM)_r(U7^>72frNPoN!(XIGmv$X)IC>78FnNJS)_!$kS}K_$jj^91&q%H
zdMWZl3ZJWgOP`9*_0r3yTIQ=p5PrHq`bjT$7=8{ccSiiWVDfPFwa9aJpL3jVS5rns
z^VLzi*z|A%!viIk{aD5@oC?|YC>S1VY(U;)iw8!dLJTT1P@+ziCXGEeYDh8hV8hJZ
z0BY%6j0-neoYERJ*`!Dp2gAlA09_KkbD<r#?0AhFkvqYZ3C;+Q{Ot(;wD>0@%-L3n
zDEeJ1<i)G6k;WpouCM|Snin_S1%8YRe|+j6v?>VdF0<nWYdlUDhtfxH$>uDuQ_SZl
zM8W#y03||fMKUBH5Hq@;GDTxHBGl0Vs3LQg#0LnFDt9EwN$|A<W9Jnc&lqi6R?fWC
z*qZ=CC5wSgkqTHTDf-8fqlc=BCRNR9>OqUvEIDP(Ia^+vTs5&|YT3-(id7d+uAbf8
zy?8BL1bd*CT&#F0rB)6Vfhv4e*jH!{KIBM;9{I4tk8;$8_GzhU%gvg%(rV`}9ot0D
z-MaVE>!2{OQ;alp<YB`{8Fix9rpz>T=4sPsnf0c2QT;OhfEr!Yc#~Roc2k2km_1z3
z+D>#a12Ikn;<gB&p?NWjPATysx0uDk_$ZW-q%Jn0(;^0hX%OqAo81Sw-{Kb3e~TOc
zid<Oe{tI#e=)Q9M3AMg{=h`NAeub;1QSkL)eRvJ*b^WN-e>=Y&y&b(By&b(By&b(B
z{SO>X{PBQ)V#5yv@SS#MHhx0@00D$)LqkwWLqi~Na&Km7Y-Iodc$|HaJxIeq9K~N#
zr6TnM>>whNp*mR*6>*d*7QsSkE41oha_JW|X-HCB90k{cgCC1k2N!2u9b5%L@B_rn
z%}LQkO8j3^Xc6PVaX;SOd)&PPgnF5&X2%4eYL=0VMa4{ZRSdjBKtFmhf*FaKdOWq5
zhUfUYhmWs!5uW9J?$6Pq<V*(mMB+K78y4{f@yw>BbKWNov7)39pA(N8bV1@ruFEdJ
zaV|J4@XU~rPR<jDh{Zx1%WcexhDtn599C3~@`a4c3g<1(YPrgq_v9}O=CqX**J%zT
zh9$(2fCw2?lu(9+2(20^CX%!t_3#fl{sg&Xa+Scyv49FxNRA);4}N!R=BFmzq+k^2
ze6j71Q6R7jG-|f}eQeu}6TtrrTxl(Tr4Gz~l3r_R;Ul1L8@RY`Y4RR$xdRM7>5?Hi
zlAorK&jasg^i5e{;1=j!b9-y<<MaVYQ&-D3z`-FfR-o*4k9T*q_xA6ZW`94fKXSkP
zKMJh?000JJOGiWi{{a60|De66lK=n!32;bRa{vGf6951U69E94oEQKA00(qQO+^Rg
z0uT--2kyHrq5uE@j7da6R5;6HU|?W)$iTqxpG^Fa5z2r8M+OFl&kXnhHv<F1K^O<!
z07eGl09+3f1BGDV4PZgzJ25aYd?X?e8E^&Sz<c2#0|P@F0X<m^3=I0{aSFpTiLi7g
zvK}Tp31#Mhri1eg3=EHn4a7nQ28Mn#aU)V<VFHxyW?*25W?*3WM<7#$Ah90-0H<px
UXk?VFr2qf`07*qoM6N<$f<zpA(EtDd

literal 0
HcmV?d00001

diff --git a/xyz.veronie.bgg.ui/icons/noun_import_16x16.png b/xyz.veronie.bgg.ui/icons/noun_import_16x16.png
new file mode 100644
index 0000000000000000000000000000000000000000..72c549433fd892aea518fdb92f603e2ef358f4f8
GIT binary patch
literal 1432
zcmV;J1!ww+P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0008*dQ@0+Qek%>
zaB^>EX>4U6ba`-PAZ2)IW&i+q+U=KJlI$i7h2L34mVhLL#Bwk{RoOw7p96M#x@RWI
zy>;(Xs!iEoAq)9@GCdQ<Uw_W<2M#KkLsIixa*jAsNrfv09?zrfE5)?0*G+s3UhLtX
zV3-8GoVQjl{|dW)Jn&e9j#qo|Yli&_^oV=~l(jNr(4UipoliTZD^MBdAQ!jiR1ZG;
zb~)};u2XD>zJsj$@N7s1mAb-9n1_(Wef2W~Stm)|eZ?rlk3=yR(XczdGJzm3uXhU=
zp9Ojm`7sKg)xSrd#OHe1<&&2A(g=fZCrG~+e@pzdu-qB(>x9W8)K`(`>^|o>->#+%
zMe|irF+9{+&%p73<gy>jXogcUw%rPv#~K^p^w{Eo)~FDJ$_$jKQ>95`_l+7-Ogz}o
zGdF-*HW%Z<O%|uL8cjAS(#65B@d#j+gzsEvuUqzdjT|d?f-4h(5gz%+7XEGWXIhxE
zEr}@ltrha(Rar=5ky}@I0SL{Dn{I(0?ZO|Q>IbC?g1TjPykL#T8RAg-s4dx?1%8VD
z{3<9|zXCuatgT3f1O#G6^;4#3%tizq9e^q_XGwg30I70ElAHuzOE7j`YvUQC?aRuU
zml=B#K&WIfuqjdjD<wt!SaQ@*RnerXSxr4?(V8WvtT|`PYm=)cmP{?1nOm{y;>p#s
zo4XgUg^OSh)RK!8FQwGVp<<zmSQY*imV*yD(xFE_?C_%;wV`}kYT9zM=B>2axl6}3
z(Q~)%z4SUL4D1vm4IO#d@KHvcsI@6GO`Un#^jT)Tsa;gRw4b0x7d76bmY?0!U=3!E
z5VW=vUCcm?6M?ub0w`!+%%W3DyvQwPvGCf@7)k146FMzoK$r%xPP*BBkozHSLH&og
z@qdvE3*GM^7l7_7w{NKR^*h%#vGXfjnnuCbhxy?(u-EmYR)4jB2YLs32YLs32YLs3
z2l^ibn)u@Z|HOvB0YHhJdYIm3r~m)~glR)VP)S2WAaHVTW@&6?004NLeUUv#!$2Ix
zUsI(b^#kl6B9fsxSr8R*lqwd%LTM|s>R@u|7c^-|Qd}Gb*Mfr|i&X~~XI&j!1wrrw
z#Ldk~(M3x9Us7lh<H2!1-ralLy#s`LnW<*S1fXh`k&H#fOm<Zayh1=fdNG0-iJ5vl
zwU~zI__~LWuXhoi<$dnY(WB%{2KYqcIi?#H@dokCrloV<Cl0Zqq!6DIj~jGB;zzE_
zF28XuI4tnYkdaQ#6NiY!LL19%%!-CeJWU){RE_e5jLQn=EzWAW%9{7&FAV0il@!-$
z4kLyo#F2mq8C8@}hJ^^N8Yw1{v>)~G4>|q>xny#cz{s(H3RFmrAN&t~cWdUSCf%f9
z6zF`h?T=9)unRP5w*7r<+l>>z{|sDdEq|pB%zlzyYiZ#lpl=(vxNd3k9&ot>3_j_S
zAvuztrjXAA?`QN)SzzE6=w5SsYwqLp0Z3C<%QwKmAuv{;>~)WKceVHS@0n(QKdwJ=
zzx+Q6tpET324YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`
z2jv0~4kIC0+HP9_005jxL_t(I%k9%K3c@fL#qpoo*`=T-5D(yaT<Zbc9G!J?>X8K9
z1i=f4(8XP-ONLa6rgZf|NIsJHC-A)w9;iF6t)L7OEOC{l4W=<bFrO0vRa^}9)E|%z
znDqh7aYGTcypfq2iyx38yj!(hrU2R?Id)kT&+3c$f<ri$VLxF#!WgfF_#Q*t?*TGM
m{CPupFqP3{cGCW1te<amSuFYr0VeDK0000<MNUMnLSTaSi;xTe

literal 0
HcmV?d00001

diff --git a/xyz.veronie.bgg.ui/icons/noun_import_60x60.png b/xyz.veronie.bgg.ui/icons/noun_import_60x60.png
new file mode 100644
index 0000000000000000000000000000000000000000..b1836fc4a8bc894124d918e0242afb53e4b0d792
GIT binary patch
literal 1870
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
IM6N<$f>=s&-v9sr

literal 0
HcmV?d00001

diff --git a/xyz.veronie.bgg.ui/icons/noun_open_16x16.png b/xyz.veronie.bgg.ui/icons/noun_open_16x16.png
new file mode 100644
index 0000000000000000000000000000000000000000..8b276f12f42eca690148422899b14de46745b094
GIT binary patch
literal 1429
zcmV;G1#0?<P)<h;3K|Lk000e1NJLTq000mG000aK1^@s6Yv(<I0008*dQ@0+Qek%>
zaB^>EX>4U6ba`-PAZ2)IW&i+q+U=KJvfL;Ph2L34mVhLL#Bwk{RoTHTKL>30?Y_A)
zNowY0s@jwd7P64fC)3qo{Plf?Z#c+e4oS^($vNUkB^9n1cs!4?uN2e1UN`X`yx2o*
z*95~P=;ge%diht__2Yqi4LV-!!LJ$iE6}~<6;Rg7j6r`+5_UfAl&(N!oP%84o>M*e
z?AztIQ@KvD9r_Vu-G^sGGN{xQUcx+tB<`!98OS<G>h3E>8Ga;+v51Flx-)?wFR%Ad
zHa-jVBJw>7pVhy$|13V&%R@eCnQv<O>j~1Y#orP?Ei8|W_;tc$Lw$Xn>zuRuoa21E
znlcp4S4G8etFxYg;{nNKKbFx@u?XwvS1V{9Yixkip}~RHs1Sq743wx-rAcG=jT%x+
zJlN1PH-K6;7vsWB7N@itO*Sdg#lf)g2tb#FAGy$8x9s&AIacljS0)4_Jo2|K{L|#0
zv@quaPPD{qr&h>|SLGs&MQ&Z;1t2spZn_1&+l4<q6&6Yr1a-^oc)=QvGsL0vQCqS(
zFS?5U{3<9|zXCuatgT3f1O#G6^;4#3%tizq9e^q_XGwg30I70ElAHuzOE7j`YvUQC
z?aRuUml=B#K&WIfuqjdjD<wt!SaQ@*RnerXSxr4?(V8WvtT|`PYm=)cmP{?1nOm{y
z;>p#so4XgUg^OSh)RK!8FQwGVp<<zmSQY*imV*yD(xFE_?C_%;wV`}kYT9zM=B>2a
zxl6}3(Q~)%z4SUL4D1vm4IO#d@KHvcsI@6GO`Un#^jT(oP`jx9)c$}PUDSA!T7LGR
z25T_8L(tkzbTI=lP6Xn%2%w;OF^f(q@gldF#lrX~l#!$^HlfoZ283x4>!b&}4|2c7
zEvWw%H~tm5u+aS%<O0zB%<T(mz3zQjHn;T^E={B0>%;u;8rbXlQLF#9e+PO8dIx$3
zdI$Qy2b%cRz`vL916xZVNC}9C{r~_0glR)VP)S2WAaHVTW@&6?004NLeUUv#!$2Ix
zUsI(b^#kl6B9fsxSr8R*lqwd%LTM|s>R@u|7c^-|Qd}Gb*Mfr|i&X~~XI&j!1wrrw
z#Ldk~(M3x9Us7lh<H2!1-ralLy#s`LnW<*S1fXh`k&H#fOm<Zayh1=fdNG0-iJ5vl
zwU~zI__~LWuXhoi<$dnY(WB%{2KYqcIi?#H@dokCrloV<Cl0Zqq!6DIj~jGB;zzE_
zF28XuI4tnYkdaQ#6NiY!LL19%%!-CeJWU){RE_e5jLQn=EzWAW%9{7&FAV0il@!-$
z4kLyo#F2mq8C8@}hJ^^N8Yw1{v>)~G4>|q>xny#cz{s(H3RFmrAN&t~cWdUSCf%f9
z6zF`h?T=9)unRP5w*7r<+l>>z{|sDdEq|pB%zlzyYiZ#lpl=(vxNd3k9&ot>3_j_S
zAvuztrjXAA?`QN)SzzE6=w5SsYwqLp0Z3C<%QwKmAuv{;>~)WKceVHS@0n(QKdwJ=
zzx+Q6tpET324YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`
z2jv0~4ki!zdzaAw005auL_t(2&z;gu3IR|Q#qpn)GQi9tWCv!l2OF>oD^f<X0uf0@
z%EwG8Q<Q-L`Ir!y=)F_7+Zp^%_tedx<D(whB9y`7%RkV?;SaY*>l=!l?HkU%_7Jm(
z%a6Ym>S&-4S%03z2^Tbx6Q@nU4y6Pb`T+yf65unI0b^7X0@gSLEKo@ZnBo?YM=>E_
j^!|e~R=7vNS4`ju@Wd;;or7AJ00000NkvXXu0mjf3mTN6

literal 0
HcmV?d00001

diff --git a/xyz.veronie.bgg.ui/plugin.xml b/xyz.veronie.bgg.ui/plugin.xml
index 4a77977..9cf6b9b 100644
--- a/xyz.veronie.bgg.ui/plugin.xml
+++ b/xyz.veronie.bgg.ui/plugin.xml
@@ -2,18 +2,6 @@
 <?eclipse version="3.4"?>
 <plugin>
 
-   <extension
-         id="anotherproduct"
-         point="org.eclipse.core.runtime.products">
-      <product
-            name="BggToolAnother"
-            application="org.eclipse.e4.ui.workbench.swt.E4Application">
-         <property
-               name="appName"
-               value="BggToolAnother">
-         </property>
-      </product>
-   </extension>
    <extension
          id="bggtoolanother"
          point="org.eclipse.core.runtime.products">
diff --git a/xyz.veronie.bgg.ui/src/xyz/veronie/bgg/localdb/SqliteController.java b/xyz.veronie.bgg.ui/src/xyz/veronie/bgg/localdb/SqliteController.java
index ad74389..fa2e1a7 100644
--- a/xyz.veronie.bgg.ui/src/xyz/veronie/bgg/localdb/SqliteController.java
+++ b/xyz.veronie.bgg.ui/src/xyz/veronie/bgg/localdb/SqliteController.java
@@ -173,7 +173,7 @@ public class SqliteController {
 		PreparedStatement thingStatement = connection
                 .prepareStatement("INSERT OR REPLACE INTO Thing VALUES (?, ?, ?, ?, ?, ?);");
 		PreparedStatement listToThingStatement = connection
-				.prepareStatement("INSERT INTO ThingListToThing VALUES (?, ?);");
+				.prepareStatement("INSERT OR IGNORE INTO ThingListToThing VALUES (?, ?);");
 		
 		for (Thing thing : things) {
 			ThingMetaData metaData = thing.getMetaData();
diff --git a/xyz.veronie.bgg.ui/src/xyz/veronie/bgg/result/BggApi.java b/xyz.veronie.bgg.ui/src/xyz/veronie/bgg/result/BggApi.java
index 137e7f3..7b0ceef 100644
--- a/xyz.veronie.bgg.ui/src/xyz/veronie/bgg/result/BggApi.java
+++ b/xyz.veronie.bgg.ui/src/xyz/veronie/bgg/result/BggApi.java
@@ -11,8 +11,8 @@ import java.net.URL;
 import java.net.URLEncoder;
 import java.util.ArrayList;
 import java.util.Iterator;
-import java.util.List;
 import java.util.Map.Entry;
+import java.util.Set;
 
 import javax.inject.Inject;
 import javax.xml.parsers.DocumentBuilder;
@@ -63,7 +63,7 @@ public class BggApi {
 	}
 	
 	/// retrieve a list of things from BGG with the given ids
-	public ArrayList<Thing> getThings(List<Integer> ids) {
+	public ArrayList<Thing> getThings(Set<Integer> ids) {
 		StringBuilder urlStr = new StringBuilder();
 		urlStr.append(BASE_URL + "thing?id=");
 		
diff --git a/xyz.veronie.bgg.ui/src/xyz/veronie/bgg/result/ThingProvider.java b/xyz.veronie.bgg.ui/src/xyz/veronie/bgg/result/ThingProvider.java
index c7b0da3..c5ae7eb 100644
--- a/xyz.veronie.bgg.ui/src/xyz/veronie/bgg/result/ThingProvider.java
+++ b/xyz.veronie.bgg.ui/src/xyz/veronie/bgg/result/ThingProvider.java
@@ -99,10 +99,9 @@ public class ThingProvider {
 	}
 
 	/// store things as a new list
-	public void storeThings(List<Thing> importThings, String listName) throws SQLException {
+	public void importList(List<Thing> importThings, String listName) {
 		if(importThings != null && !importThings.isEmpty()) {
 			this.things = importThings;
-			localDbAdapterService.storeThingList(importThings, listName);
 		}
 	}
 	
diff --git a/xyz.veronie.bgg.ui/src/xyz/veronie/bgg/ui/dialogs/LoadGameListDialog.java b/xyz.veronie.bgg.ui/src/xyz/veronie/bgg/ui/dialogs/LoadGameListDialog.java
index 0cbe166..74a037b 100644
--- a/xyz.veronie.bgg.ui/src/xyz/veronie/bgg/ui/dialogs/LoadGameListDialog.java
+++ b/xyz.veronie.bgg.ui/src/xyz/veronie/bgg/ui/dialogs/LoadGameListDialog.java
@@ -2,13 +2,6 @@ package xyz.veronie.bgg.ui.dialogs;
 
 import java.util.List;
 
-import javax.inject.Inject;
-
-import org.eclipse.core.commands.ParameterizedCommand;
-import org.eclipse.e4.core.commands.ECommandService;
-import org.eclipse.e4.core.commands.EHandlerService;
-import org.eclipse.e4.core.di.annotations.Optional;
-import org.eclipse.e4.ui.di.UIEventTopic;
 import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.jface.viewers.ArrayContentProvider;
@@ -24,7 +17,6 @@ import org.eclipse.swt.events.MouseEvent;
 import org.eclipse.swt.graphics.Point;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Label;
@@ -33,32 +25,23 @@ import org.eclipse.swt.widgets.Table;
 import org.eclipse.swt.widgets.TableColumn;
 import org.eclipse.wb.swt.SWTResourceManager;
 
-import xyz.veronie.bgg.types.EventConstants;
 import xyz.veronie.bgg.ui.helpers.BatColors;
 
-@SuppressWarnings("restriction")
 public class LoadGameListDialog extends Dialog {
 	private String selectedName;
 
 	private List<String> thingLists;
 
-	private ECommandService commandService;
-
-	private EHandlerService handlerService;
-
 	/**
 	 * Create the dialog.
 	 * @param parentShell
 	 * @param handlerService 
 	 * @param commandService 
 	 */
-	public LoadGameListDialog(Shell parentShell, List<String> thingLists, 
-			ECommandService commandService, EHandlerService handlerService) 
+	public LoadGameListDialog(Shell parentShell, List<String> thingLists) 
 	{
 		super(parentShell);
 		this.thingLists = thingLists;
-		this.commandService = commandService;
-		this.handlerService = handlerService;
 		setShellStyle(SWT.BORDER | SWT.RESIZE | SWT.APPLICATION_MODAL);
 	}
 
@@ -137,18 +120,7 @@ public class LoadGameListDialog extends Dialog {
 		Composite otherActionsComposite = new Composite(container, SWT.NONE);
 		otherActionsComposite.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false, 1, 1));
 		otherActionsComposite.setLayout(new GridLayout(1, false));
-		
-		Button btnImport = new Button(otherActionsComposite, SWT.NONE);
-		btnImport.addMouseListener(new MouseAdapter() {
-			@Override
-			public void mouseUp(MouseEvent e) {
-				importFromBggTool1Result();
-			}
-		});
-		btnImport.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false, 1, 1));
-		btnImport.setBounds(0, 0, 75, 25);
-		btnImport.setText("Import from bgg1tool result.txt...");
-
+	
 		return container;
 	}
 
@@ -157,15 +129,7 @@ public class LoadGameListDialog extends Dialog {
 		this.setReturnCode(OK);
 		this.close();
 	}
-
-	private void importFromBggTool1Result() {
-		ParameterizedCommand cmd =
-			    commandService.createCommand("xyz.veronie.bgg.ui.command.importResultTxt", null);
-		if (handlerService.canExecute(cmd)){
-		    handlerService.executeHandler(cmd);
-		}
-		closeDialogOk();
-	}
+	
 
 	/**
 	 * Create contents of the button bar.
@@ -191,14 +155,4 @@ public class LoadGameListDialog extends Dialog {
 		return selectedName;
 	}
 	
-	
-	// TODO: is not called
-	@Inject
-   	@Optional
-   	private void subscribeTopicThingsSaved
-   	    (@UIEventTopic(EventConstants.TOPIC_RESULT_CHANGED)
-   	        String listName) {
-		System.out.println("LoadGameListDialog: TOPIC_RESULT_CHANGED");
-		closeDialogOk();
-   	}
 }
diff --git a/xyz.veronie.bgg.ui/src/xyz/veronie/bgg/ui/handlers/ImportResultTxtHandler.java b/xyz.veronie.bgg.ui/src/xyz/veronie/bgg/ui/handlers/ImportResultTxtHandler.java
index 5ca2fe1..f368864 100644
--- a/xyz.veronie.bgg.ui/src/xyz/veronie/bgg/ui/handlers/ImportResultTxtHandler.java
+++ b/xyz.veronie.bgg.ui/src/xyz/veronie/bgg/ui/handlers/ImportResultTxtHandler.java
@@ -5,14 +5,14 @@ import java.io.BufferedReader;
 import java.io.FileNotFoundException;
 import java.io.FileReader;
 import java.io.IOException;
-import java.sql.SQLException;
-import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
+import org.eclipse.core.runtime.Path;
 import org.eclipse.e4.core.di.annotations.CanExecute;
 import org.eclipse.e4.core.di.annotations.Execute;
 import org.eclipse.e4.core.services.events.IEventBroker;
-import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.FileDialog;
 import org.eclipse.swt.widgets.MessageBox;
@@ -22,7 +22,6 @@ import xyz.veronie.bgg.result.BggApi;
 import xyz.veronie.bgg.result.Thing;
 import xyz.veronie.bgg.result.ThingProvider;
 import xyz.veronie.bgg.types.EventConstants;
-import xyz.veronie.bgg.ui.dialogs.SaveGameListDialog;
 
 public class ImportResultTxtHandler {
 	
@@ -40,51 +39,43 @@ public class ImportResultTxtHandler {
 		String resultPath = dialog.open();
 		
 		if(resultPath != null && !resultPath.isEmpty()) {
-			List<Integer> thingIds = parseResultTxtIds(resultPath);
+			Set<Integer> thingIds = parseResultTxtIds(resultPath);
 			if(thingIds != null && !thingIds.isEmpty()) {
-				SaveGameListDialog saveDialog = new SaveGameListDialog(shell);
-				saveDialog.open();
-	
-				int returnCode = saveDialog.getReturnCode();
-				if(returnCode == Dialog.OK) {
-					String listName = saveDialog.getEntryText();
-					try {
-						eventBroker.send(EventConstants.TOPIC_STATUS, "Fetching entries from BGG...");
-						List<Thing> things = bggApi.getThings(thingIds);
-						thingProvider.storeThings(things, listName);
-						eventBroker.send(EventConstants.TOPIC_RESULT_CHANGED, listName);
-						eventBroker.send(EventConstants.TOPIC_STATUS, "Fetched " + Integer.toString(things.size()) + " things.");
-					} catch (SQLException e) {
-						MessageBox msgErrorBox = new MessageBox(shell, SWT.ICON_ERROR | SWT.OK);
-						msgErrorBox.setMessage("Could not save imported result.txt as game list.");
-						msgErrorBox.open();
-						e.printStackTrace();
-					}
-				}
+				String listName = new Path(resultPath).lastSegment() + " (unsaved)";
+				eventBroker.send(EventConstants.TOPIC_STATUS, "Fetching entries from BGG...");
+				List<Thing> things = bggApi.getThings(thingIds);
+				thingProvider.importList(things, listName);
+				eventBroker.send(EventConstants.TOPIC_RESULT_CHANGED, listName);
+				eventBroker.send(EventConstants.TOPIC_STATUS, "Fetched " + Integer.toString(things.size()) + " things.");
 			}
 		}
 	}
 	
 	
-	private List<Integer> parseResultTxtIds(String resultPath) {
+	private Set<Integer> parseResultTxtIds(String resultPath) {
 		FileReader input = null;
 		String myLine = null;
-		int lineNo = 0;
-		int errNo = 0;
+		int lineNo = 0; // count overall lines
+		int errNo = 0; // count unparsable lines
+		int dupNo = 0; // count duplicates
 		try {
 			input = new FileReader(resultPath);
 			
 			BufferedReader bufferedReader = new BufferedReader(input);
 			
-		    List<Integer> ids = new ArrayList<Integer>();
+		    Set<Integer> ids = new HashSet<Integer>();
 			while ( (myLine = bufferedReader.readLine()) != null)
 			{   				
+	    		lineNo++;
 			    String[] tokens = myLine.split(",");
-			    if(tokens.length > 1) {
+			    if(tokens.length > 0) {
 			    	if(tokens[0].equals("id")) continue; // header line
 			    	try {
-			    		ids.add(Integer.parseInt(tokens[0]));
-			    		lineNo++;
+			    		boolean exists = !ids.add(Integer.parseInt(tokens[0]));
+			    		if(exists) {
+			    			System.out.println("DEBUG: duplicate id: " + tokens[0]);
+			    			dupNo++;
+			    		}
 			    	}
 			    	catch (NumberFormatException e) {
 			    		errNo++;
@@ -99,13 +90,15 @@ public class ImportResultTxtHandler {
 			if(ids != null) {
 				MessageBox msgBox = new MessageBox(shell, SWT.ICON_INFORMATION | SWT.OK);
 				StringBuilder msg = new StringBuilder();
-				msg.append("Parsing successful. Found ").append(Integer.toString(lineNo)).append(" things.");
+				int thingsNo = lineNo - errNo - dupNo - 1;
+				msg.append("Parsing successful. Found ").append(Integer.toString(thingsNo)).append(" things.");
 				if(errNo > 0) {
-					msg.append("Skipped ").append(Integer.toString(errNo)).append(" line(s).\n\r");
-				} else {
-					msg.append("\n\r");
+					msg.append("\n\rSkipped ").append(Integer.toString(errNo)).append(" line(s).");
+				} 
+				if(dupNo > 0) {
+					msg.append("\n\r").append(Integer.toString(dupNo)).append(" duplicate ids");
 				}
-				msg.append("Next, you will be asked to save the imported list as a new game list.");
+				msg.append("\n\r");
 				msgBox.setMessage(msg.toString());
 				msgBox.open();
 			}
diff --git a/xyz.veronie.bgg.ui/src/xyz/veronie/bgg/ui/handlers/HandleLoadGamelist.java b/xyz.veronie.bgg.ui/src/xyz/veronie/bgg/ui/handlers/LoadGamelistHandler.java
similarity index 92%
rename from xyz.veronie.bgg.ui/src/xyz/veronie/bgg/ui/handlers/HandleLoadGamelist.java
rename to xyz.veronie.bgg.ui/src/xyz/veronie/bgg/ui/handlers/LoadGamelistHandler.java
index b5254e5..06249f9 100644
--- a/xyz.veronie.bgg.ui/src/xyz/veronie/bgg/ui/handlers/HandleLoadGamelist.java
+++ b/xyz.veronie.bgg.ui/src/xyz/veronie/bgg/ui/handlers/LoadGamelistHandler.java
@@ -21,7 +21,7 @@ import xyz.veronie.bgg.types.EventConstants;
 import xyz.veronie.bgg.ui.dialogs.LoadGameListDialog;
 
 @SuppressWarnings("restriction")
-public class HandleLoadGamelist {
+public class LoadGamelistHandler {
 	
 	@Inject
 	ThingProvider thingProvider;
@@ -39,7 +39,7 @@ public class HandleLoadGamelist {
 				return;
 			}
 			
-			LoadGameListDialog loadDialog = new LoadGameListDialog(shell, thingLists, commandService, handlerService);
+			LoadGameListDialog loadDialog = new LoadGameListDialog(shell, thingLists);
 			loadDialog.open();
 			
 			int returnCode = loadDialog.getReturnCode();
diff --git a/xyz.veronie.bgg.ui/src/xyz/veronie/bgg/ui/handlers/HandleSaveGamelist.java b/xyz.veronie.bgg.ui/src/xyz/veronie/bgg/ui/handlers/SaveGamelistHandler.java
similarity index 89%
rename from xyz.veronie.bgg.ui/src/xyz/veronie/bgg/ui/handlers/HandleSaveGamelist.java
rename to xyz.veronie.bgg.ui/src/xyz/veronie/bgg/ui/handlers/SaveGamelistHandler.java
index 0e4b1aa..bb9abba 100644
--- a/xyz.veronie.bgg.ui/src/xyz/veronie/bgg/ui/handlers/HandleSaveGamelist.java
+++ b/xyz.veronie.bgg.ui/src/xyz/veronie/bgg/ui/handlers/SaveGamelistHandler.java
@@ -15,19 +15,18 @@ import xyz.veronie.bgg.result.ThingProvider;
 import xyz.veronie.bgg.types.EventConstants;
 import xyz.veronie.bgg.ui.dialogs.SaveGameListDialog;
 
-public class HandleSaveGamelist {
+public class SaveGamelistHandler {
 
 	
 	@Inject
 	ThingProvider thingProvider;
 	
-	public HandleSaveGamelist() {
+	public SaveGamelistHandler() {
 	}
 	
 	@Execute
 	public void execute(Shell shell, IEventBroker eventBroker) {
 
-		// TODO: disable save if list is empty
 		if(thingProvider.numberOfThings() == 0) {
 			MessageBox msgBox = new MessageBox(shell, SWT.ICON_WARNING | SWT.OK);
 			msgBox.setMessage("To save an empty game list would be like drawing from an empty deck.");
@@ -35,6 +34,7 @@ public class HandleSaveGamelist {
 			return;
 		}
 
+		// TODO: handle existing name
 		SaveGameListDialog saveDialog = new SaveGameListDialog(shell);
 		saveDialog.open();
 
diff --git a/xyz.veronie.bgg.ui/src/xyz/veronie/bgg/ui/parts/BatMain.java b/xyz.veronie.bgg.ui/src/xyz/veronie/bgg/ui/parts/BatMain.java
index 722f751..cec7827 100644
--- a/xyz.veronie.bgg.ui/src/xyz/veronie/bgg/ui/parts/BatMain.java
+++ b/xyz.veronie.bgg.ui/src/xyz/veronie/bgg/ui/parts/BatMain.java
@@ -55,6 +55,7 @@ import xyz.veronie.bgg.ui.helpers.BatLayouts;
 // TODO: Display selection details on game
 // TODO: cache family/geeklist descriptions
 // TODO: allow different screen scalings
+// TODO: handle existing name
 
 @SuppressWarnings("restriction")
 public class BatMain {