IntenseWebs/PeerTube
3
0
Fork 0
mirror of https://github.com/Chocobozzz/PeerTube.git synced 2024-11-25 10:10:31 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix total video file size

Browse Source
This commit is contained in:
Chocobozzz 2024-04-22 11:48:05 +02:00
parent da949376db
commit bce0f2f11b
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
4 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
client/src/app/+admin/overview/videos/video-list.component.ts
View File

@ -216,7 +216,10 @@ export class VideoListComponent extends RestTable <Video> implements OnInit {
getFilesSize (video: Video) { getFilesSize (video: Video) {
let total = getAllFiles(video).reduce((p, f) => p += f.size, 0) let total = getAllFiles(video).reduce((p, f) => p += f.size, 0)
total += video.videoSource?.size || 0
if (video.videoSource?.fileDownloadUrl) {
total += video.videoSource.size || 0
}
return total return total
} }

16
packages/tests/src/api/videos/video-source.ts
View File

@ -165,15 +165,17 @@ describe('Test video source management', function () {
expect(data[1].videoSource.fileDownloadUrl).to.exist expect(data[1].videoSource.fileDownloadUrl).to.exist
expect(data[2].videoSource).to.exist expect(data[2].videoSource).to.exist
expect(data[2].videoSource.fileDownloadUrl).to.not.exist expect(data[2].videoSource.fileDownloadUrl).to.not.exist
expect(data[2].videoSource.createdAt).to.exist expect(data[2].videoSource.createdAt).to.exist
expect(data[2].videoSource.fps).to.be.null expect(data[2].videoSource.fps).to.to.exist
expect(data[2].videoSource.height).to.be.null expect(data[2].videoSource.height).to.to.exist
expect(data[2].videoSource.width).to.be.null expect(data[2].videoSource.width).to.to.exist
expect(data[2].videoSource.resolution.id).to.be.null expect(data[2].videoSource.resolution.id).to.to.exist
expect(data[2].videoSource.resolution.label).to.be.null expect(data[2].videoSource.resolution.label).to.to.exist
expect(data[2].videoSource.size).to.be.null expect(data[2].videoSource.size).to.to.exist
expect(data[2].videoSource.metadata).to.be.null expect(data[2].videoSource.metadata).to.to.exist
}) })
it('Should delete all videos and do not have original files anymore', async function () { it('Should delete all videos and do not have original files anymore', async function () {

8
server/core/controllers/api/videos/source.ts
View File

@ -68,12 +68,8 @@ async function deleteVideoLatestSourceFile (req: express.Request, res: express.R
await video.removeOriginalFile(videoSource) await video.removeOriginalFile(videoSource)
videoSource.keptOriginalFilename = null videoSource.keptOriginalFilename = null
videoSource.fps = null videoSource.storage = null
videoSource.resolution = null
videoSource.width = null
videoSource.height = null
videoSource.metadata = null
videoSource.size = null
await videoSource.save() await videoSource.save()
return res.sendStatus(HttpStatusCode.NO_CONTENT_204) return res.sendStatus(HttpStatusCode.NO_CONTENT_204)

12
server/core/models/video/sql/video/videos-id-list-query-builder.ts
View File

@ -701,12 +701,16 @@ export class VideosIdListQueryBuilder extends AbstractRunQuery {
'ELSE (' + 'ELSE (' +
'(SELECT COALESCE(SUM(size), 0) FROM "videoFile" WHERE "videoFile"."videoId" = "video"."id")' + '(SELECT COALESCE(SUM(size), 0) FROM "videoFile" WHERE "videoFile"."videoId" = "video"."id")' +
' + ' + ' + ' +
'(SELECT COALESCE(SUM(size), 0) FROM "videoFile" ' + '(' +
'INNER JOIN "videoStreamingPlaylist" ON "videoStreamingPlaylist"."id" = "videoFile"."videoStreamingPlaylistId" ' + 'SELECT COALESCE(SUM(size), 0) FROM "videoFile" ' +
'AND "videoStreamingPlaylist"."videoId" = "video"."id"' + 'INNER JOIN "videoStreamingPlaylist" ON "videoStreamingPlaylist"."id" = "videoFile"."videoStreamingPlaylistId" ' +
'AND "videoStreamingPlaylist"."videoId" = "video"."id"' +
')' + ')' +
' + ' + ' + ' +
'(SELECT COALESCE(SUM(size), 0) FROM "videoSource" WHERE "videoSource"."videoId" = "video"."id")' + '(' +
'SELECT COALESCE(SUM(size), 0) FROM "videoSource" ' +
'WHERE "videoSource"."videoId" = "video"."id" AND "videoSource"."storage" IS NOT NULL' +
')' +
') END' + ') END' +
') AS "localVideoFilesSize"' ') AS "localVideoFilesSize"'
) )