Skip to content

ActivityPub-federated video streaming platform using P2P directly in your web browser

Add ability to retry a cancelled import

Chocobozzza1b60d7403e8
diff --git a/client/src/app/+my-library/my-video-imports/my-video-imports.component.ts b/client/src/app/+my-library/my-video-imports/my-video-imports.component.ts
index b28bfd62ef..b8582bddc9 100644
--- a/client/src/app/+my-library/my-video-imports/my-video-imports.component.ts
+++ b/client/src/app/+my-library/my-video-imports/my-video-imports.component.ts
@@ -7,7 +7,7 @@ import { PTDatePipe } from '@app/shared/shared-main/common/date.pipe'
import { VideoImportService } from '@app/shared/shared-main/video/video-import.service'
import { Video } from '@app/shared/shared-main/video/video.model'
import { ActorCellComponent } from '@app/shared/shared-tables/actor-cell.component'
-import { VideoImport, VideoImportState, VideoImportStateType } from '@peertube/peertube-models'
+import { RETRYABLE_VIDEO_IMPORT_STATES, VideoImport, VideoImportState, VideoImportStateType } from '@peertube/peertube-models'
import { NumberFormatterPipe } from '../../shared/shared-main/common/number-formatter.pipe'
import { DataLoaderOptionsBase, TableColumnInfo, TableComponent } from '../../shared/shared-tables/table.component'
@@ -129,7 +129,7 @@ export class MyVideoImportsComponent implements OnInit {
label: $localize`Retry import`,
iconName: 'refresh',
handler: videoImport => this.retryImport(videoImport),
- isDisplayed: videoImport => this.isVideoImportFailed(videoImport)
+ isDisplayed: videoImport => RETRYABLE_VIDEO_IMPORT_STATES.includes(videoImport.state.id)
},
{
label: $localize`Delete import task`,
diff --git a/client/src/app/shared/shared-forms/advanced-input-filter.component.ts b/client/src/app/shared/shared-forms/advanced-input-filter.component.ts
index a14062e867..12dc963184 100644
--- a/client/src/app/shared/shared-forms/advanced-input-filter.component.ts
+++ b/client/src/app/shared/shared-forms/advanced-input-filter.component.ts
@@ -241,7 +241,7 @@ export class AdvancedInputFilterComponent<ServiceParameters extends Record<strin
}
setSelectValue (key: string, value: string | undefined) {
- this.filterState.update(s => ({ ...s, [key]: String(value) || undefined }))
+ this.filterState.update(s => ({ ...s, [key]: value ? String(value) : undefined }))
}
// ---------------------------------------------------------------------------
diff --git a/packages/models/src/videos/import/video-import-state.enum.ts b/packages/models/src/videos/import/video-import-state.enum.ts
index 475fdbe66c..d00aa56271 100644
--- a/packages/models/src/videos/import/video-import-state.enum.ts
+++ b/packages/models/src/videos/import/video-import-state.enum.ts
@@ -8,3 +8,5 @@ export const VideoImportState = {
} as const
export type VideoImportStateType = typeof VideoImportState[keyof typeof VideoImportState]
+
+export const RETRYABLE_VIDEO_IMPORT_STATES: VideoImportStateType[] = [ VideoImportState.FAILED, VideoImportState.CANCELLED ]
diff --git a/packages/tests/src/api/check-params/video-imports.ts b/packages/tests/src/api/check-params/video-imports.ts
index cc1b8a5e5e..bd4c390b68 100644
--- a/packages/tests/src/api/check-params/video-imports.ts
+++ b/packages/tests/src/api/check-params/video-imports.ts
@@ -532,6 +532,7 @@ describe('Test video imports API validator', function () {
let sqlCommand: SQLCommand
let importId: number
let successId: number
+ let cancelledId: number
before(async function () {
this.timeout(60000)
@@ -553,6 +554,16 @@ describe('Test video imports API validator', function () {
successId = res.id
}
+ await server.jobs.pauseJobQueue()
+
+ {
+ const res = await server.videoImports.quickImport({ name: 'To retry from cancel', targetUrl: FIXTURE_URLS.goodVideo })
+ cancelledId = res.id
+ }
+
+ await server.videoImports.cancel({ importId: cancelledId })
+ await server.jobs.resumeJobQueue()
+
await waitJobs([ server ])
})
@@ -578,6 +589,12 @@ describe('Test video imports API validator', function () {
await server.videoImports.retry({ importId: successId, expectedStatus: HttpStatusCode.BAD_REQUEST_400 })
})
+ it('Should succeed to retry a cancelled import', async function () {
+ this.timeout(60000)
+
+ await server.videoImports.retry({ importId: cancelledId, token: editorToken })
+ })
+
it('Should succeed to retry', async function () {
await server.videoImports.retry({ importId, token: editorToken })
})
diff --git a/packages/tests/src/api/videos/video-imports.ts b/packages/tests/src/api/videos/video-imports.ts
index b24be016e1..8e8f265ec6 100644
--- a/packages/tests/src/api/videos/video-imports.ts
+++ b/packages/tests/src/api/videos/video-imports.ts
@@ -687,6 +687,34 @@ describe('Test video imports', function () {
expect(video.state.id).to.equal(VideoState.PUBLISHED)
})
+ it('Should retry a cancelled import job', async function () {
+ this.timeout(60_000)
+
+ await server.jobs.pauseJobQueue()
+
+ const cancelledImportId = await importVideo('to retry from cancel')
+ await server.videoImports.cancel({ importId: cancelledImportId })
+
+ await server.jobs.resumeJobQueue()
+ await waitJobs([ server ])
+
+ {
+ const { data } = await server.videoImports.listMyVideoImports({ id: cancelledImportId })
+ expect(data[0].state.id).to.equal(VideoImportState.CANCELLED)
+ }
+
+ await server.videoImports.retry({ importId: cancelledImportId })
+ await waitJobs([ server ])
+
+ {
+ const { data } = await server.videoImports.listMyVideoImports({ id: cancelledImportId })
+ expect(data[0].state.id).to.equal(VideoImportState.SUCCESS)
+
+ const video = await server.videos.getWithToken({ id: data[0].video.id })
+ expect(video.state.id).to.equal(VideoState.PUBLISHED)
+ }
+ })
+
after(async function () {
await sqlCommand?.cleanup()
diff --git a/server/core/middlewares/validators/videos/video-imports.ts b/server/core/middlewares/validators/videos/video-imports.ts
index 3fc5989dc4..b83f6c23af 100644
--- a/server/core/middlewares/validators/videos/video-imports.ts
+++ b/server/core/middlewares/validators/videos/video-imports.ts
@@ -1,5 +1,5 @@
import { forceNumber } from '@peertube/peertube-core-utils'
-import { HttpStatusCode, UserRight, VideoImportCreate, VideoImportState } from '@peertube/peertube-models'
+import { HttpStatusCode, RETRYABLE_VIDEO_IMPORT_STATES, UserRight, VideoImportCreate, VideoImportState } from '@peertube/peertube-models'
import { isResolvingToUnicastOnly } from '@server/helpers/dns.js'
import { isPreImportVideoAccepted } from '@server/lib/moderation.js'
import { Hooks } from '@server/lib/plugins/hooks.js'
@@ -185,10 +185,10 @@ export const videoImportRetryValidator = [
if (!await doesVideoImportExist(forceNumber(req.params.id), res)) return
if (!await checkCanManageImport({ user: res.locals.oauth.token.User, videoImport: res.locals.videoImport, req, res })) return
- if (res.locals.videoImport.state !== VideoImportState.FAILED) {
+ if (!RETRYABLE_VIDEO_IMPORT_STATES.includes(res.locals.videoImport.state)) {
return res.fail({
status: HttpStatusCode.BAD_REQUEST_400,
- message: req.t('Cannot retry a non failed video import')
+ message: req.t('Cannot retry a non failed or cancelled video import')
})
}
diff --git a/support/doc/api/openapi.yaml b/support/doc/api/openapi.yaml
index 1bcec834dc..fb57f6ec44 100644
--- a/support/doc/api/openapi.yaml
+++ b/support/doc/api/openapi.yaml
@@ -4076,7 +4076,7 @@ paths:
/api/v1/videos/imports/{id}/retry:
post:
summary: Retry video import
- description: "**PeerTube >= 8.0** Retry a pending video import"
+ description: "**PeerTube >= 8.0** Retry a failed or cancelled (**PeerTube >= 8.3**) video import"
security:
- OAuth2: []
tags: