Merge pull request #55 from ffplayout/master

merge master

.gitignore

@@ -90,3 +90,5 @@ sw.*
 *.swp
 
 master.m3u8
+tv-media
+tv-media/

assets/scss/globals.scss

@@ -55,7 +55,7 @@
 
 .duration {
     float: right;
-    margin-right: 1em;
+    margin-right: .5em;
 }
 
 .form-control, .tags-list ul li div input, .custom-select, .custom-control-label::before {
@@ -152,7 +152,11 @@
     padding: 0 10px 0 0;
 }
 
-.browser-div .ps {
+.player-browser-scroll {
+    height: calc(100% - 50px);
+}
+
+.browser-div .media-browser-scroll {
     height: 100%;
 }
 

nuxt.config.js

@@ -81,6 +81,16 @@ export default {
         baseURL: process.env.API_URL
     },
 
+    dayjs: {
+        locales: ['en', 'de'],
+        defaultLocale: 'en',
+        defaultTimeZone: 'Europe/Berlin', // TODO: use timezon like this.$dayjs().tz()
+        plugins: [
+            'utc',
+            'timezone'
+        ]
+    },
+
     styleResources: {
         scss: [
             '@/assets/css/_variables.scss',

pages/logging.vue

@@ -60,8 +60,8 @@ export default {
     filters: {
         formatStr (text) {
             return text
-                .replace(/("\[.*")/g, '<span class="log-cmd">$1</span>')
-                .replace(/("\/.*")/g, '<span class="log-path">$1</span>')
+                .replace(/(".*")/g, '<span class="log-cmd">$1</span>')
+                .replace(/(?<!".*)(\/.*)/g, '<span class="log-path">$1</span>')
                 .replace(/(\/[\w\d.\-/]+\n)/g, '<span class="log-path">$1</span>')
                 .replace(/((tcp|https?):\/\/[\w\d.:]+)/g, '<span class="log-url">$1</span>')
                 .replace(/(\[\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}[0-9,.]+\])/g, '<span class="log-time">$1</span>')

pages/media.vue

@@ -31,7 +31,7 @@
                 <splitpanes class="browser-row default-theme pane-row">
                     <pane min-size="20" size="24">
                         <div class="browser-div">
-                            <perfect-scrollbar :options="scrollOP">
+                            <perfect-scrollbar :options="scrollOP" class="media-browser-scroll">
                                 <b-list-group class="folder-list">
                                     <b-list-group-item
                                         v-for="folder in folderTree.tree[1]"
@@ -67,7 +67,7 @@
                             color="#ff9c36"
                         />
                         <div class="browser-div">
-                            <perfect-scrollbar :options="scrollOP">
+                            <perfect-scrollbar :options="scrollOP" class="media-browser-scroll">
                                 <b-list-group class="files-list">
                                     <b-list-group-item
                                         v-for="file in folderTree.tree[2]"

pages/player.vue

@@ -122,7 +122,7 @@
                             </b-breadcrumb>
                         </div>
 
-                        <perfect-scrollbar>
+                        <perfect-scrollbar :options="scrollOP" class="player-browser-scroll">
                             <b-list-group>
                                 <b-list-group-item
                                     v-for="folder in folderTree.tree[1]"
@@ -336,7 +336,10 @@ export default {
             videoOptions: {},
             previewOptions: {},
             previewComp: null,
-            previewSource: ''
+            previewSource: '',
+            scrollOP: {
+                suppressScrollX: true
+            }
         }
     },
 

store/playlist.js

@@ -77,7 +77,7 @@ export const actions = {
         let begin
         let lastTime = this.$timeToSeconds(this.$dayjs().format('HH:mm:ss'))
 
-        if (rootState.config.startInSec) {
+        if (Number.isFinite(rootState.config.startInSec)) {
             begin = rootState.config.startInSec
         } else {
             commit('SET_CURRENT_CLIP', 'day_start is not set, cannot calculate current clip')