aboutsummaryrefslogtreecommitdiffhomepage
path: root/shared
diff options
context:
space:
mode:
Diffstat (limited to 'shared')
-rw-r--r--shared/models/plugins/plugin-settings-manager.model.ts8
-rw-r--r--shared/models/plugins/plugin-storage-manager.model.ts6
-rw-r--r--shared/models/videos/video-file-metadata.ts9
-rw-r--r--shared/models/videos/video-file.model.ts6
-rw-r--r--shared/models/videos/video.model.ts10
5 files changed, 15 insertions, 24 deletions
diff --git a/shared/models/plugins/plugin-settings-manager.model.ts b/shared/models/plugins/plugin-settings-manager.model.ts
index db88ae6e7..165f0dc5b 100644
--- a/shared/models/plugins/plugin-settings-manager.model.ts
+++ b/shared/models/plugins/plugin-settings-manager.model.ts
@@ -1,11 +1,9 @@
1import * as Bluebird from 'bluebird'
2
3export interface PluginSettingsManager { 1export interface PluginSettingsManager {
4 getSetting: (name: string) => Bluebird<string | boolean> 2 getSetting: (name: string) => Promise<string | boolean>
5 3
6 getSettings: (names: string[]) => Bluebird<{ [settingName: string]: string | boolean }> 4 getSettings: (names: string[]) => Promise<{ [settingName: string]: string | boolean }>
7 5
8 setSetting: (name: string, value: string) => Bluebird<any> 6 setSetting: (name: string, value: string) => Promise<any>
9 7
10 onSettingsChange: (cb: (names: string[]) => void) => void 8 onSettingsChange: (cb: (names: string[]) => void) => void
11} 9}
diff --git a/shared/models/plugins/plugin-storage-manager.model.ts b/shared/models/plugins/plugin-storage-manager.model.ts
index 8a1f389f1..51567044a 100644
--- a/shared/models/plugins/plugin-storage-manager.model.ts
+++ b/shared/models/plugins/plugin-storage-manager.model.ts
@@ -1,7 +1,5 @@
1import * as Bluebird from 'bluebird'
2
3export interface PluginStorageManager { 1export interface PluginStorageManager {
4 getData: (key: string) => Bluebird<string> 2 getData: (key: string) => Promise<string>
5 3
6 storeData: (key: string, data: any) => Bluebird<any> 4 storeData: (key: string, data: any) => Promise<any>
7} 5}
diff --git a/shared/models/videos/video-file-metadata.ts b/shared/models/videos/video-file-metadata.ts
index 010bf7cf5..8f527c0a7 100644
--- a/shared/models/videos/video-file-metadata.ts
+++ b/shared/models/videos/video-file-metadata.ts
@@ -1,14 +1,9 @@
1import { FfprobeData } from 'fluent-ffmpeg' 1export class VideoFileMetadata {
2import { DeepOmit } from '../../core-utils'
3
4export type VideoFileMetadataModel = DeepOmit<FfprobeData, 'filename'>
5
6export class VideoFileMetadata implements VideoFileMetadataModel {
7 streams: { [x: string]: any, [x: number]: any }[] 2 streams: { [x: string]: any, [x: number]: any }[]
8 format: { [x: string]: any, [x: number]: any } 3 format: { [x: string]: any, [x: number]: any }
9 chapters: any[] 4 chapters: any[]
10 5
11 constructor (hash: Partial<VideoFileMetadataModel>) { 6 constructor (hash: { chapters: any[], format: any, streams: any[] }) {
12 this.chapters = hash.chapters 7 this.chapters = hash.chapters
13 this.format = hash.format 8 this.format = hash.format
14 this.streams = hash.streams 9 this.streams = hash.streams
diff --git a/shared/models/videos/video-file.model.ts b/shared/models/videos/video-file.model.ts
index 6cc2d5aee..cbef05ac0 100644
--- a/shared/models/videos/video-file.model.ts
+++ b/shared/models/videos/video-file.model.ts
@@ -1,5 +1,5 @@
1import { VideoConstant, VideoResolution } from '@shared/models' 1
2import { FfprobeData } from 'fluent-ffmpeg' 2import { VideoConstant, VideoFileMetadata, VideoResolution } from '@shared/models'
3 3
4export interface VideoFile { 4export interface VideoFile {
5 magnetUri: string 5 magnetUri: string
@@ -10,6 +10,6 @@ export interface VideoFile {
10 fileUrl: string 10 fileUrl: string
11 fileDownloadUrl: string 11 fileDownloadUrl: string
12 fps: number 12 fps: number
13 metadata?: FfprobeData 13 metadata?: VideoFileMetadata
14 metadataUrl?: string 14 metadataUrl?: string
15} 15}
diff --git a/shared/models/videos/video.model.ts b/shared/models/videos/video.model.ts
index 0f8822125..557e66e09 100644
--- a/shared/models/videos/video.model.ts
+++ b/shared/models/videos/video.model.ts
@@ -1,11 +1,11 @@
1import { AccountSummary, VideoChannelSummary, VideoState } from '../../index' 1import { Account, AccountSummary } from '../actors'
2import { Account } from '../actors' 2import { VideoChannel, VideoChannelSummary } from './channel/video-channel.model'
3import { VideoChannel } from './channel/video-channel.model' 3import { VideoConstant } from './video-constant.model'
4import { VideoFile } from './video-file.model'
4import { VideoPrivacy } from './video-privacy.enum' 5import { VideoPrivacy } from './video-privacy.enum'
5import { VideoScheduleUpdate } from './video-schedule-update.model' 6import { VideoScheduleUpdate } from './video-schedule-update.model'
6import { VideoConstant } from './video-constant.model' 7import { VideoState } from './video-state.enum'
7import { VideoStreamingPlaylist } from './video-streaming-playlist.model' 8import { VideoStreamingPlaylist } from './video-streaming-playlist.model'
8import { VideoFile } from './video-file.model'
9 9
10export interface Video { 10export interface Video {
11 id: number 11 id: number