fix: import from gamebase
- The created gamelist views are stripped of invalid chars (e.g. ') which caused an error in the db when reading the view. - Empty genres are not created as gamelist views during import.
This commit is contained in:
parent
670b22f5e2
commit
41aac24112
|
@ -41,8 +41,8 @@ public class GamebaseImportWorker extends AbstractImportWorker
|
||||||
counter++;
|
counter++;
|
||||||
this.gbInporter.setGenreOption(genre);
|
this.gbInporter.setGenreOption(genre);
|
||||||
publish("Processing games for " + genre.getGenreName());
|
publish("Processing games for " + genre.getGenreName());
|
||||||
importManager.setViewTag(genre.getGenreName());
|
|
||||||
String viewName = getViewName(genre);
|
String viewName = getViewName(genre);
|
||||||
|
importManager.setViewTag(viewName);
|
||||||
importManager.setViewName(viewName);
|
importManager.setViewName(viewName);
|
||||||
String additonalInfo = ", genre: " + genre.getGenreName() + " (" + counter + " of " + numberOfGenres + ")";
|
String additonalInfo = ", genre: " + genre.getGenreName() + " (" + counter + " of " + numberOfGenres + ")";
|
||||||
int processedForGenre = executeImport(additonalInfo);
|
int processedForGenre = executeImport(additonalInfo);
|
||||||
|
@ -94,6 +94,7 @@ public class GamebaseImportWorker extends AbstractImportWorker
|
||||||
newName = newName.replaceAll(" - ", "/");
|
newName = newName.replaceAll(" - ", "/");
|
||||||
newName = newName.replace("[", "");
|
newName = newName.replace("[", "");
|
||||||
newName = newName.replace("]", "");
|
newName = newName.replace("]", "");
|
||||||
|
newName = newName.replace("'", "");
|
||||||
if (newName.startsWith("/"))
|
if (newName.startsWith("/"))
|
||||||
{
|
{
|
||||||
newName = newName.substring(1);
|
newName = newName.substring(1);
|
||||||
|
@ -160,8 +161,11 @@ public class GamebaseImportWorker extends AbstractImportWorker
|
||||||
publish(importManager.insertRowsIntoDb(copyList, 0).toString());
|
publish(importManager.insertRowsIntoDb(copyList, 0).toString());
|
||||||
importManager.copyFiles(true, copyList, this);
|
importManager.copyFiles(true, copyList, this);
|
||||||
}
|
}
|
||||||
//Create game view if view tag is defined
|
//Create game view if view tag is defined and processed games are not empty
|
||||||
|
if (!dbRowReadChunks.isEmpty())
|
||||||
|
{
|
||||||
importManager.createGameViewForViewTag(this);
|
importManager.createGameViewForViewTag(this);
|
||||||
|
}
|
||||||
return importManager.clearAfterImport();
|
return importManager.clearAfterImport();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue