aboutsummaryrefslogtreecommitdiffhomepage
path: root/server/models
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2021-06-09 16:22:01 +0200
committerChocobozzz <me@florianbigard.com>2021-06-09 16:22:01 +0200
commit57a0a9cde4760314d9b1fdd920e0b4a180a9925e (patch)
tree97274952d05fa4ce88ed1629e0977c797ba7dd35 /server/models
parent4ead40e7766f5964ecd9a11766ff56b95090fe1c (diff)
downloadPeerTube-57a0a9cde4760314d9b1fdd920e0b4a180a9925e.tar.gz
PeerTube-57a0a9cde4760314d9b1fdd920e0b4a180a9925e.tar.zst
PeerTube-57a0a9cde4760314d9b1fdd920e0b4a180a9925e.zip
Optimize AP video captions update
Diffstat (limited to 'server/models')
-rw-r--r--server/models/video/video-caption.ts19
1 files changed, 14 insertions, 5 deletions
diff --git a/server/models/video/video-caption.ts b/server/models/video/video-caption.ts
index d2c742b66..b4918e519 100644
--- a/server/models/video/video-caption.ts
+++ b/server/models/video/video-caption.ts
@@ -109,11 +109,12 @@ export class VideoCaptionModel extends Model<Partial<AttributesOnly<VideoCaption
109 return undefined 109 return undefined
110 } 110 }
111 111
112 static loadByVideoIdAndLanguage (videoId: string | number, language: string): Promise<MVideoCaptionVideo> { 112 static loadByVideoIdAndLanguage (videoId: string | number, language: string, transaction?: Transaction): Promise<MVideoCaptionVideo> {
113 const videoInclude = { 113 const videoInclude = {
114 model: VideoModel.unscoped(), 114 model: VideoModel.unscoped(),
115 attributes: [ 'id', 'remote', 'uuid' ], 115 attributes: [ 'id', 'remote', 'uuid' ],
116 where: buildWhereIdOrUUID(videoId) 116 where: buildWhereIdOrUUID(videoId),
117 transaction
117 } 118 }
118 119
119 const query = { 120 const query = {
@@ -145,19 +146,21 @@ export class VideoCaptionModel extends Model<Partial<AttributesOnly<VideoCaption
145 } 146 }
146 147
147 static async insertOrReplaceLanguage (caption: MVideoCaption, transaction: Transaction) { 148 static async insertOrReplaceLanguage (caption: MVideoCaption, transaction: Transaction) {
148 const existing = await VideoCaptionModel.loadByVideoIdAndLanguage(caption.videoId, caption.language) 149 const existing = await VideoCaptionModel.loadByVideoIdAndLanguage(caption.videoId, caption.language, transaction)
150
149 // Delete existing file 151 // Delete existing file
150 if (existing) await existing.destroy({ transaction }) 152 if (existing) await existing.destroy({ transaction })
151 153
152 return caption.save({ transaction }) 154 return caption.save({ transaction })
153 } 155 }
154 156
155 static listVideoCaptions (videoId: number): Promise<MVideoCaptionVideo[]> { 157 static listVideoCaptions (videoId: number, transaction: Transaction): Promise<MVideoCaptionVideo[]> {
156 const query = { 158 const query = {
157 order: [ [ 'language', 'ASC' ] ] as OrderItem[], 159 order: [ [ 'language', 'ASC' ] ] as OrderItem[],
158 where: { 160 where: {
159 videoId 161 videoId
160 } 162 },
163 transaction
161 } 164 }
162 165
163 return VideoCaptionModel.scope(ScopeNames.WITH_VIDEO_UUID_AND_REMOTE).findAll(query) 166 return VideoCaptionModel.scope(ScopeNames.WITH_VIDEO_UUID_AND_REMOTE).findAll(query)
@@ -211,4 +214,10 @@ export class VideoCaptionModel extends Model<Partial<AttributesOnly<VideoCaption
211 214
212 return this.fileUrl 215 return this.fileUrl
213 } 216 }
217
218 isEqual (this: MVideoCaption, other: MVideoCaption) {
219 if (this.fileUrl) return this.fileUrl === other.fileUrl
220
221 return this.filename === other.filename
222 }
214} 223}