fix: VIC-20 game list entires not deleted. Better error handling in workers
This commit is contained in:
parent
aa286c1eac
commit
32a9edea31
|
@ -831,7 +831,7 @@ public class DbConnector
|
|||
|
||||
public void deleteAllGames()
|
||||
{
|
||||
String sql = "DELETE FROM gameinfo WHERE title NOT LIKE '%THEC64%'";
|
||||
String sql = "DELETE FROM gameinfo WHERE title NOT LIKE '%THEC64%' AND title NOT LIKE '%VIC-20%'";
|
||||
logger.debug("Generated DELETE String:\n{}", sql);
|
||||
try (Connection conn = this.connect(); PreparedStatement pstmt = conn.prepareStatement(sql))
|
||||
{
|
||||
|
@ -846,7 +846,7 @@ public class DbConnector
|
|||
|
||||
public void deleteAllGamesInView(GameView view)
|
||||
{
|
||||
String sql = "DELETE FROM gameinfo " + view.getSqlQuery() + " AND title NOT LIKE '%THEC64%'";
|
||||
String sql = "DELETE FROM gameinfo " + view.getSqlQuery() + " AND title NOT LIKE '%THEC64%' AND title NOT LIKE '%VIC-20%'";
|
||||
logger.debug("Generated DELETE String:\n{}", sql);
|
||||
try (Connection conn = this.connect(); PreparedStatement pstmt = conn.prepareStatement(sql))
|
||||
{
|
||||
|
|
|
@ -545,7 +545,7 @@ public class ScreenshotsPanel extends JPanel
|
|||
{
|
||||
gameTextField = new JTextField();
|
||||
gameTextField.setEditable(false);
|
||||
gameTextField.setPreferredSize(new Dimension(145, 20));
|
||||
gameTextField.setPreferredSize(new Dimension(130, 20));
|
||||
new FileDrop(gameTextField, new FileDrop.Listener()
|
||||
{
|
||||
public void filesDropped(java.io.File[] files)
|
||||
|
|
|
@ -5,6 +5,7 @@ import java.util.concurrent.ExecutionException;
|
|||
|
||||
import javax.swing.SwingWorker;
|
||||
|
||||
import se.lantz.util.ExceptionHandler;
|
||||
import se.lantz.util.FileManager;
|
||||
|
||||
public class ConvertWorker extends SwingWorker<Integer, String>
|
||||
|
|
|
@ -5,6 +5,7 @@ import java.util.List;
|
|||
import javax.swing.SwingWorker;
|
||||
|
||||
import se.lantz.manager.BackupManager;
|
||||
import se.lantz.util.ExceptionHandler;
|
||||
|
||||
public class BackupWorker extends SwingWorker<Void, String>
|
||||
{
|
||||
|
@ -52,6 +53,14 @@ public class BackupWorker extends SwingWorker<Void, String>
|
|||
@Override
|
||||
protected void done()
|
||||
{
|
||||
try
|
||||
{
|
||||
get();
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
ExceptionHandler.handleException(e, "Error during db backup");
|
||||
}
|
||||
dialog.finish();
|
||||
}
|
||||
}
|
||||
|
|
|
@ -5,6 +5,7 @@ import java.util.List;
|
|||
import javax.swing.SwingWorker;
|
||||
|
||||
import se.lantz.manager.RestoreManager;
|
||||
import se.lantz.util.ExceptionHandler;
|
||||
|
||||
public class RestoreWorker extends SwingWorker<Void, String>
|
||||
{
|
||||
|
@ -52,6 +53,14 @@ public class RestoreWorker extends SwingWorker<Void, String>
|
|||
@Override
|
||||
protected void done()
|
||||
{
|
||||
try
|
||||
{
|
||||
get();
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
ExceptionHandler.handleException(e, "Error during db restore");
|
||||
}
|
||||
dialog.finish();
|
||||
}
|
||||
}
|
||||
|
|
|
@ -5,6 +5,7 @@ import java.util.List;
|
|||
import javax.swing.SwingWorker;
|
||||
|
||||
import se.lantz.manager.ExportManager;
|
||||
import se.lantz.util.ExceptionHandler;
|
||||
|
||||
public class ExportWorker extends SwingWorker<Void, String>
|
||||
{
|
||||
|
@ -54,6 +55,14 @@ public class ExportWorker extends SwingWorker<Void, String>
|
|||
@Override
|
||||
protected void done()
|
||||
{
|
||||
try
|
||||
{
|
||||
get();
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
ExceptionHandler.handleException(e, "Error during export");
|
||||
}
|
||||
dialog.finish();
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,10 +1,12 @@
|
|||
package se.lantz.gui.imports;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.concurrent.ExecutionException;
|
||||
|
||||
import javax.swing.SwingWorker;
|
||||
|
||||
import se.lantz.manager.ImportManager;
|
||||
import se.lantz.util.ExceptionHandler;
|
||||
|
||||
public class ImportWorker extends SwingWorker<Void, String>
|
||||
{
|
||||
|
@ -47,6 +49,14 @@ public class ImportWorker extends SwingWorker<Void, String>
|
|||
@Override
|
||||
protected void done()
|
||||
{
|
||||
try
|
||||
{
|
||||
get();
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
ExceptionHandler.handleException(e, "Error during import");
|
||||
}
|
||||
dialog.finish();
|
||||
}
|
||||
}
|
||||
|
|
|
@ -6,6 +6,7 @@ import javax.swing.SwingWorker;
|
|||
|
||||
import se.lantz.manager.ScraperManager;
|
||||
import se.lantz.model.data.ScraperFields;
|
||||
import se.lantz.util.ExceptionHandler;
|
||||
|
||||
public class ScraperWorker extends SwingWorker<Void, String>
|
||||
{
|
||||
|
@ -43,6 +44,14 @@ public class ScraperWorker extends SwingWorker<Void, String>
|
|||
@Override
|
||||
protected void done()
|
||||
{
|
||||
try
|
||||
{
|
||||
get();
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
ExceptionHandler.handleException(e, "Error during scraping");
|
||||
}
|
||||
dialog.finish();
|
||||
}
|
||||
}
|
||||
|
|
|
@ -112,6 +112,14 @@ public class TranslationWorker extends SwingWorker<Void, String>
|
|||
@Override
|
||||
protected void done()
|
||||
{
|
||||
try
|
||||
{
|
||||
get();
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
ExceptionHandler.handleException(e, "Error during translation");
|
||||
}
|
||||
dialog.finish();
|
||||
}
|
||||
}
|
||||
|
|
|
@ -172,25 +172,25 @@ public class ImportManager
|
|||
{
|
||||
genre = line.substring(2);
|
||||
}
|
||||
else if (line.startsWith("D:en"))
|
||||
else if (line.startsWith("D:en:"))
|
||||
{
|
||||
description = line.replace("\"", "\"\"").substring(5);
|
||||
}
|
||||
else if (line.startsWith("D:de"))
|
||||
else if (line.startsWith("D:de:"))
|
||||
{
|
||||
description_de = line.replace("\"", "\"\"").substring(5);
|
||||
}
|
||||
else if (line.startsWith("D:fr"))
|
||||
else if (line.startsWith("D:fr:"))
|
||||
{
|
||||
description_fr = line.replace("\"", "\"\"").substring(5);
|
||||
}
|
||||
else if (line.startsWith("D:es"))
|
||||
else if (line.startsWith("D:es:"))
|
||||
{
|
||||
description_es = line.replace("\"", "\"\"").substring(5);
|
||||
}
|
||||
else if (line.startsWith("D:it"))
|
||||
{
|
||||
description_it = line.replace("\"", "\"\"").substring(5);
|
||||
else if (line.startsWith("D:it:"))
|
||||
{
|
||||
description_it = line.replace("\"", "\"\"").substring(5);
|
||||
}
|
||||
else if (line.startsWith("F:"))
|
||||
{
|
||||
|
|
|
@ -675,7 +675,7 @@ public class FileManager
|
|||
{
|
||||
for (File file : dir.listFiles())
|
||||
{
|
||||
if (!file.isDirectory() && (deleteAll || !file.getName().contains("THEC64")))
|
||||
if (!file.isDirectory() && (deleteAll || !(file.getName().contains("THEC64") || file.getName().contains("VIC20"))))
|
||||
{
|
||||
file.delete();
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue