aboutsummaryrefslogtreecommitdiffhomepage
path: root/server/lib
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2021-02-18 14:06:12 +0100
committerChocobozzz <me@florianbigard.com>2021-02-18 14:08:16 +0100
commit53c06121a45a2ec943002833a0152bbfd4856ee4 (patch)
treee934d6ac102d5f7b29fe3316f57d6d2164aceeb9 /server/lib
parent8efc27bf14f1fe3ed23cd8a6d2de1f0918a7f769 (diff)
downloadPeerTube-53c06121a45a2ec943002833a0152bbfd4856ee4.tar.gz
PeerTube-53c06121a45a2ec943002833a0152bbfd4856ee4.tar.zst
PeerTube-53c06121a45a2ec943002833a0152bbfd4856ee4.zip
Fix import tests
Diffstat (limited to 'server/lib')
-rw-r--r--server/lib/thumbnail.ts2
-rw-r--r--server/lib/video-paths.ts4
2 files changed, 3 insertions, 3 deletions
diff --git a/server/lib/thumbnail.ts b/server/lib/thumbnail.ts
index e37aefc85..06066f910 100644
--- a/server/lib/thumbnail.ts
+++ b/server/lib/thumbnail.ts
@@ -74,7 +74,7 @@ function createVideoMiniatureFromUrl (options: {
74 ? existingThumbnail.fileUrl 74 ? existingThumbnail.fileUrl
75 : null 75 : null
76 76
77 // If the thumbnail URL did not change and has a unique filename (introduced in 3.2), avoid thumbnail processing 77 // If the thumbnail URL did not change and has a unique filename (introduced in 3.1), avoid thumbnail processing
78 const thumbnailUrlChanged = !existingUrl || existingUrl !== downloadUrl || downloadUrl.endsWith(`${video.uuid}.jpg`) 78 const thumbnailUrlChanged = !existingUrl || existingUrl !== downloadUrl || downloadUrl.endsWith(`${video.uuid}.jpg`)
79 79
80 // Do not change the thumbnail filename if the file did not change 80 // Do not change the thumbnail filename if the file did not change
diff --git a/server/lib/video-paths.ts b/server/lib/video-paths.ts
index 0385e89cc..1708c479a 100644
--- a/server/lib/video-paths.ts
+++ b/server/lib/video-paths.ts
@@ -9,7 +9,7 @@ import { isStreamingPlaylist, MStreamingPlaylist, MStreamingPlaylistVideo, MVide
9function generateVideoFilename (videoOrPlaylist: MVideo | MStreamingPlaylistVideo, isHls: boolean, resolution: number, extname: string) { 9function generateVideoFilename (videoOrPlaylist: MVideo | MStreamingPlaylistVideo, isHls: boolean, resolution: number, extname: string) {
10 const video = extractVideo(videoOrPlaylist) 10 const video = extractVideo(videoOrPlaylist)
11 11
12 // FIXME: use a generated uuid instead, that will break compatibility with PeerTube < 3.2 12 // FIXME: use a generated uuid instead, that will break compatibility with PeerTube < 3.1
13 // const uuid = uuidv4() 13 // const uuid = uuidv4()
14 const uuid = video.uuid 14 const uuid = video.uuid
15 15
@@ -69,7 +69,7 @@ function generateTorrentFileName (videoOrPlaylist: MVideo | MStreamingPlaylistVi
69 const video = extractVideo(videoOrPlaylist) 69 const video = extractVideo(videoOrPlaylist)
70 const extension = '.torrent' 70 const extension = '.torrent'
71 71
72 // FIXME: use a generated uuid instead, that will break compatibility with PeerTube < 3.2 72 // FIXME: use a generated uuid instead, that will break compatibility with PeerTube < 3.1
73 // const uuid = uuidv4() 73 // const uuid = uuidv4()
74 const uuid = video.uuid 74 const uuid = video.uuid
75 75