forks/peertube
1
0
Fork 0
Code Releases Activity

Fix redundancy with videos already duplicated with another instance

Browse source
This commit is contained in:
Chocobozzz 2018-10-01 09:41:48 +02:00
parent 8b917537af
commit 46f8d69b4e
No known key found for this signature in database
GPG key ID: 583A612D890159BE
3 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
server/lib/schedulers/videos-redundancy-scheduler.ts
View file

@ -109,7 +109,7 @@ export class VideosRedundancyScheduler extends AbstractScheduler {
const serverActor = await getServerActor() const serverActor = await getServerActor()
for (const file of filesToDuplicate) { for (const file of filesToDuplicate) {
const existing = await VideoRedundancyModel.loadByFileId(file.id) const existing = await VideoRedundancyModel.loadLocalByFileId(file.id)
if (existing) { if (existing) {
await this.extendsExpirationOf(existing, redundancy.minLifetime) await this.extendsExpirationOf(existing, redundancy.minLifetime)

2
server/middlewares/validators/redundancy.ts
View file

@ -37,7 +37,7 @@ const videoRedundancyGetValidator = [
if (!videoFile) return res.status(404).json({ error: 'Video file not found.' }) if (!videoFile) return res.status(404).json({ error: 'Video file not found.' })
res.locals.videoFile = videoFile res.locals.videoFile = videoFile
const videoRedundancy = await VideoRedundancyModel.loadByFileId(videoFile.id) const videoRedundancy = await VideoRedundancyModel.loadLocalByFileId(videoFile.id)
if (!videoRedundancy)return res.status(404).json({ error: 'Video redundancy not found.' }) if (!videoRedundancy)return res.status(404).json({ error: 'Video redundancy not found.' })
res.locals.videoRedundancy = videoRedundancy res.locals.videoRedundancy = videoRedundancy

5
server/models/redundancy/video-redundancy.ts
View file

@ -125,9 +125,12 @@ export class VideoRedundancyModel extends Model<VideoRedundancyModel> {
return instance.VideoFile.Video.removeFile(instance.VideoFile) return instance.VideoFile.Video.removeFile(instance.VideoFile)
} }
static loadByFileId (videoFileId: number) { static async loadLocalByFileId (videoFileId: number) {
const actor = await getServerActor()
const query = { const query = {
where: { where: {
actorId: actor.id,
videoFileId videoFileId
} }
} }