implemented OSD (via svdrposd plugin) and remote control

Author: Zabrimus

.gitignore

@@ -9,3 +9,4 @@ xtend-gen
 .settings
 build
 /external-jar/
+/svdrposd-src/

TODO

@@ -1,24 +1,22 @@
 TODOs in no specific order:
 
 - epg overview: implement alarm
-- OSD view is not implemented
-- channel configuration view: is it possible to update the channel list in live/running vdr?
-- automatically change epg-data (that search timers are able to filter) -> But how to prevent epgd to change the epg entry?
 - epgsearch view: save and use templates
 - more rights / better password configuration (use e.g. a hashed value)
 - monitor open VDR connections (i'm not sure if everything is working as desired)
 - wake on lan
 - epg view: favourite channel list
 - channel config view: save and load configuration
 
-
 TODOs which are not yet reasoned:
 
 - implement SVDRP-only VDR plugin to get more information / do something useful
     e.g. - get list of deleted recordings / undelete recordings
 - implement svdrp server to show jonglisto OSD entries:
     e.g. - favourite channel list
          - epg suggestions (together with an epg search mechanism)
+- automatically change epg-data (that search timers are able to filter) -> But how to prevent epgd to change the epg entry?
+- channel configuration view: is it possible to update the channel list in live/running vdr?
 
 finished TODOs:
 
@@ -29,3 +27,4 @@ finished TODOs:
 - recording view: show free/used harddisk size
 - channel logos
 - play video in recording view
+- OSD view is not implemented

common/src/main/java/vdr/jonglisto/model/VDROsd.xtend

@@ -0,0 +1,31 @@
+package vdr.jonglisto.model
+
+import java.util.ArrayList
+import java.util.List
+import org.eclipse.xtend.lib.annotations.Accessors
+import org.eclipse.xtend.lib.annotations.EqualsHashCode
+import org.eclipse.xtend.lib.annotations.ToString
+
+@Accessors
+@EqualsHashCode
+@ToString
+class VDROsd {
+    var String title
+    var List<VDROsdMenuItem> menuItems = new ArrayList<VDROsdMenuItem>
+    var String textBlock
+    var String red
+    var String green
+    var String yellow
+    var String blue
+    var String statusMessage
+
+    var List<Integer> layout = new ArrayList<Integer>
+
+    def addMenuItem(String type, String menuItem) {
+        menuItems.add(new VDROsdMenuItem(type, menuItem))
+    }
+
+    def addLayout(Integer c) {
+        layout.add(c)
+    }
+}

common/src/main/java/vdr/jonglisto/model/VDROsdMenuItem.xtend

@@ -0,0 +1,20 @@
+package vdr.jonglisto.model
+
+import java.util.ArrayList
+import java.util.List
+import org.eclipse.xtend.lib.annotations.Accessors
+import org.eclipse.xtend.lib.annotations.EqualsHashCode
+import org.eclipse.xtend.lib.annotations.ToString
+
+@Accessors
+@EqualsHashCode
+@ToString
+class VDROsdMenuItem {
+    var boolean isSelected = false
+    var List<String> items
+
+    new(String type, String line) {
+        isSelected = type == 'S'
+        items = line.split("\t").toList
+    }
+}

samples/remote.xml

@@ -173,4 +173,16 @@
         <icon>VOLUME_UP</icon>
     </button>
 
+    <!-- Row 21 -->
+    <button row="21" column="1">
+        <key>Channel-</key>
+        <label>Chan-</label>
+    </button>
+
+    <button row="21" column="3">
+        <key>Channel+</key>
+        <label>Chan+</label>
+    </button>
+
+
 </remote>

src/main/webapp/VAADIN/themes/jonglisto/jonglisto.scss

@@ -54,4 +54,46 @@ $v-focus-style: none;
     .v-button-red {
         @include valo-button-style($background-color: #FF0000, $unit-size: null);
     }
+
+    .v-label-yellow {
+        background-color: #FFFF00;
+        color: #000000;
+        min-width: 80px;
+        padding: 10px;
+        font-weight: bold;
+    }
+
+    .v-label-green {
+        background-color: #008000;
+        color: #000000;
+        min-width: 80px;
+        padding: 10px;
+        font-weight: bold;
+    }
+
+    .v-label-blue {
+        background-color: #0000FF;
+        color: #000000;
+        min-width: 80px;
+        padding: 10px;
+        font-weight: bold;
+    }
+
+    .v-label-red {
+        background-color: #FF0000;
+        color: #000000;
+        min-width: 80px;
+        padding: 10px;
+        font-weight: bold;
+    }
+
+    .v-label-osditem {
+        padding-right: 20px;
+    }
+
+    .v-label-selectedosditem {
+        padding-right: 20px;
+        background-color: #C35817;
+        color: #FFFFFF;
+    }
 }

svdrp/src/main/java/vdr/jonglisto/svdrp/client/Parser.xtend

@@ -20,6 +20,7 @@ import vdr.jonglisto.model.EpgsearchSearchTimer
 import vdr.jonglisto.model.Recording
 import vdr.jonglisto.model.Timer
 import vdr.jonglisto.model.VDRDiskStat
+import vdr.jonglisto.model.VDROsd
 import vdr.jonglisto.model.VdrPlugin
 import vdr.jonglisto.util.DateTimeUtil
 import vdr.jonglisto.util.Utils
@@ -283,7 +284,7 @@ class Parser {
         return result
     }
 
-    def static parsePlugin(String line) {
+    static def parsePlugin(String line) {
         val matcher = pluginPattern.matcher(line)
         if (matcher.matches) {
             return new VdrPlugin(matcher.group(1), matcher.group(2), matcher.group(3))
@@ -292,7 +293,7 @@ class Parser {
         return null
     }
 
-    def static parseStat(String line) {
+    static def parseStat(String line) {
         val matcher = statPattern.matcher(line)
         if (matcher.matches) {
             return new VDRDiskStat(Long.parseLong(matcher.group(1)), Long.parseLong(matcher.group(2)))
@@ -301,7 +302,7 @@ class Parser {
         return new VDRDiskStat(0,0)
     }
 
-    def static parseEpgsearchList(String line) {
+    static def parseEpgsearchList(String line) {
         val result = new EpgsearchSearchTimer
         val splitted = line.split(":")
 
@@ -323,7 +324,7 @@ class Parser {
         return result
     }
 
-    def static parseEpgsearchCategory(String line) {
+    static def parseEpgsearchCategory(String line) {
         val splitted = line.split("\\|")
         val result = new EpgsearchCategory
 
@@ -342,7 +343,7 @@ class Parser {
         return result
     }
 
-    def static parseEpgsearchChannelGroup(String line) {
+    static def parseEpgsearchChannelGroup(String line) {
         val splitted = line.split("\\|").stream.collect(Collectors.toList)
         val result = new EpgsearchChannelGroup
 
@@ -352,6 +353,30 @@ class Parser {
         return result
     }
 
+    static def VDROsd parseRemoteOsd(List<String> input) {
+        val osd = new VDROsd
+
+        input.forEach(s | {
+            val type = String.valueOf(s.charAt(0))
+            val line = s.substring(2)
+
+            switch(type) {
+                case 'T': osd.title = line
+                case 'C': osd.addLayout(Integer.valueOf(line))
+                case 'I': osd.addMenuItem(type, line)
+                case 'S': osd.addMenuItem(type, line)
+                case 'X': osd.textBlock = line
+                case 'R': osd.red = line
+                case 'G': osd.green = line
+                case 'Y': osd.yellow = line
+                case 'B': osd.blue = line
+                case 'M': osd.statusMessage = line
+            }
+        })
+
+        return osd
+    }
+
     /* helper methods */
     private static def extractChannel(String line) {
         return line.substring(0, line.indexOf(" "))

svdrp/src/main/java/vdr/jonglisto/svdrp/client/SvdrpClient.xtend

@@ -282,6 +282,16 @@ class SvdrpClient {
         }
     }
 
+    def getOsd(VDR vdr) {
+        try {
+            val response = vdr.command("PLUG svdrposd LSTO 30", 920)
+            return Parser.parseRemoteOsd(response.lines)
+        } catch (Exception e) {
+            // no open OSD or host down
+            return null
+        }
+    }
+
     def processCommand(VDR vdr, Optional<String> command) {
         if (command.isPresent) {
             processCommand(vdr, command.get)

web/src/main/java/vdr/jonglisto/web/ui/OsdView.xtend

@@ -1,7 +1,10 @@
 package vdr.jonglisto.web.ui
 
+import com.vaadin.ui.HorizontalLayout
 import vdr.jonglisto.configuration.Configuration
 import vdr.jonglisto.model.VDR
+import vdr.jonglisto.svdrp.client.SvdrpClient
+import vdr.jonglisto.web.ui.component.OsdComponent
 import vdr.jonglisto.web.ui.component.RemoteComponent
 import vdr.jonglisto.xtend.annotation.Log
 
@@ -11,23 +14,34 @@ import static extension vdr.jonglisto.web.xtend.UIBuilder.*
 class OsdView extends BaseView {
 
     val RemoteComponent remote
+    var OsdComponent osd
+    val HorizontalLayout layout
 
     new() {
         super(BUTTON.OSD)
-        remote = new RemoteComponent(null, Configuration.get.remoteConfig)
+        remote = new RemoteComponent(this, selectedVdr, Configuration.get.remoteConfig)
+        osd = new OsdComponent(selectedVdr, SvdrpClient.get.getOsd(selectedVdr))
 
-        val h = horizontalLayout[
+        layout = horizontalLayout[
             setSizeFull
             addComponent(remote)
+            addComponentsAndExpand(osd)
         ]
 
-        addComponentsAndExpand(h)
+        addComponentsAndExpand(layout)
+    }
+
+    def updateOsd() {
+        val oldOsd = osd
+        osd = new OsdComponent(selectedVdr, SvdrpClient.get.getOsd(selectedVdr))
+        layout.replaceComponent(oldOsd, osd)
     }
 
     protected override createMainComponents() {
     }
 
     override protected def void changeVdr(VDR vdr) {
         remote.changeVdr(vdr)
+        osd.changeVdr(vdr)
     }
 }