Working on game list save

xyz.veronie.bgg.ui/src/xyz/veronie/bgg/localdb/LocalDbAdapterService.java

@@ -19,9 +19,11 @@ public class LocalDbAdapterService {
 	}
 
 
-	/// add a list of things with the given name
+	/// Add a list of things with the given name (overwriting the old one)
+	// TODO: handle ask before overwrite
 	public void storeThingList(List<Thing> things, String name) {
-		sqliteController.openThingList(name);
+		sqliteController.deleteThingList(name);
+		sqliteController.createThingListIfNotExists(name);
 		sqliteController.addToThingList(name, things);
 	}
 

xyz.veronie.bgg.ui/src/xyz/veronie/bgg/localdb/SqliteController.java

@@ -51,6 +51,12 @@ public class SqliteController {
             connection = DriverManager.getConnection("jdbc:sqlite:" + dbPath);
             if (!connection.isClosed())
                 System.out.println("...Connection established");
+
+            // init connection
+            Statement stmt = connection.createStatement();
+            stmt.execute("PRAGMA foreign_keys = ON;");
+            stmt.close();
+	    	
         } catch (SQLException e) {
             // throw new RuntimeException(e);
 			System.out.println("Could not init local DB.");
@@ -72,51 +78,105 @@ public class SqliteController {
     }
     
     public void createSchema() {
+    	if(connection == null) {
+			throw new RuntimeException("ERROR: Couldn't create Schema, connection is null.");
+    	}
     	try {
-    		if(connection != null) {
-		    	Statement stmt = connection.createStatement();
-		        stmt.executeUpdate("CREATE TABLE IF NOT EXISTS Thing (ThingId INTEGER PRIMARY KEY, Name, ImgUrl, ThumbUrl, Comment, NumPlays);");
-		        stmt.executeUpdate("CREATE TABLE IF NOT EXISTS ThingList (ListId INTEGER PRIMARY KEY, Name);");
-		        stmt.executeUpdate("CREATE UNIQUE INDEX IF NOT EXISTS  idx1 ON ThingList(Name)");
-		        stmt.executeUpdate("CREATE TABLE IF NOT EXISTS ThingListToThing (ListId, ThingId, FOREIGN KEY (ListId) REFERENCES ThingList(ListId), FOREIGN KEY (ThingId) REFERENCES Thing(ThingId));");
-		        stmt.executeUpdate("CREATE UNIQUE INDEX IF NOT EXISTS idx2 ON ThingListToThing(ListId, ThingId)");
-    		} else {
-    			System.err.println("ERROR: Couldn't create Schema, connection is null.");
-    		}
+	    	Statement stmt = connection.createStatement();
+	        stmt.executeUpdate("CREATE TABLE IF NOT EXISTS Thing (ThingId INTEGER PRIMARY KEY, Name, ImgUrl, ThumbUrl, Comment, NumPlays);");
+	        stmt.executeUpdate("CREATE TABLE IF NOT EXISTS ThingList (ListId INTEGER PRIMARY KEY, Name);");
+	        stmt.executeUpdate("CREATE UNIQUE INDEX IF NOT EXISTS  idx1 ON ThingList(Name)");
+	        stmt.executeUpdate("CREATE TABLE IF NOT EXISTS ThingListToThing (ListId INTEGER, ThingId INTEGER, FOREIGN KEY (ListId) REFERENCES ThingList(ListId), FOREIGN KEY (ThingId) REFERENCES Thing(ThingId));");
+	        stmt.executeUpdate("CREATE UNIQUE INDEX IF NOT EXISTS idx2 ON ThingListToThing(ListId, ThingId)");
+	        stmt.close();
     	} catch (SQLException e) {
 	        System.err.println("Couldn't create Schema");
 	        e.printStackTrace();
     	}
     }
 
-	public void openThingList(String name) {
+	public void createThingListIfNotExists(String name) {
 		if(connection == null) {
-			System.err.println("ERROR: Couldn't create Schema, connection is null.");
-			return;			
+			throw new RuntimeException("ERROR: Couldn't create Schema, connection is null.");
 		}
 
 		try {
 			Statement stmt = connection.createStatement();
 			// insert new thing list if one with that name does not exist already
-			stmt.executeQuery("INSERT INTO ThingList (name) VALUES ('" + name + "');");
+			System.err.println("Opening thing list '" + name + "'.");
+			stmt.execute("INSERT OR IGNORE INTO ThingList (name) VALUES ('" + name + "');");
+			stmt.close();
 		} catch (SQLException e) {
 	        System.err.println("Couldn't add to thing list with handle " + name);
 	        e.printStackTrace();
     	}
 	}
 	
-	public void addToThingList(String name, List<Thing> things) {
+	public void deleteThingList(String name) {
 		if(connection == null) {
-			System.err.println("ERROR: Couldn't create Schema, connection is null.");
-			return;			
+			throw new RuntimeException("ERROR: Couldn't create Schema, connection is null.");
 		}
-
+		
 		try {
 			
-			Statement stmt = connection.createStatement();
-			ResultSet res = stmt.executeQuery("SELECT ListId from ThingList where name = '" + name + "'");
-			int listId = res.getInt(0);
+			if(!hasThingList(name)) { 
+				System.err.println("INFO: deleteThingList: Thing list '" + name + "' does not exist.");
+				return;
+			}
 			
+			int listId = getThingListId(name);
+			Statement stmt = connection.createStatement();
+			// insert new thing list if one with that name does not exist already
+			System.err.println("INFO: deleteThingList: Deleting thing list '" + name + "'.");
+			stmt.execute("DELETE FROM ThingListToThing where ListId = " + Integer.toString(listId) + ";");
+			stmt.execute("DELETE FROM ThingList where name = '" + name + "');");
+			stmt.close();
+		} catch (SQLException e) {
+	        System.err.println("deleteThingList: Couldn't delete thing list with handle " + name);
+	        e.printStackTrace();
+    	}
+	}
+	
+	public boolean hasThingList(String name) {
+		if(getThingListId(name) != -1) {
+			return true;
+		}
+		return false;
+	}
+	
+	public int getThingListId(String name) {
+		if(connection == null) {
+			throw new RuntimeException("ERROR: Couldn't create Schema, connection is null.");
+		}
+
+		int listId = -1;
+		
+		try {	
+			Statement stmt = connection.createStatement();
+			String str = "SELECT ListId from ThingList where name = '" + name + "'";
+			System.out.println("TRACE: executeQuery: " + str);
+			ResultSet res = stmt.executeQuery(str);
+			if(res.getFetchSize() == 1) {
+				listId = res.getInt(1);
+				System.out.println("DEBUG: ListId = " + listId);
+				return listId;		
+			}
+		} catch (SQLException e) {
+	        System.err.println("Couldn't add to thing list with handle " + name);
+	        e.printStackTrace();
+		}
+		
+		return listId;
+	}
+	
+	public void addToThingList(String name, List<Thing> things) {
+		if(connection == null) {
+			throw new RuntimeException("ERROR: Couldn't create Schema, connection is null.");	
+		}
+
+		try {
+			int listId = getThingListId(name);
+
 			PreparedStatement thingStatement = connection
 	                .prepareStatement("INSERT INTO Thing VALUES (?, ?, ?, ?, ?, ?) ON CONFLICT REPLACE;");
 			PreparedStatement listToThingStatement = connection

xyz.veronie.bgg.ui/src/xyz/veronie/bgg/result/Thing.java

@@ -83,7 +83,7 @@ public class Thing {
 					saver.data = new ImageData[] { thumbImage.getImageData() };
 					saver.save(imageFile.toString(), SWT.IMAGE_PNG);					
 				} catch (MalformedURLException e) {
-					e.printStackTrace();
+					System.out.println("INFO: Malformed URL for ThingId " + thingId);
 				}
 			}
 

xyz.veronie.bgg.ui/src/xyz/veronie/bgg/result/ThingProvider.java

@@ -87,8 +87,8 @@ public class ThingProvider {
 	}
 	
 	/// store current list in DB
-	public void storeList() {
-		localDbAdapterService.storeThingList(this.things, "TestList");
+	public void storeList(String listName) {
+		localDbAdapterService.storeThingList(this.things, listName);
 	}
 	
 	

xyz.veronie.bgg.ui/src/xyz/veronie/bgg/types/ResultAction.java

@@ -5,7 +5,7 @@ public enum ResultAction {
 	REP("replace"),
 	SUB("subtract from"),
 	AND("intersect with"),
-	ONLY_NEW("keep not in");
+	ONLY_NEW("keep if not in");
 	
 	private String name;
 

xyz.veronie.bgg.ui/src/xyz/veronie/bgg/ui/dialogs/SaveGameListDialog.java

@@ -0,0 +1,73 @@
+package xyz.veronie.bgg.ui.dialogs;
+
+import static org.eclipse.jface.widgets.WidgetFactory.text;
+
+import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.FocusEvent;
+import org.eclipse.swt.events.FocusListener;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.swt.widgets.Text;
+
+public class SaveGameListDialog extends Dialog {
+
+	private String entryString;
+
+	public SaveGameListDialog(Shell parentShell) {
+        super(parentShell);
+    }
+
+    @Override
+    protected Control createDialogArea(Composite parent) {
+        Composite container = (Composite) super.createDialogArea(parent);
+        
+        GridLayout layout = new GridLayout(1, false);
+        layout.marginLeft = 16;
+        layout.marginTop = 16;
+        layout.marginRight = 16;
+        layout.marginBottom = 16;
+        container.setLayout(layout);
+
+        Text text = text(SWT.BORDER).message("Enter game list name")
+        		.limitTo(255)
+        		.layoutData(new GridData(SWT.CENTER, SWT.CENTER, true, false))
+        		.create(container);
+
+
+        FocusListener focusListener = new FocusListener() {
+            public void focusGained(FocusEvent e) {
+            }
+
+            public void focusLost(FocusEvent e) {
+              Text t = (Text) e.widget;
+              entryString = t.getText();
+            }
+          };
+          text.addFocusListener(focusListener);
+          
+        return container;
+    }
+
+    // overriding this methods allows you to set the
+    // title of the custom dialog
+    @Override
+    protected void configureShell(Shell newShell) {
+        super.configureShell(newShell);
+        newShell.setText("Enter game list name");
+    }
+
+    @Override
+    protected Point getInitialSize() {
+        return new Point(450, 300);
+    }
+    
+    public String getEntryText() {
+    	return entryString;
+    }
+    
+}

xyz.veronie.bgg.ui/src/xyz/veronie/bgg/ui/handlers/HandleSaveGamelist.java

@@ -5,8 +5,13 @@ import javax.inject.Inject;
 
 import org.eclipse.e4.core.di.annotations.CanExecute;
 import org.eclipse.e4.core.di.annotations.Execute;
+import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.widgets.MessageBox;
+import org.eclipse.swt.widgets.Shell;
 
 import xyz.veronie.bgg.result.ThingProvider;
+import xyz.veronie.bgg.ui.dialogs.SaveGameListDialog;
 
 public class HandleSaveGamelist {
 
@@ -14,14 +19,29 @@ public class HandleSaveGamelist {
 	ThingProvider thingProvider;
 	
 	@Execute
-	public void execute() {
-		thingProvider.storeList();
+	public void execute(Shell shell) {
+		
+		SaveGameListDialog saveDialog = new SaveGameListDialog(shell);
+		saveDialog.open();
+
+		int returnCode = saveDialog.getReturnCode();
+		if(returnCode == Dialog.OK) {
+			String listName = saveDialog.getEntryText();
+
+			if(listName == null || listName == "") {
+				MessageBox msgBox = new MessageBox(shell, SWT.ICON_WARNING | SWT.OK);
+				msgBox.open();
+			}		
+			
+			thingProvider.storeList(listName);
+		}
+		// ignore cancel
 	}
 	
 	
 	@CanExecute
 	public boolean canExecute() {
-		return true;
+		return thingProvider != null;
 	}
 		
 }