aboutsummaryrefslogtreecommitdiffhomepage
path: root/server/models/video
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2021-12-03 14:40:52 +0100
committerChocobozzz <me@florianbigard.com>2021-12-03 14:40:52 +0100
commit9ea02c48a7a47b5bbed261e847d7d671e266a073 (patch)
tree9aa64f0f6387a7a3162956ce9730a90c0cb6d3f7 /server/models/video
parent6d472b4046084e5f477124b11ac62dca9f6a1a63 (diff)
parent025d858e7997d6b9895fa6b7beaf23bf5ff814af (diff)
downloadPeerTube-9ea02c48a7a47b5bbed261e847d7d671e266a073.tar.gz
PeerTube-9ea02c48a7a47b5bbed261e847d7d671e266a073.tar.zst
PeerTube-9ea02c48a7a47b5bbed261e847d7d671e266a073.zip
Merge branch 'release/4.0.0' into develop
Diffstat (limited to 'server/models/video')
-rw-r--r--server/models/video/video-job-info.ts6
1 files changed, 4 insertions, 2 deletions
diff --git a/server/models/video/video-job-info.ts b/server/models/video/video-job-info.ts
index cb1f3f2f0..7da5128d7 100644
--- a/server/models/video/video-job-info.ts
+++ b/server/models/video/video-job-info.ts
@@ -3,6 +3,8 @@ import { AllowNull, BelongsTo, Column, CreatedAt, Default, ForeignKey, IsInt, Mo
3import { AttributesOnly } from '@shared/core-utils' 3import { AttributesOnly } from '@shared/core-utils'
4import { VideoModel } from './video' 4import { VideoModel } from './video'
5 5
6export type VideoJobInfoColumnType = 'pendingMove' | 'pendingTranscode'
7
6@Table({ 8@Table({
7 tableName: 'videoJobInfo', 9 tableName: 'videoJobInfo',
8 indexes: [ 10 indexes: [
@@ -57,7 +59,7 @@ export class VideoJobInfoModel extends Model<Partial<AttributesOnly<VideoJobInfo
57 return VideoJobInfoModel.findOne({ where, transaction }) 59 return VideoJobInfoModel.findOne({ where, transaction })
58 } 60 }
59 61
60 static async increaseOrCreate (videoUUID: string, column: 'pendingMove' | 'pendingTranscode'): Promise<number> { 62 static async increaseOrCreate (videoUUID: string, column: VideoJobInfoColumnType): Promise<number> {
61 const options = { type: QueryTypes.SELECT as QueryTypes.SELECT, bind: { videoUUID } } 63 const options = { type: QueryTypes.SELECT as QueryTypes.SELECT, bind: { videoUUID } }
62 64
63 const [ { pendingMove } ] = await VideoJobInfoModel.sequelize.query<{ pendingMove: number }>(` 65 const [ { pendingMove } ] = await VideoJobInfoModel.sequelize.query<{ pendingMove: number }>(`
@@ -79,7 +81,7 @@ export class VideoJobInfoModel extends Model<Partial<AttributesOnly<VideoJobInfo
79 return pendingMove 81 return pendingMove
80 } 82 }
81 83
82 static async decrease (videoUUID: string, column: 'pendingMove' | 'pendingTranscode'): Promise<number> { 84 static async decrease (videoUUID: string, column: VideoJobInfoColumnType): Promise<number> {
83 const options = { type: QueryTypes.SELECT as QueryTypes.SELECT, bind: { videoUUID } } 85 const options = { type: QueryTypes.SELECT as QueryTypes.SELECT, bind: { videoUUID } }
84 86
85 const [ { pendingMove } ] = await VideoJobInfoModel.sequelize.query<{ pendingMove: number }>(` 87 const [ { pendingMove } ] = await VideoJobInfoModel.sequelize.query<{ pendingMove: number }>(`