aboutsummaryrefslogtreecommitdiffhomepage
path: root/server/lib
diff options
context:
space:
mode:
Diffstat (limited to 'server/lib')
-rw-r--r--server/lib/live/live-manager.ts4
-rw-r--r--server/lib/object-storage/urls.ts2
2 files changed, 5 insertions, 1 deletions
diff --git a/server/lib/live/live-manager.ts b/server/lib/live/live-manager.ts
index 9ea983119..fa4e1df07 100644
--- a/server/lib/live/live-manager.ts
+++ b/server/lib/live/live-manager.ts
@@ -487,7 +487,9 @@ class LiveManager {
487 ? VideoStorage.OBJECT_STORAGE 487 ? VideoStorage.OBJECT_STORAGE
488 : VideoStorage.FILE_SYSTEM 488 : VideoStorage.FILE_SYSTEM
489 489
490 playlist.assignP2PMediaLoaderInfoHashes(video, allResolutions) 490 if (playlist.storage === VideoStorage.FILE_SYSTEM) {
491 playlist.assignP2PMediaLoaderInfoHashes(video, allResolutions)
492 }
491 493
492 return playlist.save() 494 return playlist.save()
493 } 495 }
diff --git a/server/lib/object-storage/urls.ts b/server/lib/object-storage/urls.ts
index a47a98b98..b8ef94559 100644
--- a/server/lib/object-storage/urls.ts
+++ b/server/lib/object-storage/urls.ts
@@ -57,5 +57,7 @@ function getBaseUrl (bucketInfo: BucketInfo, baseUrl?: string) {
57 57
58const regex = new RegExp('https?://[^/]+') 58const regex = new RegExp('https?://[^/]+')
59function replaceByBaseUrl (fileUrl: string, baseUrl: string) { 59function replaceByBaseUrl (fileUrl: string, baseUrl: string) {
60 if (!fileUrl) return fileUrl
61
60 return fileUrl.replace(regex, baseUrl) 62 return fileUrl.replace(regex, baseUrl)
61} 63}