X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=server%2Finitializers%2Finstaller.ts;h=cd2c942fd1dc2851136989782f72b0421138004c;hb=0e0c745b62b2f18e228328e8c4f95b17e54f7a5e;hp=c669606f87db28f1c791ea19bdaac398710b2482;hpb=df0b219d36bf6852cdf2a7ad09ed4a41c6bccefa;p=oweals%2Fpeertube.git diff --git a/server/initializers/installer.ts b/server/initializers/installer.ts index c669606f8..cd2c942fd 100644 --- a/server/initializers/installer.ts +++ b/server/initializers/installer.ts @@ -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' @@ -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) } @@ -74,7 +76,7 @@ function createDirectoriesIfNotExist () { } // Playlist directories - tasks.push(ensureDir(HLS_PLAYLIST_DIRECTORY)) + tasks.push(ensureDir(HLS_STREAMING_PLAYLIST_DIRECTORY)) return Promise.all(tasks) }