10 files changed, 58 insertions, 5 deletions

diff --git a/shared/models/activitypub/objects/common-objects.ts b/shared/models/activitypub/objects/common-objects.ts
index 3127d0565..5b2b3adae 100644
--- a/shared/models/activitypub/objects/common-objects.ts
+++ b/shared/models/activitypub/objects/common-objects.ts
@@ -22,7 +22,9 @@ export interface ActivityUrlObject {
   mimeType: 'video/mp4' | 'video/webm' | 'application/x-bittorrent' | 'application/x-bittorrent;x-scheme-handler/magnet'
   href: string
   width: number
+
   size?: number
+  fps?: number
 }
 
 export interface ActivityPubAttributedTo {
diff --git a/shared/models/i18n/i18n.ts b/shared/models/i18n/i18n.ts
index 3f2ca4eaf..baf3fa0f4 100644
--- a/shared/models/i18n/i18n.ts
+++ b/shared/models/i18n/i18n.ts
@@ -6,7 +6,10 @@ export const I18N_LOCALES = {
   'eu-ES': 'euskara',
   'ca-ES': 'català',
   'cs-CZ': 'čeština',
-  'eo': 'Esperanto'
+  'eo': 'Esperanto',
+  'de-DE': 'Deutsch',
+  'es-ES': 'español',
+  'zh-Hant-TW': '中文 (繁體, 台灣)'
   // 'pl-PL': 'polski'
 }
 
@@ -15,7 +18,9 @@ const I18N_LOCALE_ALIAS = {
   'fr': 'fr-FR',
   'eu': 'eu-ES',
   'ca': 'ca-ES',
-  'cs': 'cs-CZ'
+  'cs': 'cs-CZ',
+  'de': 'de-DE',
+  'es': 'es-ES'
   // 'pl': 'pl-PL'
 }
 
@@ -56,5 +61,5 @@ export function getShortLocale (locale: string) {
 export function buildFileLocale (locale: string) {
   const completeLocale = getCompleteLocale(locale)
 
-  return completeLocale.replace('-', '_')
+  return completeLocale.replace(/-/g, '_')
 }
diff --git a/shared/models/server/custom-config.model.ts b/shared/models/server/custom-config.model.ts
index 9c4718e43..46320435d 100644
--- a/shared/models/server/custom-config.model.ts
+++ b/shared/models/server/custom-config.model.ts
@@ -55,4 +55,12 @@ export interface CustomConfig {
       '1080p': boolean
     }
   }
+
+  import: {
+    videos: {
+      http: {
+        enabled: boolean
+      }
+    }
+  }
 }
diff --git a/shared/models/server/job.model.ts b/shared/models/server/job.model.ts
index a38a8aa3b..2565479f6 100644
--- a/shared/models/server/job.model.ts
+++ b/shared/models/server/job.model.ts
@@ -6,7 +6,8 @@ export type JobType = 'activitypub-http-unicast' |
   'activitypub-follow' |
   'video-file-import' |
   'video-file' |
-  'email'
+  'email' |
+  'video-import'
 
 export interface Job {
   id: number
diff --git a/shared/models/server/server-config.model.ts b/shared/models/server/server-config.model.ts
index 217d142cd..2cafedbbc 100644
--- a/shared/models/server/server-config.model.ts
+++ b/shared/models/server/server-config.model.ts
@@ -23,6 +23,14 @@ export interface ServerConfig {
     enabledResolutions: number[]
   }
 
+  import: {
+    videos: {
+      http: {
+        enabled: boolean
+      }
+    }
+  }
+
   avatar: {
     file: {
       size: {
diff --git a/shared/models/videos/index.ts b/shared/models/videos/index.ts
index cb9669772..17cf8be24 100644
--- a/shared/models/videos/index.ts
+++ b/shared/models/videos/index.ts
@@ -15,4 +15,7 @@ export * from './video-update.model'
 export * from './video.model'
 export * from './video-state.enum'
 export * from './video-caption-update.model'
+export * from './video-import-create.model'
+export * from './video-import-state.enum'
+export * from './video-import.model'
 export { VideoConstant } from './video-constant.model'
diff --git a/shared/models/videos/video-import-create.model.ts b/shared/models/videos/video-import-create.model.ts
new file mode 100644
index 000000000..65d142c2b
--- /dev/null
+++ b/shared/models/videos/video-import-create.model.ts
@@ -0,0 +1,6 @@
+import { VideoUpdate } from './video-update.model'
+
+export interface VideoImportCreate extends VideoUpdate {
+  targetUrl: string
+  channelId: number // Required
+}
diff --git a/shared/models/videos/video-import-state.enum.ts b/shared/models/videos/video-import-state.enum.ts
new file mode 100644
index 000000000..b178fbf3a
--- /dev/null
+++ b/shared/models/videos/video-import-state.enum.ts
@@ -0,0 +1,5 @@
+export enum VideoImportState {
+  PENDING = 1,
+  SUCCESS = 2,
+  FAILED = 3
+}
diff --git a/shared/models/videos/video-import.model.ts b/shared/models/videos/video-import.model.ts
new file mode 100644
index 000000000..a5c582c67
--- /dev/null
+++ b/shared/models/videos/video-import.model.ts
@@ -0,0 +1,14 @@
+import { Video } from './video.model'
+import { VideoConstant } from './video-constant.model'
+import { VideoImportState } from './video-import-state.enum'
+
+export interface VideoImport {
+  id: number
+  targetUrl: string
+  createdAt: string
+  updatedAt: string
+  state: VideoConstant<VideoImportState>
+  error?: string
+
+  video?: Video & { tags: string[] }
+}
diff --git a/shared/models/videos/video-state.enum.ts b/shared/models/videos/video-state.enum.ts
index 625aefae1..a50e14e4b 100644
--- a/shared/models/videos/video-state.enum.ts
+++ b/shared/models/videos/video-state.enum.ts
@@ -1,4 +1,5 @@
 export enum VideoState {
   PUBLISHED = 1,
-  TO_TRANSCODE = 2
+  TO_TRANSCODE = 2,
+  TO_IMPORT = 3
 }