From dd6019932efd6ae3b790bf024bc0cd74162e4517 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Sun, 25 Dec 2016 09:44:13 +0100 Subject: [PATCH] Update scripts with postgresql --- scripts/danger/clean/cleaner.js | 29 ++++++++++++++--------------- scripts/danger/clean/dev.sh | 3 ++- scripts/danger/clean/prod.sh | 3 ++- scripts/update-host.js | 25 +++++++++---------------- 4 files changed, 27 insertions(+), 33 deletions(-) diff --git a/scripts/danger/clean/cleaner.js b/scripts/danger/clean/cleaner.js index 10e91e700..d1e218145 100644 --- a/scripts/danger/clean/cleaner.js +++ b/scripts/danger/clean/cleaner.js @@ -1,24 +1,23 @@ const rimraf = require('rimraf') -const mongoose = require('mongoose') -mongoose.Promise = global.Promise const constants = require('../../../server/initializers/constants') +const db = require('../../../server/initializers/database') -const mongodbUrl = 'mongodb://' + constants.CONFIG.DATABASE.HOSTNAME + ':' + constants.CONFIG.DATABASE.PORT + '/' + constants.CONFIG.DATABASE.DBNAME -mongoose.connect(mongodbUrl, function () { - console.info('Deleting MongoDB %s database.', constants.CONFIG.DATABASE.DBNAME) - mongoose.connection.dropDatabase(function () { - mongoose.connection.close() - }) -}) +db.init(true, function () { + db.sequelize.drop().asCallback(function (err) { + if (err) throw err -const STORAGE = constants.CONFIG.STORAGE -Object.keys(STORAGE).forEach(function (storage) { - const storageDir = STORAGE[storage] + console.info('Tables of %s deleted.', db.sequelize.config.database) - rimraf(storageDir, function (err) { - if (err) throw err + const STORAGE = constants.CONFIG.STORAGE + Object.keys(STORAGE).forEach(function (storage) { + const storageDir = STORAGE[storage] + + rimraf(storageDir, function (err) { + if (err) throw err - console.info('Deleting %s.', storageDir) + console.info('Deleting %s.', storageDir) + }) + }) }) }) diff --git a/scripts/danger/clean/dev.sh b/scripts/danger/clean/dev.sh index 5f09565cf..f4a5d1e8a 100755 --- a/scripts/danger/clean/dev.sh +++ b/scripts/danger/clean/dev.sh @@ -1,6 +1,7 @@ #!/bin/bash -read -p "This will remove all directories and Mongo database. Are you sure? " -n 1 -r +read -p "This will remove all directories and SQL tables. Are you sure? (y/*) " -n 1 -r +echo if [[ "$REPLY" =~ ^[Yy]$ ]]; then NODE_ENV=test node "./scripts/danger/clean/cleaner" diff --git a/scripts/danger/clean/prod.sh b/scripts/danger/clean/prod.sh index e6c92671d..7ee13ba83 100755 --- a/scripts/danger/clean/prod.sh +++ b/scripts/danger/clean/prod.sh @@ -1,6 +1,7 @@ #!/bin/bash -read -p "This will remove all directories and Mongo database. Are you sure? " -n 1 -r +read -p "This will remove all directories and SQL tables. Are you sure? (y/*) " -n 1 -r +echo if [[ "$REPLY" =~ ^[Yy]$ ]]; then NODE_ENV=production node "./scripts/danger/clean/cleaner" diff --git a/scripts/update-host.js b/scripts/update-host.js index 8a17f2402..91051e68b 100755 --- a/scripts/update-host.js +++ b/scripts/update-host.js @@ -5,31 +5,24 @@ // TODO: document this script const fs = require('fs') -const mongoose = require('mongoose') const parseTorrent = require('parse-torrent') const constants = require('../server/initializers/constants') -const database = require('../server/initializers/database') - -database.connect() +const db = require('../server/initializers/database') const friends = require('../server/lib/friends') -const Video = mongoose.model('Video') - -friends.hasFriends(function (err, hasFriends) { - if (err) throw err - if (hasFriends === true) { - console.log('Cannot update host because you have friends!') - process.exit(-1) - } - - console.log('Updating videos host in database.') - Video.update({ }, { podHost: constants.CONFIG.WEBSERVER.HOST }, { multi: true }, function (err) { +db.init(true, function () { + friends.hasFriends(function (err, hasFriends) { if (err) throw err + if (hasFriends === true) { + console.log('Cannot update host because you have friends!') + process.exit(-1) + } + console.log('Updating torrent files.') - Video.find().lean().exec(function (err, videos) { + db.Video.list(function (err, videos) { if (err) throw err videos.forEach(function (video) { -- 2.41.0