Add ability to filter my imports by target URL

2 files changed, 30 insertions, 1 deletions

diff --git a/server/tests/api/videos/video-imports.ts b/server/tests/api/videos/video-imports.ts
index ba21ab17a..28da69e8e 100644
--- a/server/tests/api/videos/video-imports.ts
+++ b/server/tests/api/videos/video-imports.ts
@@ -219,6 +219,14 @@ describe('Test video imports', function () {
         expect(videoImports[0].video.name).to.equal('你好 世界 720p.mp4')
       })
 
+      it('Should filter my imports on target URL', async function () {
+        const { total, data: videoImports } = await servers[0].imports.getMyVideoImports({ targetUrl: FIXTURE_URLS.youtube })
+        expect(total).to.equal(1)
+        expect(videoImports).to.have.lengthOf(1)
+
+        expect(videoImports[0].targetUrl).to.equal(FIXTURE_URLS.youtube)
+      })
+
       it('Should have the video listed on the two instances', async function () {
         this.timeout(120_000)
 
@@ -459,6 +467,10 @@ describe('Test video imports', function () {
       const { data } = await server.imports.getMyVideoImports()
       expect(data).to.have.lengthOf(0)
     })
+
+    after(async function () {
+      await cleanupTests([ server ])
+    })
   })
 
   describe('Auto update', function () {
diff --git a/server/tests/cli/peertube.ts b/server/tests/cli/peertube.ts
index 034d216e3..3aa24a0f8 100644
--- a/server/tests/cli/peertube.ts
+++ b/server/tests/cli/peertube.ts
@@ -136,9 +136,26 @@ describe('Test CLI wrapper', function () {
       expect(videoDetails.channel.name).to.equal('user_channel')
       expect(videoDetails.support).to.equal('super support text')
       expect(videoDetails.nsfw).to.be.false
+    })
+
+    it('Should not import again the same video', async function () {
+      if (areHttpImportTestsDisabled()) return
+
+      this.timeout(60000)
+
+      const params = `--target-url ${FIXTURE_URLS.youtube} --channel-name user_channel`
+      await cliCommand.execWithEnv(`${cmd} import ${params}`)
+
+      await waitJobs([ server ])
+
+      const { total, data } = await server.videos.list()
+      expect(total).to.equal(2)
+
+      const videos = data.filter(v => v.name === 'small video - youtube')
+      expect(videos).to.have.lengthOf(1)
 
       // So we can reimport it
-      await server.videos.remove({ token: userAccessToken, id: video.id })
+      await server.videos.remove({ token: userAccessToken, id: videos[0].id })
     })
 
     it('Should import and override some imported attributes', async function () {