j62
/
ctbrec
2
2
Fork 2
Code Issues 4 Pull Requests Packages Projects Releases 3 Wiki Activity

Fix model groups not exported from server but from local config

This commit is contained in:
0xb00bface 2021-12-24 14:58:24 +01:00
parent 90124a7c64
commit a6e3fcc6e3
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
client/src/main/java/ctbrec/ui/tabs/recorded/AbstractRecordedModelsTab.java
View File

@ -4,10 +4,7 @@ import com.google.common.cache.CacheBuilder;
import com.google.common.cache.CacheLoader; import com.google.common.cache.CacheLoader;
import com.google.common.cache.LoadingCache; import com.google.common.cache.LoadingCache;
import com.google.common.eventbus.Subscribe; import com.google.common.eventbus.Subscribe;
import ctbrec.Config; import ctbrec.*;
import ctbrec.GlobalThreadPool;
import ctbrec.Model;
import ctbrec.StringUtil;
import ctbrec.event.EventBusHolder; import ctbrec.event.EventBusHolder;
import ctbrec.recorder.Recorder; import ctbrec.recorder.Recorder;
import ctbrec.sites.Site; import ctbrec.sites.Site;
@ -228,7 +225,8 @@ public abstract class AbstractRecordedModelsTab extends Tab implements TabSelect
ExportOptions exportOptions = new ModelExportDialog(getTabPane()).showAndWait(); ExportOptions exportOptions = new ModelExportDialog(getTabPane()).showAndWait();
if (exportOptions != null) { if (exportOptions != null) {
try { try {
ModelImportExport.exportTo(getExportList(), config, exportOptions); var groups = recorder.getModelGroups();
ModelImportExport.exportTo(getExportList(), groups, config, exportOptions);
} catch (IOException e) { } catch (IOException e) {
String msg = "An error occurred while exporting the model list"; String msg = "An error occurred while exporting the model list";
Dialogs.showError(getTabPane().getScene(), "Export models", msg, e); Dialogs.showError(getTabPane().getScene(), "Export models", msg, e);

4
client/src/main/java/ctbrec/ui/tabs/recorded/ModelImportExport.java
View File

@ -40,7 +40,7 @@ public class ModelImportExport {
private ModelImportExport() { private ModelImportExport() {
} }
public static void exportTo(List<Model> models, Config config, ExportOptions exportOptions) throws IOException { public static void exportTo(List<Model> models, Set<ModelGroup> groups, Config config, ExportOptions exportOptions) throws IOException {
Moshi moshi = new Moshi.Builder() Moshi moshi = new Moshi.Builder()
.add(Model.class, new ModelJsonAdapter()) .add(Model.class, new ModelJsonAdapter())
.add(File.class, new FileJsonAdapter()) .add(File.class, new FileJsonAdapter())
@ -62,7 +62,7 @@ public class ModelImportExport {
} }
if (exportOptions.includes().contains(ExportIncludes.GROUPS)) { if (exportOptions.includes().contains(ExportIncludes.GROUPS)) {
writer.name("groups"); writer.name("groups");
modelGroupAdapter.toJson(writer, config.getSettings().modelGroups); modelGroupAdapter.toJson(writer, groups);
} }
if (exportOptions.includes().contains(ExportIncludes.PORTRAITS)) { if (exportOptions.includes().contains(ExportIncludes.PORTRAITS)) {
var portraits = config.getSettings().modelPortraits; var portraits = config.getSettings().modelPortraits;