OpenCloud
/
PeerTube
mirror of https://github.com/Chocobozzz/PeerTube
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix prune storage tests

pull/4197/head
Chocobozzz 2021-06-17 11:09:54 +02:00
parent 29b7426c67
commit 52fb1d97ba
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
server/lib/activitypub/playlists/create-update.ts
View File

@ -6,7 +6,7 @@ import { updatePlaylistMiniatureFromUrl } from '@server/lib/thumbnail'
import { VideoPlaylistModel } from '@server/models/video/video-playlist'
import { VideoPlaylistElementModel } from '@server/models/video/video-playlist-element'
import { FilteredModelAttributes } from '@server/types'
import { MAccountDefault, MAccountId, MVideoPlaylist, MVideoPlaylistFull } from '@server/types/models'
import { MAccountDefault, MAccountId, MThumbnail, MVideoPlaylist, MVideoPlaylistFull } from '@server/types/models'
import { AttributesOnly } from '@shared/core-utils'
import { PlaylistObject } from '@shared/models'
import { getOrCreateAPActor } from '../actors'
@ -54,11 +54,7 @@ async function createOrUpdateVideoPlaylist (playlistObject: PlaylistObject, byAc
// Refetch playlist from DB since elements fetching could be long in time
const playlist = await VideoPlaylistModel.loadWithAccountAndChannel(upsertPlaylist.id, null)
try {
await updatePlaylistThumbnail(playlistObject, playlist)
} catch (err) {
logger.warn('Cannot update thumbnail of %s.', playlistObject.id, { err, ...lTags(playlistObject.id, playlist.uuid, playlist.url) })
}
await updatePlaylistThumbnail(playlistObject, playlist)
return rebuildVideoPlaylistElements(playlistElementUrls, playlist)
}
@ -98,8 +94,16 @@ async function fetchElementUrls (playlistObject: PlaylistObject) {
async function updatePlaylistThumbnail (playlistObject: PlaylistObject, playlist: MVideoPlaylistFull) {
if (playlistObject.icon) {
const thumbnailModel = await updatePlaylistMiniatureFromUrl({ downloadUrl: playlistObject.icon.url, playlist })
await playlist.setAndSaveThumbnail(thumbnailModel, undefined)
let thumbnailModel: MThumbnail
try {
thumbnailModel = await updatePlaylistMiniatureFromUrl({ downloadUrl: playlistObject.icon.url, playlist })
await playlist.setAndSaveThumbnail(thumbnailModel, undefined)
} catch (err) {
logger.warn('Cannot set thumbnail of %s.', playlistObject.id, { err, ...lTags(playlistObject.id, playlist.uuid, playlist.url) })
if (thumbnailModel) await thumbnailModel.removeThumbnail()
}
return
}

4
server/tests/cli/prune-storage.ts
View File

@ -12,6 +12,7 @@ import {
flushAndRunMultipleServers,
getAccount,
getEnvCli,
killallServers,
makeGetRequest,
ServerInfo,
setAccessTokensToServers,
@ -116,6 +117,9 @@ describe('Test prune storage scripts', function () {
await wait(1000)
await waitJobs(servers)
killallServers(servers)
await wait(1000)
})
it('Should have the files on the disk', async function () {