feat: add dependency of ffmpeg + clean up

cgilly2fast · Sep 1, 2024 · ea86a3b · ea86a3b
1 parent 5fd2f2f
commit ea86a3b
Show file tree

Hide file tree

Showing 16 changed files with 878 additions and 811 deletions.
diff --git a/dev/plugin.spec.ts b/dev/plugin.spec.ts
diff --git a/dev/src/payload.config.ts b/dev/src/payload.config.ts
@@ -39,75 +39,75 @@ import { OverrideSegments } from './collections/OverrideSegments'
 // })
 
 export default buildConfig({
-    admin: {
-        user: Users.slug,
-        bundler: webpackBundler(),
-        webpack: config => {
-            const newConfig = {
-                ...config,
-                resolve: {
-                    ...config.resolve,
-                    alias: {
-                        ...(config?.resolve?.alias || {}),
-                        react: path.join(__dirname, '../node_modules/react'),
-                        'react-dom': path.join(__dirname, '../node_modules/react-dom'),
-                        payload: path.join(__dirname, '../node_modules/payload'),
-                    },
-                },
-            }
-            return newConfig
+  admin: {
+    user: Users.slug,
+    bundler: webpackBundler(),
+    webpack: config => {
+      const newConfig = {
+        ...config,
+        resolve: {
+          ...config.resolve,
+          alias: {
+            ...(config?.resolve?.alias || {}),
+            react: path.join(__dirname, '../node_modules/react'),
+            'react-dom': path.join(__dirname, '../node_modules/react-dom'),
+            payload: path.join(__dirname, '../node_modules/payload'),
+          },
         },
+      }
+      return newConfig
     },
-    cors: '*',
-    editor: slateEditor({}),
-    collections: [Users, Media, Videos],
-    serverURL: process.env.PAYLOAD_PUBLIC_SERVER_URL,
-    typescript: {
-        outputFile: path.resolve(__dirname, 'payload-types.ts'),
-    },
-    graphQL: {
-        schemaOutputFile: path.resolve(__dirname, 'generated-schema.graphql'),
-    },
-    plugins: [
-        abrVideos({
-            enabled: true,
-            collections: {
-                media: {
-                    keepOriginal: false,
-                },
-                videos: {
-                    keepOriginal: true,
-                    resolutions: [
-                        { size: 144, bitrate: 150 },
-                        { size: 240, bitrate: 250 },
-                        { size: 300, bitrate: 500 },
-                    ],
-                    segmentDuration: 1,
-                },
-            },
-            segmentsOverrides: OverrideSegments,
-        }),
-        // cloudStorage({
-        //     collections: {
-        //         media: {
-        //             adapter: adapter,
-        //             prefix: 'test-media',
-        //             disableLocalStorage: true,
-        //         },
-        //         'override-segments': {
-        //             adapter: adapter,
-        //             prefix: 'segments',
-        //             disableLocalStorage: true,
-        //         },
-        //     },
-        // }),
-    ],
-    db: mongooseAdapter({
-        url: process.env.DATABASE_URI!,
-    }),
-    upload: {
-        limits: {
-            fileSize: 50000000, // 5MB, written in bytes
+  },
+  cors: '*',
+  serverURL: process.env.PAYLOAD_PUBLIC_SERVER_URL,
+  editor: slateEditor({}),
+  collections: [Users, Media, Videos],
+  typescript: {
+    outputFile: path.resolve(__dirname, 'payload-types.ts'),
+  },
+  graphQL: {
+    schemaOutputFile: path.resolve(__dirname, 'generated-schema.graphql'),
+  },
+  plugins: [
+    abrVideos({
+      enabled: true,
+      collections: {
+        media: {
+          keepOriginal: false,
         },
+        videos: {
+          keepOriginal: true,
+          resolutions: [
+            { size: 144, bitrate: 150 },
+            { size: 240, bitrate: 250 },
+            { size: 300, bitrate: 500 },
+          ],
+          segmentDuration: 1,
+        },
+      },
+      segmentsOverrides: OverrideSegments,
+    }),
+    // cloudStorage({
+    //     collections: {
+    //         media: {
+    //             adapter: adapter,
+    //             prefix: 'test-media',
+    //             disableLocalStorage: true,
+    //         },
+    //         'override-segments': {
+    //             adapter: adapter,
+    //             prefix: 'segments',
+    //             disableLocalStorage: true,
+    //         },
+    //     },
+    // }),
+  ],
+  db: mongooseAdapter({
+    url: process.env.DATABASE_URI!,
+  }),
+  upload: {
+    limits: {
+      fileSize: 50000000, // 500MB, written in bytes
     },
+  },
 })
diff --git a/dev/src/server.ts b/dev/src/server.ts
@@ -7,23 +7,23 @@ require('dotenv').config()
 const app = express()
 
 app.get('/', (_, res) => {
-    res.redirect('/admin')
+  res.redirect('/admin')
 })
 
 const PORT = 3000
 export const start = async (args?: Partial<InitOptions>) => {
-    await payload.init({
-        secret: process.env.PAYLOAD_SECRET,
-        express: app,
-        onInit: async () => {
-            payload.logger.info(`Payload Admin URL: ${payload.getAdminURL()}`)
-        },
-        ...(args || {}),
-    })
+  await payload.init({
+    secret: process.env.PAYLOAD_SECRET,
+    express: app,
+    onInit: async () => {
+      payload.logger.info(`Payload Admin URL: ${payload.getAdminURL()}`)
+    },
+    ...(args || {}),
+  })
 
-    return app.listen(PORT)
+  return app.listen(PORT)
 }
 
 if (require.main === module) {
-    start()
+  start()
 }
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "plugin-adaptive-bitrate-videos",
-  "version": "1.0.5",
+  "version": "1.1.0",
   "homepage:": "https://github.com/cgilly2fast/plugin-adaptive-bitrate-videos",
   "repository": "[email protected]:cgilly2fast/plugin-adaptive-bitrate-videos.git",
   "description": "Payload plugin for automatic adaptive bitrate process of videos.",
@@ -25,11 +25,11 @@
     "clean": "rimraf dist && rimraf dev/yarn.lock",
     "prepublishOnly": "yarn clean && yarn build && cd dev && yarn test"
   },
-    "author": "Colby Gilbert",
-    "license": "MIT",
-    "bugs": {
-        "url": "https://github.com/cgilly2fast/plugin-adaptive-bitrate-videos/issues"
-    },
+  "author": "Colby Gilbert",
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/cgilly2fast/plugin-adaptive-bitrate-videos/issues"
+  },
   "peerDependencies": {
     "payload": "^2.0.0"
   },
@@ -55,6 +55,8 @@
     "webpack": "^5.90.3"
   },
   "dependencies": {
+    "@ffmpeg-installer/ffmpeg": "^1.1.0",
+    "@ffprobe-installer/ffprobe": "^2.1.2",
     "fluent-ffmpeg": "^2.1.3"
   }
 }
diff --git a/src/collections/Segments.ts b/src/collections/Segments.ts
@@ -3,23 +3,23 @@ import type { CollectionConfig } from 'payload/types'
 import type { PluginOptions } from '../types'
 
 export const generateSegmentsCollection = (pluginOptions: PluginOptions): CollectionConfig => {
-    const newConfig: CollectionConfig = {
-        ...(pluginOptions?.segmentsOverrides || {}),
-        slug: pluginOptions?.segmentsOverrides?.slug || 'segments',
-        access: {
-            read: () => true,
-            update: () => false,
-            ...(pluginOptions?.segmentsOverrides?.access || {}),
-        },
-        admin: {
-            ...(pluginOptions?.segmentsOverrides?.admin || {}),
-        },
-        fields: [...(pluginOptions?.segmentsOverrides?.fields || [])],
-        hooks: {
-            ...(pluginOptions?.segmentsOverrides?.hooks || {}),
-        },
-        upload: true,
-    }
+  const newConfig: CollectionConfig = {
+    ...(pluginOptions?.segmentsOverrides || {}),
+    slug: pluginOptions?.segmentsOverrides?.slug || 'segments',
+    access: {
+      read: () => true,
+      update: () => false,
+      ...(pluginOptions?.segmentsOverrides?.access || {}),
+    },
+    admin: {
+      ...(pluginOptions?.segmentsOverrides?.admin || {}),
+    },
+    fields: [...(pluginOptions?.segmentsOverrides?.fields || [])],
+    hooks: {
+      ...(pluginOptions?.segmentsOverrides?.hooks || {}),
+    },
+    upload: true,
+  }
 
-    return newConfig
+  return newConfig
 }
diff --git a/src/components/AfterDashboard/index.scss b/src/components/AfterDashboard/index.scss
diff --git a/src/components/AfterDashboard/index.tsx b/src/components/AfterDashboard/index.tsx