add support for jellyfin

upgrade to java 14

models/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.ftpix.homedash</groupId>
         <artifactId>homedash</artifactId>
-        <version>2019.07.1</version>
+        <version>2020.1</version>
     </parent>
 
     <artifactId>models</artifactId>

notifications/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>homedash</artifactId>
         <groupId>com.ftpix.homedash</groupId>
-        <version>2019.07.1</version>
+        <version>2020.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

plugins/couchpotato/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.ftpix.homedash.plugins</groupId>
         <artifactId>plugins</artifactId>
-        <version>2019.07.1</version>
+        <version>2020.1</version>
     </parent>
 
     <artifactId>couchpotato</artifactId>

plugins/docker/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.ftpix.homedash.plugins</groupId>
         <artifactId>plugins</artifactId>
-        <version>2019.07.1</version>
+        <version>2020.1</version>
     </parent>
 
     <artifactId>docker</artifactId>

plugins/dockercompose/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>plugins</artifactId>
         <groupId>com.ftpix.homedash.plugins</groupId>
-        <version>2019.07.1</version>
+        <version>2020.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

plugins/dynamicdns/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.ftpix.homedash.plugins</groupId>
         <artifactId>plugins</artifactId>
-        <version>2019.07.1</version>
+        <version>2020.1</version>
     </parent>
 
     <artifactId>dynamicdns</artifactId>

plugins/googlepubliccalendar/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.ftpix.homedash.plugins</groupId>
         <artifactId>plugins</artifactId>
-        <version>2019.07.1</version>     </parent>
+        <version>2020.1</version>     </parent>
 
     <artifactId>googlepubliccalendar</artifactId>
     <name>googlepubliccalendar</name>

plugins/harddisk/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.ftpix.homedash.plugins</groupId>
         <artifactId>plugins</artifactId>
-        <version>2019.07.1</version>
+        <version>2020.1</version>
     </parent>
 
     <artifactId>harddisk</artifactId>

plugins/kvm/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>plugins</artifactId>
         <groupId>com.ftpix.homedash.plugins</groupId>
-        <version>2019.07.1</version>
+        <version>2020.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

plugins/logreader/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>plugins</artifactId>
         <groupId>com.ftpix.homedash.plugins</groupId>
-        <version>2019.07.1</version>
+        <version>2020.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

plugins/mma/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.ftpix.homedash.plugins</groupId>
         <artifactId>plugins</artifactId>
-        <version>2019.07.1</version>     </parent>
+        <version>2020.1</version>     </parent>
 
     <artifactId>mma</artifactId>
     <name>mma</name>

plugins/networkmonitor/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.ftpix.homedash.plugins</groupId>
         <artifactId>plugins</artifactId>
-        <version>2019.07.1</version>
+        <version>2020.1</version>
     </parent>
 
     <artifactId>networkmonitor</artifactId>

plugins/pihole/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.ftpix.homedash.plugins</groupId>
         <artifactId>plugins</artifactId>
-        <version>2019.07.1</version>     </parent>
+        <version>2020.1</version>     </parent>
 
     <artifactId>pihole</artifactId>
     <name>pihole</name>

plugins/plex/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.ftpix.homedash.plugins</groupId>
         <artifactId>plugins</artifactId>
-        <version>2019.07.1</version>
+        <version>2020.1</version>
     </parent>
 
     <artifactId>plex</artifactId>

plugins/plex/src/main/java/assets/js/plex.js

@@ -12,51 +12,31 @@ function plex(moduleId) {
 
     this.onMessage = function (size, command, message, extra) {
 
-
         var root = rootElement(this.moduleId);
-        if (message.size == '0') {
+        root.addClass(message.type);
+        if (message.videos === undefined || message.videos.length === 0) {
             root.find('.now-playing').addClass('nothing');
         } else {
             var video;
-            if (message.size == 1) {
+            if (message.videos.length === 1) {
                 video = message.videos[0];
             } else {
                 this.currentIndex++;
-                if (message.size > this.currentIndex) {
+                if (message.videos.size > this.currentIndex) {
                     video = message.videos[this.currentIndex];
                 } else {
                     video = message.videos[0];
                     this.currentIndex = 0;
                 }
             }
 
-            var name = '', art = video.art;
-            if (video.type == "episode") {
-                if (video.grandparentTitle != '') {
-                    name = video.grandparentTitle + ' - ';
-                }
-                if (video.parentTitle != '') {
-                    name += video.parentTitle + ' - ';
-                }
-                name += video.title;
-
-                if(video.grandparentArt != ''){
-                    art = video.grandparentArt;
-                }
-            }else{
-                name = video.title;
-            }
-
-            var progress = (video.viewOffset / video.duration)*100;
-
             var nowPlaying = root.find('.now-playing');
             nowPlaying.removeClass('nothing');
-            nowPlaying.css('background-image', "url('" + art + "')");
-            nowPlaying.find('.name').html(name);
-            nowPlaying.find('.progress').css('width', progress+'%');
-            nowPlaying.find('.player').html(video.player.title);
+            nowPlaying.css('background-image', "url('" + video.image + "')");
+            nowPlaying.find('.name').html(video.name);
+            nowPlaying.find('.progress').css('width', video.progress + '%');
+            nowPlaying.find('.player').html(video.player);
         }
     }
 
-
 }

plugins/plex/src/main/java/assets/less/plex.less

@@ -1,8 +1,28 @@
 .plex {
-  background: #333 url('../files/images/icon.svg');
   background-size: cover;
   background-position: center center;
   background-repeat: no-repeat;
+  background-color: #000;
+
+  &.PLEX {
+    background-color: #333;
+    background-image: url('../files/images/plex.svg');
+
+    .progress{
+      background: rgb(206, 125, 1);
+    }
+  }
+
+  &.JELLYFIN {
+    background-color: #000;
+    background-image: url('../files/images/jellyfin.png');
+    background-size: contain;
+
+    .progress{
+      background: rgb(26, 158, 224);
+    }
+  }
+
 
   .now-playing {
     position: absolute;
@@ -22,6 +42,7 @@
     background-size: cover;
     background-position: center center;
 
+
     .info {
       background: rgba(0, 0, 0, 0.5);
       position: absolute;
@@ -31,11 +52,10 @@
 
 
       .progress {
-        background: rgb(206, 125, 1);
         height: 5px;
         margin: 0;
-        
-        @progressSpeed:0.25s;
+
+        @progressSpeed: 0.25s;
         -webkit-transition: width @progressSpeed;
         -moz-transition: width @progressSpeed;
         -ms-transition: width @progressSpeed;
@@ -45,14 +65,14 @@
 
       .name {
         padding: 5px;
-        color:white;
+        color: white;
         font-size: 20px;
       }
 
-      .player{
+      .player {
         padding: 5px;
         text-align: right;
-        color:white;
+        color: white;
       }
 
     }
@@ -63,38 +83,38 @@
   }
 }
 
-.plex.size-2x1{
-  .name{
+.plex.size-2x1 {
+  .name {
     font-size: 15px !important;
   }
 
-  .player{
+  .player {
     display: none;
   }
 }
 
-.plex.size-1x1{
-  .info{
-    .name{
+.plex.size-1x1 {
+  .info {
+    .name {
       display: none;
     }
 
-    .player{
+    .player {
       display: none;
     }
   }
 }
 
-.plex.size-kiosk{
-  .progress{
+.plex.size-kiosk {
+  .progress {
     height: 1vh !important;
   }
 
-  .name{
+  .name {
     font-size: 5vh !important;
   }
 
-  .player{
+  .player {
     font-size: 3vh !important;
   }
 }

plugins/plex/src/main/java/assets/templates/plex-settings.jade

@@ -1,16 +1,43 @@
 .form-group
-    label(for="url") Plex server address
+    label(for="type") API Type
+    select.form-control(name="type", id="type")
+        each type, index in {'PLEX':'Plex', 'JELLYFIN':'Jellyfin'}
+            if settings && settings.containsKey("type") && settings.get("type").equalsIgnoreCase(index)
+                option(value=index, selected=true)= type
+            else
+                option(value=index)= type
+.form-group
+    label(for="url") Server address
     if settings && settings.containsKey("url")
-        input.form-control(type="text", id="url", name="url", placeholder="URL", value='#{settings.get("url")}')
+        input.form-control(type="text", id="url", name="url", placeholder="https://jellifinserver.com:8096", value='#{settings.get("url")}')
     else
-        input.form-control(type="text", id="url", name ="url", placeholder = "URL")
+        input.form-control(type="text", id="url", name ="url", placeholder = "https://jellifinserver.com:8096")
+#PLEX.media-server
+    .form-group
+        label(for="token")
+            | Authentication token (
+            a(href="https://support.plex.tv/hc/en-us/articles/204059436-Finding-an-authentication-token-X-Plex-Token") get authentication token
+            | )
+        if settings && settings.containsKey("token")
+            input.form-control(type="text", id="token", name="token", placeholder="Token", value='#{settings.get("token")}')
+        else
+            input.form-control(type="text", id="token", name ="token", placeholder = "Token")
+#JELLYFIN.media-server
+    .form-group
+        label(for="apiKey") Api key
+        if settings && settings.containsKey("apiKey")
+            input.form-control(type="text", id="apiKey", name="apiKey", placeholder="Api key", value='#{settings.get("apiKey")}')
+        else
+            input.form-control(type="text", id="apiKey", name ="apiKey", placeholder = "Api key")
 
-.form-group
-    label(for="token")
-        | Authentication token (
-        a(href="https://support.plex.tv/hc/en-us/articles/204059436-Finding-an-authentication-token-X-Plex-Token") get authentication token
-        | )
-    if settings && settings.containsKey("token")
-        input.form-control(type="text", id="token", name="token", placeholder="Token", value='#{settings.get("token")}')
-    else
-        input.form-control(type="text", id="token", name ="token", placeholder = "Token")
+script(type="text/javascript").
+    document.addEventListener("DOMContentLoaded", function() {
+
+        function toggleSettings(){
+           $('.media-server').hide();
+           $('#'+$('#type').val()).show();
+        }
+
+        $('#type').change(toggleSettings);
+        toggleSettings();
+    });