X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Finitializers%2Fdatabase.ts;h=6e3a8d009bba62512cdfccd5b0bc929ff1bc04e2;hb=709756b8e183f67ef9bf8f7bc149af4736260350;hp=753a06669a107b131952c2763ef2c1c722f5a6fb;hpb=65fcc3119c334b75dd13bcfdebf186afdc580a8f;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/initializers/database.ts b/server/initializers/database.ts
index 753a06669..6e3a8d009 100644
--- a/server/initializers/database.ts
+++ b/server/initializers/database.ts
@@ -1,17 +1,58 @@
-import fs = require('fs')
 import { join } from 'path'
-import Sequelize = require('sequelize')
+import { flattenDepth } from 'lodash'
+import * as Sequelize from 'sequelize'
+import * as Promise from 'bluebird'
 
 import { CONFIG } from './constants'
 // Do not use barrel, we need to load database first
 import { logger } from '../helpers/logger'
-import { isTestInstance } from '../helpers/utils'
+import { isTestInstance, readdirPromise } from '../helpers/core-utils'
+import {
+  ApplicationModel,
+  AuthorModel,
+  JobModel,
+  OAuthClientModel,
+  OAuthTokenModel,
+  PodModel,
+  RequestModel,
+  RequestToPodModel,
+  RequestVideoEventModel,
+  RequestVideoQaduModel,
+  TagModel,
+  UserModel,
+  UserVideoRateModel,
+  VideoAbuseModel,
+  BlacklistedVideoModel,
+  VideoTagModel,
+  VideoModel
+} from '../models'
 
 const dbname = CONFIG.DATABASE.DBNAME
 const username = CONFIG.DATABASE.USERNAME
 const password = CONFIG.DATABASE.PASSWORD
 
-const database: any = {}
+const database: {
+  sequelize?: Sequelize.Sequelize,
+  init?: (silent: boolean) => Promise<void>,
+
+  Application?: ApplicationModel,
+  Author?: AuthorModel,
+  Job?: JobModel,
+  OAuthClient?: OAuthClientModel,
+  OAuthToken?: OAuthTokenModel,
+  Pod?: PodModel,
+  RequestToPod?: RequestToPodModel,
+  RequestVideoEvent?: RequestVideoEventModel,
+  RequestVideoQadu?: RequestVideoQaduModel,
+  Request?: RequestModel,
+  Tag?: TagModel,
+  UserVideoRate?: UserVideoRateModel,
+  User?: UserModel,
+  VideoAbuse?: VideoAbuseModel,
+  BlacklistedVideo?: BlacklistedVideoModel,
+  VideoTag?: VideoTagModel,
+  Video?: VideoModel
+} = {}
 
 const sequelize = new Sequelize(dbname, username, password, {
   dialect: 'postgres',
@@ -19,7 +60,7 @@ const sequelize = new Sequelize(dbname, username, password, {
   port: CONFIG.DATABASE.PORT,
   benchmark: isTestInstance(),
 
-  logging: function (message, benchmark) {
+  logging: function (message: string, benchmark: number) {
     let newMessage = message
     if (benchmark !== undefined) {
       newMessage += ' | ' + benchmark + 'ms'
@@ -31,31 +72,17 @@ const sequelize = new Sequelize(dbname, username, password, {
 
 database.sequelize = sequelize
 
-database.init = function (silent, callback) {
-  if (!callback) {
-    callback = silent
-    silent = false
-  }
-
-  if (!callback) callback = function () { /* empty */ }
-
+database.init = function (silent: boolean) {
   const modelDirectory = join(__dirname, '..', 'models')
-  fs.readdir(modelDirectory, function (err, files) {
-    if (err) throw err
 
-    files.filter(function (file) {
-      // For all models but not utils.js
-      if (file === 'utils.js') return false
-
-      return true
-    })
-    .forEach(function (file) {
-      const model = sequelize.import(join(modelDirectory, file))
+  return getModelFiles(modelDirectory).then(filePaths => {
+    filePaths.forEach(filePath => {
+      const model = sequelize.import(filePath)
 
       database[model['name']] = model
     })
 
-    Object.keys(database).forEach(function (modelName) {
+    Object.keys(database).forEach(modelName => {
       if ('associate' in database[modelName]) {
         database[modelName].associate(database)
       }
@@ -63,10 +90,62 @@ database.init = function (silent, callback) {
 
     if (!silent) logger.info('Database %s is ready.', dbname)
 
-    return callback(null)
+    return undefined
   })
 }
 
 // ---------------------------------------------------------------------------
 
-module.exports = database
+export {
+  database
+}
+
+// ---------------------------------------------------------------------------
+
+function getModelFiles (modelDirectory: string) {
+  return readdirPromise(modelDirectory)
+    .then(files => {
+      const directories: string[] = files.filter(function (directory) {
+        // Find directories
+        if (
+          directory.endsWith('.js.map') ||
+          directory === 'index.js' || directory === 'index.ts' ||
+          directory === 'utils.js' || directory === 'utils.ts'
+        ) return false
+
+        return true
+      })
+
+      return directories
+    })
+    .then(directories => {
+      const tasks = []
+
+      // For each directory we read it and append model in the modelFilePaths array
+      directories.forEach(directory => {
+        const modelDirectoryPath = join(modelDirectory, directory)
+
+        const promise = readdirPromise(modelDirectoryPath).then(files => {
+          const filteredFiles = files.filter(file => {
+            if (
+              file === 'index.js' || file === 'index.ts' ||
+              file === 'utils.js' || file === 'utils.ts' ||
+              file.endsWith('-interface.js') || file.endsWith('-interface.ts') ||
+              file.endsWith('.js.map')
+            ) return false
+
+            return true
+          }).map(file => join(modelDirectoryPath, file))
+
+          return filteredFiles
+        })
+
+        tasks.push(promise)
+      })
+
+      return Promise.all(tasks)
+    })
+    .then((filteredFiles: string[][]) => {
+      return flattenDepth<string>(filteredFiles, 1)
+    })
+}