Don't display remove file icon in some cases

[github/Chocobozzz/PeerTube.git] / server / lib / hls.ts

diff --git a/server/lib/hls.ts b/server/lib/hls.ts
index ad29e4c90023d442ad3e5bb6f7076d7b79b68c59..a0a5afc0f89b5a44b475e43dd9eb314efd5fc7cb 100644 (file)
--- a/server/lib/hls.ts
+++ b/server/lib/hls.ts
@@ -1,8 +1,9 @@
 import { close, ensureDir, move, open, outputJSON, read, readFile, remove, stat, writeFile } from 'fs-extra'
-import { flatten, uniq } from 'lodash'
+import { flatten } from 'lodash'
 import PQueue from 'p-queue'
 import { basename, dirname, join } from 'path'
 import { MStreamingPlaylist, MStreamingPlaylistFilesVideo, MVideo } from '@server/types/models'
+import { uniqify } from '@shared/core-utils'
 import { sha256 } from '@shared/extra-utils'
 import { VideoStorage } from '@shared/models'
 import { getAudioStreamCodec, getVideoStreamCodec, getVideoStreamDimensionsInfo } from '../helpers/ffmpeg'
@@ -35,15 +36,19 @@ async function updateStreamingPlaylistsInfohashesIfNeeded () {
 }
 
 async function updatePlaylistAfterFileChange (video: MVideo, playlist: MStreamingPlaylist) {
-  let playlistWithFiles = await updateMasterHLSPlaylist(video, playlist)
-  playlistWithFiles = await updateSha256VODSegments(video, playlist)
-
-  // Refresh playlist, operations can take some time
-  playlistWithFiles = await VideoStreamingPlaylistModel.loadWithVideoAndFiles(playlist.id)
-  playlistWithFiles.assignP2PMediaLoaderInfoHashes(video, playlistWithFiles.VideoFiles)
-  await playlistWithFiles.save()
-
-  video.setHLSPlaylist(playlistWithFiles)
+  try {
+    let playlistWithFiles = await updateMasterHLSPlaylist(video, playlist)
+    playlistWithFiles = await updateSha256VODSegments(video, playlist)
+
+    // Refresh playlist, operations can take some time
+    playlistWithFiles = await VideoStreamingPlaylistModel.loadWithVideoAndFiles(playlist.id)
+    playlistWithFiles.assignP2PMediaLoaderInfoHashes(video, playlistWithFiles.VideoFiles)
+    await playlistWithFiles.save()
+
+    video.setHLSPlaylist(playlistWithFiles)
+  } catch (err) {
+    logger.info('Cannot update playlist after file change. Maybe due to concurrent transcoding', { err })
+  }
 }
 
 // ---------------------------------------------------------------------------
@@ -178,7 +183,7 @@ function downloadPlaylistSegments (playlistUrl: string, destinationDir: string,
       const subPlaylistUrls = await fetchUniqUrls(playlistUrl)
 
       const subRequests = subPlaylistUrls.map(u => fetchUniqUrls(u))
-      const fileUrls = uniq(flatten(await Promise.all(subRequests)))
+      const fileUrls = uniqify(flatten(await Promise.all(subRequests)))
 
       logger.debug('Will download %d HLS files.', fileUrls.length, { fileUrls })
 
@@ -223,7 +228,7 @@ function downloadPlaylistSegments (playlistUrl: string, destinationDir: string,
         return `${dirname(playlistUrl)}/${url}`
       })
 
-    return uniq(urls)
+    return uniqify(urls)
   }
 }