update dplayer

Youyuni · Feb 14, 2020 · 5e4168d · 5e4168d
1 parent 42f82e9
commit 5e4168d
Show file tree

Hide file tree

Showing 11 changed files with 81 additions and 11 deletions.
diff --git a/app/config.js b/app/config.js
@@ -37,7 +37,11 @@ const db = createFiledb(configPath , {raw:true} , {
 
   anonymous_uplod_enable:0,
 
-  plugin_option:[]
+  plugin_option:[],
+
+  custom_style:'',
+
+  custom_script:'',
 });
 
 if(process.env.PORT){

diff --git a/app/controllers/manage.js b/app/controllers/manage.js
@@ -64,7 +64,7 @@ const handlers = async (a, body) => {
     cache.clear()
     result.message = 'Success'
   } else if (a == 'cfg') {
-    let { proxy_enable, preview_enable, readme_enable, max_age_dir, max_age_file,max_age_download, webdav_path, anonymous_uplod_enable, ignore_file_extensions , ignore_paths } = body
+    let { proxy_enable, preview_enable, readme_enable, max_age_dir, max_age_file,max_age_download, webdav_path, anonymous_uplod_enable, ignore_file_extensions , ignore_paths , custom_style , custom_script } = body
     let opts = {}
     if (max_age_dir !== undefined) {
       max_age_dir = parseInt(max_age_dir)
@@ -110,6 +110,8 @@ const handlers = async (a, body) => {
     if (webdav_path) {
       opts.webdav_path = webdav_path
     }
+    opts.custom_script = custom_script
+    opts.custom_style = custom_style
     opts.ignore_paths = config.getConfig('ignore_paths')
     opts.ignore_file_extensions = ignore_file_extensions
     opts.ignore_paths.__root__ = ignore_paths.split(',')

diff --git a/app/middleware/koa-render.js b/app/middleware/koa-render.js
@@ -1,9 +1,13 @@
-const { getSkin } = require('../config')
+const { getSkin , getConfig } = require('../config')
 
 module.exports = (ctx, next) => {
   if(ctx.renderSkin) return next()
   ctx.response.renderSkin = ctx.renderSkin = (path , options) => {
-    return ctx.render(getSkin()+'/'+path, options)
+    let data = { ...options , g_config:{
+      custom_style:getConfig('custom_style'),
+      custom_script:getConfig('custom_script'),
+    }}
+    return ctx.render(getSkin()+'/'+path, data)
   }
   return next()
 }
diff --git a/app/views/default/manage.pug b/app/views/default/manage.pug
@@ -85,6 +85,18 @@ block content
                   select.form-control(name='anonymous_uplod_enable',value=config.anonymous_uplod_enable,required)
                     option(value='1', selected=config.anonymous_uplod_enable==1 ? 'selected' : null)= __('enable')
                     option(value='0', selected=config.anonymous_uplod_enable==0 ? 'selected' : null)= __('disable')
+              .form-group
+                .col-sm-4
+                  label= __('custom_style')
+                .col-sm-8
+                  textarea.form-control(name='custom_style')
+                    | #{config.custom_style}
+              .form-group
+                .col-sm-4
+                  label= __('custom_script')
+                .col-sm-8
+                  textarea.form-control(name='custom_script')
+                    | #{config.custom_script}
               .form-group.text-center
                 button.btn.btn-default(type='submit')= __('save')
         .panel.panel-default

diff --git a/app/views/default/partial/footer.pug b/app/views/default/partial/footer.pug
@@ -1,4 +1,7 @@
 footer
   p
     a(href='https://github.com/reruin/sharelist',target='_blank') GitHub
-    a(href='/manage',target='_blank')= __('manage')
+    a(href='/manage',target='_blank')= __('manage')
+-if(g_config.custom_script)
+  .
+    !{g_config.custom_script}
diff --git a/app/views/default/partial/layout.pug b/app/views/default/partial/layout.pug
@@ -7,8 +7,10 @@ html
 
     // META
     link(rel='stylesheet', href='//cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css')
-    link(rel='stylesheet', type='text/css',href='/style/font/font.css')
+    link(rel='stylesheet', type='text/css',href='https://fonts.loli.net/css?family=Source+Code+Pro')
     link(rel='stylesheet', type='text/css', href='/style/main.css')
-
+    -if(g_config && g_config.custom_style)
+      .
+        !{g_config.custom_style}
   body
     block content
diff --git a/example/preview/movie.vtt b/example/preview/movie.vtt
@@ -0,0 +1,4 @@
+WEBVTT
+
+00:00:00.001 --> 00:00:03.000
+鸟叫声
diff --git a/locales/en-US.js b/locales/en-US.js
@@ -38,5 +38,7 @@ module.exports = {
   "ignore_paths":"Ignore Path",
   "ignore_paths_placeholder":"e.g. /a,/b/c",
   "plugin_option":"Plugin Option",
+  "custom_style":"Custom Style",
+  "custom_script":"Custom Script",
   "reboot":"Reboot",
 }
diff --git a/locales/zh-CN.js b/locales/zh-CN.js
@@ -38,5 +38,7 @@ module.exports = {
   "ignore_paths":"忽略路径",
   "ignore_paths_placeholder":"路径，多个用逗号分隔",
   "plugin_option":"插件配置",
+  "custom_style":"自定义样式",
+  "custom_script":"自定义脚本",
   "reboot":"重启"
 }
diff --git a/locales/zh-TW.js b/locales/zh-TW.js
@@ -38,5 +38,7 @@ module.exports = {
   "ignore_paths":"忽略路徑",
   "ignore_paths_placeholder":"路徑，多個用逗號分隔",
   "plugin_option":"插件配置",
+  "custom_style":"自定義樣式",
+  "custom_script":"自定義腳本",
   "reboot":"重啟",
 }
diff --git a/plugins/preview.media.js b/plugins/preview.media.js
@@ -42,14 +42,20 @@ module.exports = ({getSource , getPluginOption , setPluginOption}) => {
       //   <video src="${req.path}" style="min-width: 90%;min-height: 60vh;" controls="controls" autoplay="autoplay"></video>
       // `,
        body: videoPlayer == 'dplayer' ? `
-        <script src="https://cdn.bootcss.com/dplayer/1.25.0/DPlayer.min.js"></script>
         <link href="https://cdn.bootcss.com/dplayer/1.25.0/DPlayer.min.css" rel="stylesheet" />
-        <div id="dplayer" style="margin-top:32px;height:60vh;">
+        <script src="https://cdn.bootcss.com/dplayer/1.25.0/DPlayer.min.js"></script>
+        <div id="dplayer" style="margin-top:32px;height:60vh;"></div>
         <script>
+          var url = '${decodeUrl(req)}' , subtitle = url.replace(/\\.[^\\?]+/,'.vtt');
           var dp = new DPlayer({
             container: document.getElementById('dplayer'),
-            video: {
-                url: '${decodeUrl(req)}',
+            video:{
+              url: url,
+            },
+            subtitle: {
+              url: subtitle,
+              fontSize: '25px',
+              bottom: '7%',
             },
           });
         </script>
@@ -77,10 +83,37 @@ module.exports = ({getSource , getPluginOption , setPluginOption}) => {
     }
   }
 
+  const hls = async (data , req) => {
+    return {
+      ...data,
+       body: `
+        <link href="https://cdn.bootcss.com/dplayer/1.25.0/DPlayer.min.css" rel="stylesheet" />
+        <script src="https://cdn.bootcss.com/hls.js/8.0.0-beta.3/hls.min.js"></script>
+        <script src="https://cdn.bootcss.com/dplayer/1.25.0/DPlayer.min.js"></script>
+        <div id="dplayer" style="margin-top:32px;height:60vh;"></div>
+        <script>
+          var url = '${decodeUrl(req)}';
+          var dp = new DPlayer({
+            container: document.getElementById('dplayer'),
+            video:{
+              url: url,
+              type:'hls'
+            },
+            
+          });
+        </script>
+      `
+    }
+  }
+
 
   videoFormat.split(',').forEach( ext => {
     preview[ext] = video
   });
+
+  ['m3u8'].forEach( ext => {
+    preview[ext] = hls
+  });
 
   ['mp3','m4a','acc'].forEach( ext => {
     preview[ext] = audio