diff options
author | Chocobozzz <me@florianbigard.com> | 2022-06-24 09:34:56 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2022-06-24 09:57:55 +0200 |
commit | 92083e42289e19033425672dfbe2234aef03c6df (patch) | |
tree | 01746b73d351f2a44932794549532b6a5ead1cbd /server/lib/live | |
parent | 383dbdec67fc474652c4e59440238da0b2fb6e8c (diff) | |
download | PeerTube-92083e42289e19033425672dfbe2234aef03c6df.tar.gz PeerTube-92083e42289e19033425672dfbe2234aef03c6df.tar.zst PeerTube-92083e42289e19033425672dfbe2234aef03c6df.zip |
Fix removed sha segments on fast restream
Diffstat (limited to 'server/lib/live')
-rw-r--r-- | server/lib/live/live-manager.ts | 5 | ||||
-rw-r--r-- | server/lib/live/live-utils.ts | 15 |
2 files changed, 12 insertions, 8 deletions
diff --git a/server/lib/live/live-manager.ts b/server/lib/live/live-manager.ts index f2f064b49..d499b4b1a 100644 --- a/server/lib/live/live-manager.ts +++ b/server/lib/live/live-manager.ts | |||
@@ -27,7 +27,6 @@ import { JobQueue } from '../job-queue' | |||
27 | import { generateHLSMasterPlaylistFilename, generateHlsSha256SegmentsFilename, getLiveReplayBaseDirectory } from '../paths' | 27 | import { generateHLSMasterPlaylistFilename, generateHlsSha256SegmentsFilename, getLiveReplayBaseDirectory } from '../paths' |
28 | import { PeerTubeSocket } from '../peertube-socket' | 28 | import { PeerTubeSocket } from '../peertube-socket' |
29 | import { LiveQuotaStore } from './live-quota-store' | 29 | import { LiveQuotaStore } from './live-quota-store' |
30 | import { LiveSegmentShaStore } from './live-segment-sha-store' | ||
31 | import { cleanupPermanentLive } from './live-utils' | 30 | import { cleanupPermanentLive } from './live-utils' |
32 | import { MuxingSession } from './shared' | 31 | import { MuxingSession } from './shared' |
33 | 32 | ||
@@ -219,9 +218,7 @@ class LiveManager { | |||
219 | return this.abortSession(sessionId) | 218 | return this.abortSession(sessionId) |
220 | } | 219 | } |
221 | 220 | ||
222 | // Cleanup old potential live files (could happen with a permanent live) | 221 | // Cleanup old potential live (could happen with a permanent live) |
223 | LiveSegmentShaStore.Instance.cleanupShaSegments(video.uuid) | ||
224 | |||
225 | const oldStreamingPlaylist = await VideoStreamingPlaylistModel.loadHLSPlaylistByVideo(video.id) | 222 | const oldStreamingPlaylist = await VideoStreamingPlaylistModel.loadHLSPlaylistByVideo(video.id) |
226 | if (oldStreamingPlaylist) { | 223 | if (oldStreamingPlaylist) { |
227 | if (!videoLive.permanentLive) throw new Error('Found previous session in a non permanent live: ' + video.uuid) | 224 | if (!videoLive.permanentLive) throw new Error('Found previous session in a non permanent live: ' + video.uuid) |
diff --git a/server/lib/live/live-utils.ts b/server/lib/live/live-utils.ts index 6305a97a8..bba876642 100644 --- a/server/lib/live/live-utils.ts +++ b/server/lib/live/live-utils.ts | |||
@@ -3,6 +3,7 @@ import { basename, join } from 'path' | |||
3 | import { logger } from '@server/helpers/logger' | 3 | import { logger } from '@server/helpers/logger' |
4 | import { MStreamingPlaylist, MVideo } from '@server/types/models' | 4 | import { MStreamingPlaylist, MVideo } from '@server/types/models' |
5 | import { getLiveDirectory } from '../paths' | 5 | import { getLiveDirectory } from '../paths' |
6 | import { LiveSegmentShaStore } from './live-segment-sha-store' | ||
6 | 7 | ||
7 | function buildConcatenatedName (segmentOrPlaylistPath: string) { | 8 | function buildConcatenatedName (segmentOrPlaylistPath: string) { |
8 | const num = basename(segmentOrPlaylistPath).match(/^(\d+)(-|\.)/) | 9 | const num = basename(segmentOrPlaylistPath).match(/^(\d+)(-|\.)/) |
@@ -11,9 +12,7 @@ function buildConcatenatedName (segmentOrPlaylistPath: string) { | |||
11 | } | 12 | } |
12 | 13 | ||
13 | async function cleanupPermanentLive (video: MVideo, streamingPlaylist: MStreamingPlaylist) { | 14 | async function cleanupPermanentLive (video: MVideo, streamingPlaylist: MStreamingPlaylist) { |
14 | const hlsDirectory = getLiveDirectory(video) | 15 | await cleanupTMPLiveFiles(video) |
15 | |||
16 | await cleanupTMPLiveFiles(hlsDirectory) | ||
17 | 16 | ||
18 | await streamingPlaylist.destroy() | 17 | await streamingPlaylist.destroy() |
19 | } | 18 | } |
@@ -24,11 +23,19 @@ async function cleanupUnsavedNormalLive (video: MVideo, streamingPlaylist: MStre | |||
24 | await remove(hlsDirectory) | 23 | await remove(hlsDirectory) |
25 | 24 | ||
26 | await streamingPlaylist.destroy() | 25 | await streamingPlaylist.destroy() |
26 | |||
27 | LiveSegmentShaStore.Instance.cleanupShaSegments(video.uuid) | ||
27 | } | 28 | } |
28 | 29 | ||
29 | async function cleanupTMPLiveFiles (hlsDirectory: string) { | 30 | async function cleanupTMPLiveFiles (video: MVideo) { |
31 | const hlsDirectory = getLiveDirectory(video) | ||
32 | |||
33 | LiveSegmentShaStore.Instance.cleanupShaSegments(video.uuid) | ||
34 | |||
30 | if (!await pathExists(hlsDirectory)) return | 35 | if (!await pathExists(hlsDirectory)) return |
31 | 36 | ||
37 | logger.info('Cleanup TMP live files of %s.', hlsDirectory) | ||
38 | |||
32 | const files = await readdir(hlsDirectory) | 39 | const files = await readdir(hlsDirectory) |
33 | 40 | ||
34 | for (const filename of files) { | 41 | for (const filename of files) { |