X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=server%2Finitializers%2Finstaller.ts;h=cd2c942fd1dc2851136989782f72b0421138004c;hb=0e0c745b62b2f18e228328e8c4f95b17e54f7a5e;hp=b9a9da18307e5301e3c66d552052ab4f965343fc;hpb=bc22d60899e14631cba0fb6450f4e85fc9528293;p=oweals%2Fpeertube.git diff --git a/server/initializers/installer.ts b/server/initializers/installer.ts index b9a9da183..cd2c942fd 100644 --- a/server/initializers/installer.ts +++ b/server/initializers/installer.ts @@ -1,12 +1,12 @@ import * as passwordGenerator from 'password-generator' import { UserRole } from '../../shared' import { logger } from '../helpers/logger' -import { createApplicationActor, createUserAccountAndChannel } from '../lib/user' +import { createApplicationActor, createUserAccountAndChannelAndPlaylist } from '../lib/user' 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, 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' @@ -24,7 +24,7 @@ async function installApplication () { }), // Directories - removeCacheDirectories() + removeCacheAndTmpDirectories() .then(() => createDirectoriesIfNotExist()) ]) } catch (err) { @@ -41,7 +41,7 @@ export { // --------------------------------------------------------------------------- -function removeCacheDirectories () { +function removeCacheAndTmpDirectories () { const cacheDirectories = Object.keys(CACHE) .map(k => CACHE[k].DIRECTORY) @@ -53,6 +53,8 @@ function removeCacheDirectories () { tasks.push(remove(dir)) } + tasks.push(remove(CONFIG.STORAGE.TMP_DIR)) + return Promise.all(tasks) } @@ -73,6 +75,9 @@ function createDirectoriesIfNotExist () { tasks.push(ensureDir(dir)) } + // Playlist directories + tasks.push(ensureDir(HLS_STREAMING_PLAYLIST_DIRECTORY)) + return Promise.all(tasks) } @@ -138,7 +143,7 @@ async function createOAuthAdminIfNotExist () { } const user = new UserModel(userData) - await createUserAccountAndChannel(user, validatePassword) + await createUserAccountAndChannelAndPlaylist(user, validatePassword) logger.info('Username: ' + username) logger.info('User password: ' + password) }