diff options
author | Chocobozzz <me@florianbigard.com> | 2023-07-11 09:21:13 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2023-07-11 09:21:13 +0200 |
commit | 784e2ad5c34bcfef36a3f69e9e9acd7cbb3d6428 (patch) | |
tree | 29c46cfd6344065eb805680ed080cb05592ee1d4 /server/lib/object-storage/pre-signed-urls.ts | |
parent | c3030e944ad03c7fd7b5d668a2d88ff03e4cdf19 (diff) | |
download | PeerTube-784e2ad5c34bcfef36a3f69e9e9acd7cbb3d6428.tar.gz PeerTube-784e2ad5c34bcfef36a3f69e9e9acd7cbb3d6428.tar.zst PeerTube-784e2ad5c34bcfef36a3f69e9e9acd7cbb3d6428.zip |
Prefer web videos in favour of webtorrent
Diffstat (limited to 'server/lib/object-storage/pre-signed-urls.ts')
-rw-r--r-- | server/lib/object-storage/pre-signed-urls.ts | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/server/lib/object-storage/pre-signed-urls.ts b/server/lib/object-storage/pre-signed-urls.ts index d8473d01e..313654a57 100644 --- a/server/lib/object-storage/pre-signed-urls.ts +++ b/server/lib/object-storage/pre-signed-urls.ts | |||
@@ -2,9 +2,9 @@ import { GetObjectCommand } from '@aws-sdk/client-s3' | |||
2 | import { getSignedUrl } from '@aws-sdk/s3-request-presigner' | 2 | import { getSignedUrl } from '@aws-sdk/s3-request-presigner' |
3 | import { CONFIG } from '@server/initializers/config' | 3 | import { CONFIG } from '@server/initializers/config' |
4 | import { MStreamingPlaylistVideo, MVideoFile } from '@server/types/models' | 4 | import { MStreamingPlaylistVideo, MVideoFile } from '@server/types/models' |
5 | import { generateHLSObjectStorageKey, generateWebTorrentObjectStorageKey } from './keys' | 5 | import { generateHLSObjectStorageKey, generateWebVideoObjectStorageKey } from './keys' |
6 | import { buildKey, getClient } from './shared' | 6 | import { buildKey, getClient } from './shared' |
7 | import { getHLSPublicFileUrl, getWebTorrentPublicFileUrl } from './urls' | 7 | import { getHLSPublicFileUrl, getWebVideoPublicFileUrl } from './urls' |
8 | 8 | ||
9 | export async function generateWebVideoPresignedUrl (options: { | 9 | export async function generateWebVideoPresignedUrl (options: { |
10 | file: MVideoFile | 10 | file: MVideoFile |
@@ -12,7 +12,7 @@ export async function generateWebVideoPresignedUrl (options: { | |||
12 | }) { | 12 | }) { |
13 | const { file, downloadFilename } = options | 13 | const { file, downloadFilename } = options |
14 | 14 | ||
15 | const key = generateWebTorrentObjectStorageKey(file.filename) | 15 | const key = generateWebVideoObjectStorageKey(file.filename) |
16 | 16 | ||
17 | const command = new GetObjectCommand({ | 17 | const command = new GetObjectCommand({ |
18 | Bucket: CONFIG.OBJECT_STORAGE.VIDEOS.BUCKET_NAME, | 18 | Bucket: CONFIG.OBJECT_STORAGE.VIDEOS.BUCKET_NAME, |
@@ -22,7 +22,7 @@ export async function generateWebVideoPresignedUrl (options: { | |||
22 | 22 | ||
23 | const url = await getSignedUrl(getClient(), command, { expiresIn: 3600 * 24 }) | 23 | const url = await getSignedUrl(getClient(), command, { expiresIn: 3600 * 24 }) |
24 | 24 | ||
25 | return getWebTorrentPublicFileUrl(url) | 25 | return getWebVideoPublicFileUrl(url) |
26 | } | 26 | } |
27 | 27 | ||
28 | export async function generateHLSFilePresignedUrl (options: { | 28 | export async function generateHLSFilePresignedUrl (options: { |