ActivityPub-federated video streaming platform using P2P directly in your web browser
Code cleanup
Chocobozzzaa7a67646505
diff --git a/packages/tests/src/cli/create-move-video-storage-job.ts b/packages/tests/src/cli/create-move-video-storage-job.tsindex 97bb326356..77c0196e53 100644--- a/packages/tests/src/cli/create-move-video-storage-job.ts+++ b/packages/tests/src/cli/create-move-video-storage-job.ts@@ -246,7 +246,7 @@ describe('Test create move video storage job CLI', function () {const command = `npm run create-move-video-storage-job -- --to-file-system --all-videos`const { stdout } = await servers[0].cli.execWithEnv(command, objectStorage.getDefaultMockConfig())- expect(stdout).to.not.include('Creating external storage move job ')+ expect(stdout).to.not.include('Creating move to file ')await waitJobs(servers)})diff --git a/server/core/lib/move-storage/shared/move-video.ts b/server/core/lib/move-storage/shared/move-video.tsindex 566807815a..2fb073f350 100644--- a/server/core/lib/move-storage/shared/move-video.ts+++ b/server/core/lib/move-storage/shared/move-video.ts@@ -1,4 +1,4 @@-import { FileStorage, FileStorageType } from '@peertube/peertube-models'+import { FileStorageType } from '@peertube/peertube-models'import { LoggerTags, logger, loggerTagsFactory } from '@server/helpers/logger.js'import { VideoPathManager } from '@server/lib/video-path-manager.js'import { VideoCaptionModel } from '@server/models/video/video-caption.js'@@ -117,11 +117,7 @@ export async function filterVideoResourcesToBeMoved (videoArg: MVideo, targetStowebFiles: video.VideoFiles.filter(f => f.storage !== targetStorage),captions: captions.filter(c => {if (c.storage !== targetStorage) return true-- if (hls) {- if (targetStorage === FileStorage.OBJECT_STORAGE) return !c.m3u8Filename- else if (targetStorage === FileStorage.FILE_SYSTEM) return !c.m3u8Filename- }+ if (hls && !c.m3u8Filename) return truereturn false})