bump full version

shiyiya · Aug 27, 2024 · 78debfb · 78debfb
1 parent d0953b5
commit 78debfb
Show file tree

Hide file tree

Showing 5 changed files with 80 additions and 25 deletions.
diff --git a/.prettierrc b/.prettierrc
@@ -0,0 +1,7 @@
+{
+  "semi": false,
+  "trailingComma": "none",
+  "singleQuote": true,
+  "printWidth": 110,
+  "tabWidth": 2
+}
diff --git a/.prettierrc.js b/.prettierrc.js
diff --git a/packages/docs/src/pages/docs/guide/start.mdx b/packages/docs/src/pages/docs/guide/start.mdx
@@ -6,46 +6,100 @@ import { Callout, Tab, Tabs } from 'nextra-theme-docs'
 
 <Tab>
 ```shell
-npm i @oplayer/core @oplayer/ui
+npm i @oplayer/core @oplayer/ui @oplayer/hls
 ```
 
 ```js filename="app.js"
 import Player from '@oplayer/core'
-import ui from '@oplayer/ui'
+import OUI from '@oplayer/ui'
+import OHls from '@oplayer/hls'
 
 Player.make('#oplayer', {
   source: {
+    title: '君の名は',
     src: 'https://cdn.jsdelivr.net/gh/shiyiya/QI-ABSL@master/o/君の名は.mp4',
     poster: 'https://cdn.jsdelivr.net/gh/shiyiya/QI-ABSL@master/o/poster.png'
   }
 })
-  .use([ui()])
+  .use([
+    OUI({
+      subtitle: {
+        source: [
+          {
+            name: 'Japanese',
+            default: true,
+            src: 'https://cdn.jsdelivr.net/gh/shiyiya/QI-ABSL@master/o/君の名は-jp.srt',
+            offset: 2
+          },
+          {
+            name: 'CH & JP',
+            src: 'https://cdn.jsdelivr.net/gh/shiyiya/QI-ABSL@master/o/君の名は.srt',
+            offset: 2
+          }
+        ]
+      },
+      thumbnails: {
+        src: 'https://cdn.jsdelivr.net/gh/shiyiya/QI-ABSL@master/o/thumbnails.jpg',
+        number: 100
+      }
+    }),
+    OHls({ forceHLS: true })
+  ])
   .create()
 ```
 
 </Tab>
 
 <Tab>
 ```html filename="app.html"
-<!-- Includes ui -->
 <script src="https://cdn.jsdelivr.net/npm/@oplayer/core@latest/dist/index.ui.js"></script>
+<script src="https://cdn.jsdelivr.net/npm/@oplayer/hls@latest/dist/index.min.js"></script>
+
 <script>
   OPlayer.make('#oplayer', {
     source: {
+      title: '君の名は',
       src: 'https://cdn.jsdelivr.net/gh/shiyiya/QI-ABSL@master/o/君の名は.mp4',
       poster: 'https://cdn.jsdelivr.net/gh/shiyiya/QI-ABSL@master/o/poster.png'
     }
   })
-    .use([OUI()])
+    .use([
+      OUI({
+        subtitle: {
+          source: [
+            {
+              name: 'Japanese',
+              default: true,
+              src: 'https://cdn.jsdelivr.net/gh/shiyiya/QI-ABSL@master/o/君の名は-jp.srt',
+              offset: 2
+            },
+            {
+              name: 'CH & JP',
+              src: 'https://cdn.jsdelivr.net/gh/shiyiya/QI-ABSL@master/o/君の名は.srt',
+              offset: 2
+            }
+          ]
+        },
+        thumbnails: {
+          src: 'https://cdn.jsdelivr.net/gh/shiyiya/QI-ABSL@master/o/thumbnails.jpg',
+          number: 100
+        }
+      }),
+      OHls({
+        forceHLS: true,
+        // will lazy load hls.js
+        library: 'https://cdn.jsdelivr.net/npm/[email protected]/dist/hls.min.js'
+      })
+    ])
     .create()
 </script>
+
 ```
 </Tab>
 
 <Tab>
 ```html filename="app.html"
-<!-- Includes ui & hls & dash & mpegts -->
-<!-- Lazy load hls.js dashjs ... -->
+<!-- all in one (~28kB) -->
 <script src="https://cdn.jsdelivr.net/npm/@oplayer/full@latest/dist/index.min.js"></script>
 <script>
   OPlayer.make('#oplayer', {
@@ -58,8 +112,6 @@ Player.make('#oplayer', {
       OUI(),
       OHls({
         forceHLS: true,
-
-        // lazy load
         library: 'https://cdn.jsdelivr.net/npm/[email protected]/dist/hls.min.js'
       }),
       ODash({ library: 'https://cdn.dashjs.org/latest/dash.all.min.js' }),
@@ -69,6 +121,7 @@ Player.make('#oplayer', {
 
 </script>
 ```
+
 </Tab>
 
 </Tabs>
diff --git a/packages/full/package.json b/packages/full/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@oplayer/full",
-  "version": "0.0.1-beta.0",
+  "version": "0.0.1-beta.1",
   "description": "all loader in one",
   "type": "module",
   "main": "./dist/index.min.js",

diff --git a/packages/hls/src/index.ts b/packages/hls/src/index.ts
@@ -203,7 +203,7 @@ const generateSetting = (player: Player, instance: Hls, options: HlsPlugin['opti
   const ui = player.context.ui
   if (options.qualityControl) {
     instance.once(HlsPlugin.library.Events.LEVEL_LOADED, () => {
-      if (instance.levels.length < 1) return
+      if (instance.levels.length < 2) return
       const defaultLevel = options.defaultQuality(instance.levels)
       if (defaultLevel != -1) instance.currentLevel = defaultLevel
 
@@ -256,7 +256,7 @@ const generateSetting = (player: Player, instance: Hls, options: HlsPlugin['opti
 
   if (options.audioControl) {
     instance.once(HlsPlugin.library.Events.LEVEL_LOADED, () => {
-      if (instance.audioTracks.length < 1) return
+      if (instance.audioTracks.length < 2) return
 
       let defaultAudio: number | undefined = options.defaultAudio(instance.audioTracks)
       if (defaultAudio == -1) {
@@ -265,7 +265,9 @@ const generateSetting = (player: Player, instance: Hls, options: HlsPlugin['opti
         })?.id
       }
 
-      if (defaultAudio != -1 && defaultAudio != undefined) instance.audioTrack = defaultAudio
+      if (defaultAudio != -1 && defaultAudio != undefined) {
+        instance.audioTrack = defaultAudio
+      }
 
       injectSetting({
         icon: ui.icons.lang,
@@ -286,7 +288,7 @@ const generateSetting = (player: Player, instance: Hls, options: HlsPlugin['opti
 
   if (options.textControl)
     instance.once(HlsPlugin.library.Events.SUBTITLE_TRACK_LOADED, () => {
-      if (instance.subtitleTracks.length < 1) return
+      if (instance.subtitleTracks.length < 2) return
 
       let defaultSubtitle: number | undefined = options.defaultSubtitle(instance.subtitleTracks)
       if (defaultSubtitle == -1) {
@@ -295,7 +297,9 @@ const generateSetting = (player: Player, instance: Hls, options: HlsPlugin['opti
         })?.id
       }
 
-      if (defaultSubtitle != -1 && defaultSubtitle != undefined) instance.subtitleTrack = defaultSubtitle
+      if (defaultSubtitle != -1 && defaultSubtitle != undefined) {
+        instance.subtitleTrack = defaultSubtitle
+      }
 
       injectSetting({
         icon: ui.icons.subtitle,
@@ -324,12 +328,10 @@ const generateSetting = (player: Player, instance: Hls, options: HlsPlugin['opti
   function injectSetting(arg: {
     icon: string
     name: string
-    settings: () => { name: string; default: boolean; value: any }[] | void
+    settings: () => { name: string; default: boolean; value: any }[]
     onChange: (it: { value: any }) => void
   }) {
     const settings = arg.settings()
-    if (settings && settings.length < 2) return
-
     const { name, icon, onChange } = arg
 
     player.context.ui.setting.unregister(`${PLUGIN_NAME}-${name}`)