Rename streaming playlists routes/directories

This commit is contained in:
Chocobozzz
2019-03-05 12:00:31 +01:00
committed by Chocobozzz
parent 09979f8959
commit 9c6ca37fc1
12 changed files with 34 additions and 27 deletions

View File

@@ -12,7 +12,7 @@ function checkMissedConfig () {
'database.hostname', 'database.port', 'database.suffix', 'database.username', 'database.password', 'database.pool.max',
'smtp.hostname', 'smtp.port', 'smtp.username', 'smtp.password', 'smtp.tls', 'smtp.from_address',
'storage.avatars', 'storage.videos', 'storage.logs', 'storage.previews', 'storage.thumbnails', 'storage.torrents', 'storage.cache',
'storage.redundancy', 'storage.tmp', 'storage.playlists',
'storage.redundancy', 'storage.tmp', 'storage.streaming_playlists',
'log.level',
'user.video_quota', 'user.video_quota_daily',
'csp.enabled', 'csp.report_only', 'csp.report_uri',

View File

@@ -196,7 +196,7 @@ const CONFIG = {
AVATARS_DIR: buildPath(config.get<string>('storage.avatars')),
LOG_DIR: buildPath(config.get<string>('storage.logs')),
VIDEOS_DIR: buildPath(config.get<string>('storage.videos')),
PLAYLISTS_DIR: buildPath(config.get<string>('storage.playlists')),
STREAMING_PLAYLISTS_DIR: buildPath(config.get<string>('storage.streaming_playlists')),
REDUNDANCY_DIR: buildPath(config.get<string>('storage.redundancy')),
THUMBNAILS_DIR: buildPath(config.get<string>('storage.thumbnails')),
PREVIEWS_DIR: buildPath(config.get<string>('storage.previews')),
@@ -625,8 +625,8 @@ const STATIC_PATHS = {
TORRENTS: '/static/torrents/',
WEBSEED: '/static/webseed/',
REDUNDANCY: '/static/redundancy/',
PLAYLISTS: {
HLS: '/static/playlists/hls'
STREAMING_PLAYLISTS: {
HLS: '/static/streaming-playlists/hls'
},
AVATARS: '/static/avatars/',
VIDEO_CAPTIONS: '/static/video-captions/'
@@ -670,7 +670,7 @@ const CACHE = {
}
}
const HLS_PLAYLIST_DIRECTORY = join(CONFIG.STORAGE.PLAYLISTS_DIR, 'hls')
const HLS_STREAMING_PLAYLIST_DIRECTORY = join(CONFIG.STORAGE.STREAMING_PLAYLISTS_DIR, 'hls')
const HLS_REDUNDANCY_DIRECTORY = join(CONFIG.STORAGE.REDUNDANCY_DIR, 'hls')
const MEMOIZE_TTL = {
@@ -777,7 +777,7 @@ export {
PRIVATE_RSA_KEY_SIZE,
ROUTE_CACHE_LIFETIME,
SORTABLE_COLUMNS,
HLS_PLAYLIST_DIRECTORY,
HLS_STREAMING_PLAYLIST_DIRECTORY,
FEEDS,
JOB_TTL,
NSFW_POLICY_TYPES,

View File

@@ -6,7 +6,7 @@ import { UserModel } from '../models/account/user'
import { ApplicationModel } from '../models/application/application'
import { OAuthClientModel } from '../models/oauth/oauth-client'
import { applicationExist, clientsExist, usersExist } from './checker-after-init'
import { CACHE, CONFIG, HLS_PLAYLIST_DIRECTORY, LAST_MIGRATION_VERSION } from './constants'
import { CACHE, CONFIG, HLS_STREAMING_PLAYLIST_DIRECTORY, LAST_MIGRATION_VERSION } from './constants'
import { sequelizeTypescript } from './database'
import { remove, ensureDir } from 'fs-extra'
@@ -74,7 +74,7 @@ function createDirectoriesIfNotExist () {
}
// Playlist directories
tasks.push(ensureDir(HLS_PLAYLIST_DIRECTORY))
tasks.push(ensureDir(HLS_STREAMING_PLAYLIST_DIRECTORY))
return Promise.all(tasks)
}