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

Fix potential NPE in Player

This commit is contained in:
0xb00bface 2021-09-10 21:59:43 +02:00
parent b959c57b8f
commit bb95575897
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
client/src/main/java/ctbrec/ui/Player.java
View File

@ -135,12 +135,15 @@ public class Player {
String url = null; String url = null;
if (rec != null) { if (rec != null) {
url = getRemoteRecordingUrl(rec, cfg); url = getRemoteRecordingUrl(rec, cfg);
model = rec.getModel();
} else if (model != null) { } else if (model != null) {
url = getPlaylistUrl(model); url = getPlaylistUrl(model);
} }
LOG.debug("Playing {}", url); LOG.debug("Playing {}", url);
String[] cmdline = createCmdline(url); String[] cmdline = createCmdline(url);
if (model != null) {
expandPlaceHolders(cmdline); expandPlaceHolders(cmdline);
}
LOG.debug("Player command line: {}", Arrays.toString(cmdline)); LOG.debug("Player command line: {}", Arrays.toString(cmdline));
playerProcess = rt.exec(cmdline); playerProcess = rt.exec(cmdline);
} }

4
common/src/main/java/ctbrec/variableexpansion/ModelVariableExpander.java
View File

@ -21,7 +21,7 @@ public class ModelVariableExpander extends AbstractVariableExpander {
placeholderValueSuppliers.put("modelDisplayName", r -> ofNullable(model.getDisplayName())); placeholderValueSuppliers.put("modelDisplayName", r -> ofNullable(model.getDisplayName()));
placeholderValueSuppliers.put("modelSanitizedName", r -> getSanitizedName(model)); placeholderValueSuppliers.put("modelSanitizedName", r -> getSanitizedName(model));
placeholderValueSuppliers.put("modelNotes", r -> getSanitizedModelNotes(config, model)); placeholderValueSuppliers.put("modelNotes", r -> getSanitizedModelNotes(config, model));
placeholderValueSuppliers.put("siteName", r -> ofNullable(model.getSite()).map(Site::getName)); placeholderValueSuppliers.put("siteName", r -> ofNullable(model).map(Model::getSite).map(Site::getName));
placeholderValueSuppliers.put("siteSanitizedName", r -> getSanitizedSiteName(model)); placeholderValueSuppliers.put("siteSanitizedName", r -> getSanitizedSiteName(model));
placeholderValueSuppliers.put("modelGroupName", r -> modelGroup.map(ModelGroup::getName)); placeholderValueSuppliers.put("modelGroupName", r -> modelGroup.map(ModelGroup::getName));
placeholderValueSuppliers.put("modelGroupId", r -> modelGroup.map(ModelGroup::getId).map(UUID::toString)); placeholderValueSuppliers.put("modelGroupId", r -> modelGroup.map(ModelGroup::getId).map(UUID::toString));
@ -41,7 +41,7 @@ public class ModelVariableExpander extends AbstractVariableExpander {
} }
private Optional<String> getSanitizedSiteName(Model model) { private Optional<String> getSanitizedSiteName(Model model) {
Optional<String> name = ofNullable(model.getSite()).map(Site::getName); Optional<String> name = ofNullable(model).map(Model::getSite).map(Site::getName);
if (name.isPresent()) { if (name.isPresent()) {
return Optional.of(sanitize(name.get())); return Optional.of(sanitize(name.get()));
} else { } else {