From: Chocobozzz <me@florianbigard.com>
Date: Thu, 22 Aug 2019 12:46:47 +0000 (+0200)
Subject: Merge branch 'release/1.4.0' into develop
X-Git-Tag: v2.0.0-rc.1~115
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=d5c8932a601c1854db0a2e399ccaf26e17385f1a;p=github%2FChocobozzz%2FPeerTube.git

Merge branch 'release/1.4.0' into develop
---

d5c8932a601c1854db0a2e399ccaf26e17385f1a
diff --cc server/lib/schedulers/videos-redundancy-scheduler.ts
index d9018e606,cd70fd851..21fe51156
--- a/server/lib/schedulers/videos-redundancy-scheduler.ts
+++ b/server/lib/schedulers/videos-redundancy-scheduler.ts
@@@ -200,9 -185,9 +200,9 @@@ export class VideosRedundancyScheduler 
      const tmpPath = await downloadWebTorrentVideo({ magnetUri }, VIDEO_IMPORT_TIMEOUT)
  
      const destPath = join(CONFIG.STORAGE.REDUNDANCY_DIR, video.getVideoFilename(file))
-     await move(tmpPath, destPath)
+     await move(tmpPath, destPath, { overwrite: true })
  
 -    const createdModel = await VideoRedundancyModel.create({
 +    const createdModel: MVideoRedundancyFileVideo = await VideoRedundancyModel.create({
        expiresOn: this.buildNewExpiration(redundancy.minLifetime),
        url: getVideoCacheFileActivityPubUrl(file),
        fileUrl: video.getVideoRedundancyUrl(file, WEBSERVER.URL),