aboutsummaryrefslogtreecommitdiffhomepage
path: root/server/lib
diff options
context:
space:
mode:
Diffstat (limited to 'server/lib')
-rw-r--r--server/lib/activitypub/videos.ts3
-rw-r--r--server/lib/video-transcoding.ts3
2 files changed, 2 insertions, 4 deletions
diff --git a/server/lib/activitypub/videos.ts b/server/lib/activitypub/videos.ts
index 452e43c8c..62f589272 100644
--- a/server/lib/activitypub/videos.ts
+++ b/server/lib/activitypub/videos.ts
@@ -9,13 +9,12 @@ import {
9 ActivityPlaylistUrlObject, 9 ActivityPlaylistUrlObject,
10 ActivityTagObject, 10 ActivityTagObject,
11 ActivityUrlObject, 11 ActivityUrlObject,
12 ActivityVideoFileMetadataObject,
13 ActivityVideoUrlObject, 12 ActivityVideoUrlObject,
14 VideoState 13 VideoState
15} from '../../../shared/index' 14} from '../../../shared/index'
16import { VideoTorrentObject } from '../../../shared/models/activitypub/objects' 15import { VideoTorrentObject } from '../../../shared/models/activitypub/objects'
17import { VideoPrivacy } from '../../../shared/models/videos' 16import { VideoPrivacy } from '../../../shared/models/videos'
18import { sanitizeAndCheckVideoTorrentObject, isAPVideoFileMetadataObject } from '../../helpers/custom-validators/activitypub/videos' 17import { isAPVideoFileMetadataObject, sanitizeAndCheckVideoTorrentObject } from '../../helpers/custom-validators/activitypub/videos'
19import { isVideoFileInfoHashValid } from '../../helpers/custom-validators/videos' 18import { isVideoFileInfoHashValid } from '../../helpers/custom-validators/videos'
20import { deleteNonExistingModels, resetSequelizeInstance, retryTransactionWrapper } from '../../helpers/database-utils' 19import { deleteNonExistingModels, resetSequelizeInstance, retryTransactionWrapper } from '../../helpers/database-utils'
21import { logger } from '../../helpers/logger' 20import { logger } from '../../helpers/logger'
diff --git a/server/lib/video-transcoding.ts b/server/lib/video-transcoding.ts
index bde4c2633..ab1e917f3 100644
--- a/server/lib/video-transcoding.ts
+++ b/server/lib/video-transcoding.ts
@@ -2,8 +2,8 @@ import { HLS_STREAMING_PLAYLIST_DIRECTORY, P2P_MEDIA_LOADER_PEER_VERSION, WEBSER
2import { basename, extname as extnameUtil, join } from 'path' 2import { basename, extname as extnameUtil, join } from 'path'
3import { 3import {
4 canDoQuickTranscode, 4 canDoQuickTranscode,
5 getMetadataFromFile,
6 getDurationFromVideoFile, 5 getDurationFromVideoFile,
6 getMetadataFromFile,
7 getVideoFileFPS, 7 getVideoFileFPS,
8 transcode, 8 transcode,
9 TranscodeOptions, 9 TranscodeOptions,
@@ -20,7 +20,6 @@ import { CONFIG } from '../initializers/config'
20import { MStreamingPlaylistFilesVideo, MVideoFile, MVideoWithAllFiles, MVideoWithFile } from '@server/typings/models' 20import { MStreamingPlaylistFilesVideo, MVideoFile, MVideoWithAllFiles, MVideoWithFile } from '@server/typings/models'
21import { createTorrentAndSetInfoHash } from '@server/helpers/webtorrent' 21import { createTorrentAndSetInfoHash } from '@server/helpers/webtorrent'
22import { generateVideoStreamingPlaylistName, getVideoFilename, getVideoFilePath } from './video-paths' 22import { generateVideoStreamingPlaylistName, getVideoFilename, getVideoFilePath } from './video-paths'
23import { extractVideo } from './videos'
24 23
25/** 24/**
26 * Optimize the original video file and replace it. The resolution is not changed. 25 * Optimize the original video file and replace it. The resolution is not changed.