updated logic to make it a bit simpler to implement per upgrade script

src/batch.js

@@ -21,6 +21,17 @@ exports.processSortedSet = function (setKey, process, options, callback) {
 		return callback(new Error('[[error:process-not-a-function]]'));
 	}
 
+	// Progress bar handling (upgrade scripts)
+	if (options.progress) {
+		db.sortedSetCard(setKey, function (err, total) {
+			if (err) {
+				// Unable to get total, do nothing.
+			} else {
+				options.progress.total = total;
+			}
+		});
+	}
+
 	// use the fast path if possible
 	if (db.processSortedSet && typeof options.doneIf !== 'function' && !utils.isNumber(options.alwaysStartAt)) {
 		return db.processSortedSet(setKey, process, options.batch || DEFAULT_BATCH_SIZE, callback);
@@ -53,6 +64,7 @@ exports.processSortedSet = function (setKey, process, options, callback) {
 					}
 					start += utils.isNumber(options.alwaysStartAt) ? options.alwaysStartAt : batch + 1;
 					stop = start + batch;
+
 					next();
 				});
 			});

src/upgrade.js

@@ -7,7 +7,7 @@ var path = require('path');
 var semver = require('semver');
 
 var db = require('./database');
-var utils = require('../public/src/utils');
+var file = require('../src/file');
 
 /*
  * Need to write an upgrade script for NodeBB? Cool.
@@ -58,7 +58,7 @@ var Upgrade = {
 
 Upgrade.getAll = function (callback) {
 	async.waterfall([
-		async.apply(utils.walk, path.join(__dirname, './upgrades')),
+		async.apply(file.walk, path.join(__dirname, './upgrades')),
 		function (files, next) {
 			// Sort the upgrade scripts based on version
 			var versionA;
@@ -128,7 +128,7 @@ Upgrade.runSingle = function (query, callback) {
 	process.stdout.write('\nParsing upgrade scripts... ');
 
 	async.waterfall([
-		async.apply(utils.walk, path.join(__dirname, './upgrades')),
+		async.apply(file.walk, path.join(__dirname, './upgrades')),
 		function (files, next) {
 			next(null, files.filter(function (file) {
 				return path.basename(file, '.js') === query;
@@ -207,14 +207,19 @@ Upgrade.incrementProgress = function () {
 	this.current += 1;
 
 	// Redraw the progress bar
-	var percentage = Math.floor((this.current / this.total) * 100) + '%';
+	var percentage = 0;
-	var filled = Math.floor((this.current / this.total) * 15);
+	var filled = 0;
-	var unfilled = 15 - filled;
+	var unfilled = 15;
+	if (this.total) {
+		percentage = Math.floor((this.current / this.total) * 100) + '%';
+		filled = Math.floor((this.current / this.total) * 15);
+		unfilled = 15 - filled;
+	}
 	process.stdout.clearLine();
 	process.stdout.cursorTo(0);
 
 	process.stdout.write('  → '.white + String('[' + [this.date.getUTCFullYear(), this.date.getUTCMonth() + 1, this.date.getUTCDate()].join('/') + '] ').gray + String(this.script.name).reset + '... ');
-	process.stdout.write('[' + (filled ? new Array(filled).join('#') : '') + new Array(unfilled).join(' ') + '] (' + this.current + '/' + this.total + ') ' + percentage);
+	process.stdout.write('[' + (filled ? new Array(filled).join('#') : '') + new Array(unfilled).join(' ') + '] (' + this.current + '/' + (this.total || '??') + ') ' + percentage);
 };
 
 module.exports = Upgrade;

src/upgrades/1.5.0/moderation_history_refactor.js

@@ -13,30 +13,24 @@ module.exports = {
 	method: function (callback) {
 		var progress = this.progress;
 
-		db.sortedSetCard('users:joindate', function (err, numPosts) {
+		batch.processSortedSet('users:joindate', function (ids, next) {
-			if (err) {
+			async.each(ids, function (uid, next) {
-				return callback(err);
+				db.getObjectField('user:' + uid, 'moderationNote', function (err, moderationNote) {
-			}
+					if (err || !moderationNote) {
-
+						return next(err);
-			progress.total = numPosts;
+					}
-
+					var note = {
-			batch.processSortedSet('users:joindate', function (ids, next) {
+						uid: 1,
-				async.each(ids, function (uid, next) {
+						note: moderationNote,
-					db.getObjectField('user:' + uid, 'moderationNote', function (err, moderationNote) {
+						timestamp: Date.now(),
-						if (err || !moderationNote) {
+					};
-							return next(err);
+
-						}
+					progress.incr();
-						var note = {
+					db.sortedSetAdd('uid:' + uid + ':moderation:notes', note.timestamp, JSON.stringify(note), next);
-							uid: 1,
+				});
-							note: moderationNote,
+			}, next);
-							timestamp: Date.now(),
+		}, {
-						};
+			progress: this.progress,
-
+		}, callback);
-						progress.incr();
-						db.sortedSetAdd('uid:' + uid + ':moderation:notes', note.timestamp, JSON.stringify(note), next);
-					});
-				}, next);
-			}, callback);
-		});
 	},
 };

src/upgrades/1.5.0/post_votes_zset.js

@@ -12,26 +12,20 @@ module.exports = {
 	method: function (callback) {
 		var progress = this.progress;
 
-		db.sortedSetCard('posts:pid', function (err, numPosts) {
+		require('../../batch').processSortedSet('posts:pid', function (pids, next) {
-			if (err) {
+			async.eachSeries(pids, function (pid, next) {
-				return callback(err);
+				db.getObjectFields('post:' + pid, ['upvotes', 'downvotes'], function (err, postData) {
-			}
+					if (err || !postData) {
-
+						return next(err);
-			progress.total = numPosts;
+					}
-
+
-			require('../../batch').processSortedSet('posts:pid', function (pids, next) {
+					progress.incr();
-				async.eachSeries(pids, function (pid, next) {
+					var votes = parseInt(postData.upvotes || 0, 10) - parseInt(postData.downvotes || 0, 10);
-					db.getObjectFields('post:' + pid, ['upvotes', 'downvotes'], function (err, postData) {
+					db.sortedSetAdd('posts:votes', votes, pid, next);
-						if (err || !postData) {
+				});
-							return next(err);
+			}, next);
-						}
+		}, {
-
+			progress: this.progress,
-						var votes = parseInt(postData.upvotes || 0, 10) - parseInt(postData.downvotes || 0, 10);
+		}, callback);
-						progress.incr();
-						db.sortedSetAdd('posts:votes', votes, pid, next);
-					});
-				}, next);
-			}, {}, callback);
-		});
 	},
 };