Skip to content
Snippets Groups Projects
Commit 7b8c8e29 authored by Ondřej Trojan's avatar Ondřej Trojan
Browse files

bugfix

parent 29c3c36a
No related branches found
No related tags found
Loading
...@@ -152,7 +152,7 @@ public class WebController implements WebMvcConfigurer { ...@@ -152,7 +152,7 @@ public class WebController implements WebMvcConfigurer {
@GetMapping("/track") @GetMapping("/track")
public String PlayedTrack(Principal principal, Model model) { public String PlayedTrack(Principal principal, Model model) {
ResponseData<PlayedTrackDto> playedTrack = clientService.getPlayedTrack(); ResponseData<PlayedTrackDto> playedTrack = clientService.getPlayedTrack();
model.addAttribute("track", playedTrack == null ? null : playedTrack.getData()); model.addAttribute("track", playedTrack.getData());
return "fragments/client :: playedTrack"; return "fragments/client :: playedTrack";
} }
......
...@@ -97,7 +97,7 @@ public class ClientService { ...@@ -97,7 +97,7 @@ public class ClientService {
List<String> tracks = playlistService.parseTitlesPlaylist(controlService.getPlaylist(connectedClient)); List<String> tracks = playlistService.parseTitlesPlaylist(controlService.getPlaylist(connectedClient));
for (String parsedName : tracks) { for (String parsedName : tracks) {
ResponseData<DisplayTrackDto> displayTrackFromParsed = displayTrackService.getDisplayTrackById(parsedName.split("-")[1]); ResponseData<DisplayTrackDto> displayTrackFromParsed = displayTrackService.getDisplayTrackById(parsedName.split("-")[1]);
if(displayTrackFromParsed.getData() == null) { if (displayTrackFromParsed.getData() == null) {
displayTracks.add("unknown displayTrack"); displayTracks.add("unknown displayTrack");
continue; continue;
} }
...@@ -115,6 +115,15 @@ public class ClientService { ...@@ -115,6 +115,15 @@ public class ClientService {
public ResponseData<PlayedTrackDto> getPlayedTrack() { public ResponseData<PlayedTrackDto> getPlayedTrack() {
//get currentTrack //get currentTrack
boolean connected = false;
for (int i = 0; i < config.getClientCount(); i++) {
if (controlService.isConnected(i)) {
connected = true;
break;
}
}
if (!connected) return new ResponseData<>(null);
if (currentTrack.equals("")) return new ResponseData<>(new PlayedTrackDto("unknown", if (currentTrack.equals("")) return new ResponseData<>(new PlayedTrackDto("unknown",
"unknown", "unknown", 0, "unknown", "unknown", 0,
0, List.of())); 0, List.of()));
......
...@@ -12,4 +12,4 @@ function updatePlayedTrack() { ...@@ -12,4 +12,4 @@ function updatePlayedTrack() {
}) })
} }
window.setInterval(updatePlayedTrack, 500); window.setInterval(updatePlayedTrack, 800);
\ No newline at end of file \ No newline at end of file
...@@ -90,7 +90,7 @@ ...@@ -90,7 +90,7 @@
<div id="durationFormField" class="form-group"> <div id="durationFormField" class="form-group">
<label for="inputDescription" class="col-sm-2 col-form-label">Duration</label> <label for="inputDescription" class="col-sm-2 col-form-label">Duration</label>
<div class="col-sm-10"> <div class="col-sm-10">
<input type="number" value="60" th:field="*{duration}" class="form-control" th:placeholder="60 s" <input disabled type="number" value="10" th:field="*{duration}" class="form-control" th:placeholder="10"
th:classappend="${#fields.hasErrors('duration')} ? is-invalid : ''" id="inputDuration"> th:classappend="${#fields.hasErrors('duration')} ? is-invalid : ''" id="inputDuration">
<div th:if="${#fields.hasErrors('duration')}" class="invalid-feedback" <div th:if="${#fields.hasErrors('duration')}" class="invalid-feedback"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment