forks/peertube
1
0
Fork 0
Code Releases Activity

Fix live state on user archive import

Browse source
This commit is contained in:
Chocobozzz 2024-03-12 11:11:53 +01:00
parent 46950fbcc8
commit 0f67adf98a
No known key found for this signature in database
GPG key ID: 583A612D890159BE
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
packages/tests/src/api/users/user-import.ts
View file

@ -14,7 +14,8 @@ import {
VideoCreateResult, VideoCreateResult,
VideoPlaylistPrivacy, VideoPlaylistPrivacy,
VideoPlaylistType, VideoPlaylistType,
VideoPrivacy VideoPrivacy,
VideoState
} from '@peertube/peertube-models' } from '@peertube/peertube-models'
import { prepareImportExportTests } from '@tests/shared/import-export.js' import { prepareImportExportTests } from '@tests/shared/import-export.js'
import { areMockObjectStorageTestsDisabled } from '@peertube/peertube-node-utils' import { areMockObjectStorageTestsDisabled } from '@peertube/peertube-node-utils'
@ -466,6 +467,8 @@ function runTest (withObjectStorage: boolean) {
expect(video.duration).to.equal(0) expect(video.duration).to.equal(0)
expect(video.files).to.have.lengthOf(0) expect(video.files).to.have.lengthOf(0)
expect(video.streamingPlaylists).to.have.lengthOf(0) expect(video.streamingPlaylists).to.have.lengthOf(0)
expect(video.state.id).to.equal(VideoState.WAITING_FOR_LIVE)
} }
}) })

6
server/core/lib/user-import-export/importers/videos-importer.ts
View file

@ -1,4 +1,4 @@
import { LiveVideoLatencyMode, ThumbnailType, VideoExportJSON, VideoPrivacy } from '@peertube/peertube-models' import { LiveVideoLatencyMode, ThumbnailType, VideoExportJSON, VideoPrivacy, VideoState } from '@peertube/peertube-models'
import { logger, loggerTagsFactory } from '@server/helpers/logger.js' import { logger, loggerTagsFactory } from '@server/helpers/logger.js'
import { Hooks } from '@server/lib/plugins/hooks.js' import { Hooks } from '@server/lib/plugins/hooks.js'
import { buildNextVideoState } from '@server/lib/video-state.js' import { buildNextVideoState } from '@server/lib/video-state.js'
@ -207,7 +207,9 @@ export class VideosImporter extends AbstractUserImporter <VideoExportJSON, Impor
videoPasswords: videoImportData.passwords, videoPasswords: videoImportData.passwords,
duration, duration,
filename: videoImportData.source?.filename, filename: videoImportData.source?.filename,
state: buildNextVideoState() state: videoImportData.isLive
? VideoState.WAITING_FOR_LIVE
: buildNextVideoState()
}, },
liveAttributes: videoImportData.live, liveAttributes: videoImportData.live,