bugfix

src/main/java/com/museum/projection/controller/WebController.java

@@ -152,7 +152,7 @@ public class WebController implements WebMvcConfigurer {
     @GetMapping("/track")
     public String PlayedTrack(Principal principal, Model model) {
         ResponseData<PlayedTrackDto> playedTrack = clientService.getPlayedTrack();
-        model.addAttribute("track", playedTrack == null ? null : playedTrack.getData());
+        model.addAttribute("track", playedTrack.getData());
         return "fragments/client :: playedTrack";
     }
 

src/main/java/com/museum/projection/service/ClientService.java

@@ -97,7 +97,7 @@ public class ClientService {
             List<String> tracks = playlistService.parseTitlesPlaylist(controlService.getPlaylist(connectedClient));
             for (String parsedName : tracks) {
                 ResponseData<DisplayTrackDto> displayTrackFromParsed = displayTrackService.getDisplayTrackById(parsedName.split("-")[1]);
-                if(displayTrackFromParsed.getData() == null) {
+                if (displayTrackFromParsed.getData() == null) {
                     displayTracks.add("unknown displayTrack");
                     continue;
                 }
@@ -115,6 +115,15 @@ public class ClientService {
 
     public ResponseData<PlayedTrackDto> getPlayedTrack() {
         //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",
                 "unknown", "unknown", 0,
                 0, List.of()));

src/main/resources/static/js/main.js

@@ -12,4 +12,4 @@ function updatePlayedTrack() {
     })
 }
 
-window.setInterval(updatePlayedTrack, 500);
\ No newline at end of file
+window.setInterval(updatePlayedTrack, 800);
\ No newline at end of file

src/main/resources/templates/videoedit/videofile.html

@@ -90,7 +90,7 @@
             <div id="durationFormField" class="form-group">
                 <label for="inputDescription" class="col-sm-2 col-form-label">Duration</label>
                 <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">
 
                     <div th:if="${#fields.hasErrors('duration')}" class="invalid-feedback"