aboutsummaryrefslogtreecommitdiffhomepage
path: root/server/models
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2019-03-05 12:00:31 +0100
committerChocobozzz <chocobozzz@cpy.re>2019-03-18 11:17:59 +0100
commit9c6ca37fc1512a99d420ea90707cebcd06cdc970 (patch)
tree2ef8e4c9bc30e911923a5b5c83f18e983553929d /server/models
parent09979f8959425390b879bce22101a9bc061ae9a0 (diff)
downloadPeerTube-9c6ca37fc1512a99d420ea90707cebcd06cdc970.tar.gz
PeerTube-9c6ca37fc1512a99d420ea90707cebcd06cdc970.tar.zst
PeerTube-9c6ca37fc1512a99d420ea90707cebcd06cdc970.zip
Rename streaming playlists routes/directories
Diffstat (limited to 'server/models')
-rw-r--r--server/models/video/video-streaming-playlist.ts6
-rw-r--r--server/models/video/video.ts4
2 files changed, 5 insertions, 5 deletions
diff --git a/server/models/video/video-streaming-playlist.ts b/server/models/video/video-streaming-playlist.ts
index e489f9b0e..b147aca36 100644
--- a/server/models/video/video-streaming-playlist.ts
+++ b/server/models/video/video-streaming-playlist.ts
@@ -130,15 +130,15 @@ export class VideoStreamingPlaylistModel extends Model<VideoStreamingPlaylistMod
130 } 130 }
131 131
132 static getHlsMasterPlaylistStaticPath (videoUUID: string) { 132 static getHlsMasterPlaylistStaticPath (videoUUID: string) {
133 return join(STATIC_PATHS.PLAYLISTS.HLS, videoUUID, VideoStreamingPlaylistModel.getMasterHlsPlaylistFilename()) 133 return join(STATIC_PATHS.STREAMING_PLAYLISTS.HLS, videoUUID, VideoStreamingPlaylistModel.getMasterHlsPlaylistFilename())
134 } 134 }
135 135
136 static getHlsPlaylistStaticPath (videoUUID: string, resolution: number) { 136 static getHlsPlaylistStaticPath (videoUUID: string, resolution: number) {
137 return join(STATIC_PATHS.PLAYLISTS.HLS, videoUUID, VideoStreamingPlaylistModel.getHlsPlaylistFilename(resolution)) 137 return join(STATIC_PATHS.STREAMING_PLAYLISTS.HLS, videoUUID, VideoStreamingPlaylistModel.getHlsPlaylistFilename(resolution))
138 } 138 }
139 139
140 static getHlsSha256SegmentsStaticPath (videoUUID: string) { 140 static getHlsSha256SegmentsStaticPath (videoUUID: string) {
141 return join(STATIC_PATHS.PLAYLISTS.HLS, videoUUID, VideoStreamingPlaylistModel.getHlsSha256SegmentsFilename()) 141 return join(STATIC_PATHS.STREAMING_PLAYLISTS.HLS, videoUUID, VideoStreamingPlaylistModel.getHlsSha256SegmentsFilename())
142 } 142 }
143 143
144 getStringType () { 144 getStringType () {
diff --git a/server/models/video/video.ts b/server/models/video/video.ts
index a563f78ef..06c63e87c 100644
--- a/server/models/video/video.ts
+++ b/server/models/video/video.ts
@@ -53,7 +53,7 @@ import {
53 API_VERSION, 53 API_VERSION,
54 CONFIG, 54 CONFIG,
55 CONSTRAINTS_FIELDS, 55 CONSTRAINTS_FIELDS,
56 HLS_PLAYLIST_DIRECTORY, 56 HLS_STREAMING_PLAYLIST_DIRECTORY,
57 HLS_REDUNDANCY_DIRECTORY, 57 HLS_REDUNDANCY_DIRECTORY,
58 PREVIEWS_SIZE, 58 PREVIEWS_SIZE,
59 REMOTE_SCHEME, 59 REMOTE_SCHEME,
@@ -1751,7 +1751,7 @@ export class VideoModel extends Model<VideoModel> {
1751 } 1751 }
1752 1752
1753 removeStreamingPlaylist (isRedundancy = false) { 1753 removeStreamingPlaylist (isRedundancy = false) {
1754 const baseDir = isRedundancy ? HLS_REDUNDANCY_DIRECTORY : HLS_PLAYLIST_DIRECTORY 1754 const baseDir = isRedundancy ? HLS_REDUNDANCY_DIRECTORY : HLS_STREAMING_PLAYLIST_DIRECTORY
1755 1755
1756 const filePath = join(baseDir, this.uuid) 1756 const filePath = join(baseDir, this.uuid)
1757 return remove(filePath) 1757 return remove(filePath)