diff options
| author | Chocobozzz <me@florianbigard.com> | 2021-07-21 15:51:30 +0200 |
|---|---|---|
| committer | Chocobozzz <me@florianbigard.com> | 2021-07-21 15:51:30 +0200 |
| commit | a24bd1ed41b43790bab6ba789580bb4e85f07d85 (patch) | |
| tree | a54b0f6c921ba83a6e909cd0ced325b2d4b8863c /server/controllers/download.ts | |
| parent | 5f26f13b3c16ac5ae0a3b0a7142d84a9528cf565 (diff) | |
| parent | c63830f15403ac4e750829f27d8bbbdc9a59282c (diff) | |
| download | PeerTube-a24bd1ed41b43790bab6ba789580bb4e85f07d85.tar.gz PeerTube-a24bd1ed41b43790bab6ba789580bb4e85f07d85.tar.zst PeerTube-a24bd1ed41b43790bab6ba789580bb4e85f07d85.zip | |
Merge branch 'next' into develop
Diffstat (limited to 'server/controllers/download.ts')
| -rw-r--r-- | server/controllers/download.ts | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/server/controllers/download.ts b/server/controllers/download.ts index 4293a32e2..ddacc1b68 100644 --- a/server/controllers/download.ts +++ b/server/controllers/download.ts | |||
| @@ -5,8 +5,7 @@ import { VideosTorrentCache } from '@server/lib/files-cache/videos-torrent-cache | |||
| 5 | import { Hooks } from '@server/lib/plugins/hooks' | 5 | import { Hooks } from '@server/lib/plugins/hooks' |
| 6 | import { getVideoFilePath } from '@server/lib/video-paths' | 6 | import { getVideoFilePath } from '@server/lib/video-paths' |
| 7 | import { MStreamingPlaylist, MVideo, MVideoFile, MVideoFullLight } from '@server/types/models' | 7 | import { MStreamingPlaylist, MVideo, MVideoFile, MVideoFullLight } from '@server/types/models' |
| 8 | import { HttpStatusCode } from '@shared/core-utils/miscs/http-error-codes' | 8 | import { HttpStatusCode, VideoStreamingPlaylistType } from '@shared/models' |
| 9 | import { VideoStreamingPlaylistType } from '@shared/models' | ||
| 10 | import { STATIC_DOWNLOAD_PATHS } from '../initializers/constants' | 9 | import { STATIC_DOWNLOAD_PATHS } from '../initializers/constants' |
| 11 | import { asyncMiddleware, videosDownloadValidator } from '../middlewares' | 10 | import { asyncMiddleware, videosDownloadValidator } from '../middlewares' |
| 12 | 11 | ||