Merge branch 'mcpower-master' into nodejs

Conflicts:
	todo.jsm

Author: fourkbomb

todo.jsm

@@ -4,7 +4,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 /*global module.exports: false */
 var fs = require("fs");
-module.exports.version = 0.5;
+module.exports.version = 0.9;
 module.exports.users = {};
 module.exports.DB_FILENAME = "todo.json";
 
@@ -35,7 +35,10 @@ module.exports.cmd_todo = function cmd_todo(e) {
 	} else if (!list.length) {
 		e.reply("Nothing on your todo list.");
 	} else {
-		e.reply(list.join("; "));
+		var i = 0;
+		e.reply(list.map(function addIndex(todo) {
+			return "[{0}] {1}".format(i++, todo);
+		}).join("; "));
 	}
 
 	return true;
@@ -47,20 +50,79 @@ module.exports.cmd_tododel = function cmd_tododel(e) {
 		e.reply(this.cmd_tododel.help);
 		return true;
 	}
-	var index = e.args >>> 0;
 
 	var list = this.getList(e.nick);
 
-	if (index >= list.length) {
-		e.reply("You only have {0} things in your todo list.".format(list.length));
+	if (/^[0-9,]+$/.test(e.args)) {
+		var indexes = e.args.split(",").map(Number);
+
+		var notdeleted = 0;
+		for (var i = 0; i < indexes.length; i++) {
+			if (indexes[i] >= list.length)
+				notdeleted++;
+			else
+				list.splice(indexes[i], 1);
+		}
+
+		var deleted = indexes.length - notdeleted;
+		if (deleted != 0) {
+			this.saveUsers();
+			e.notice("Ok, deleted {0} todo{1}.".format(deleted, deleted == 1 ? "" : "s"));
+		}
+		if (notdeleted > 0)
+			e.reply("{0} todo{1}n't deleted. You only have {2} todo{3} on your todo list.".format(
+				notdeleted, notdeleted == 1 ? " was" : "s were", list.length, list.length == 1 ? "" : "s"));
 	} else {
-		list.splice(index, 1);
-		e.notice("Ok.");
-	}
+		var filteredlist = list.filter(function startsWith(s) {
+			return s.slice(0, e.args.length) == e.args;
+		});
 
+		switch (filteredlist.length) {
+			case 0:
+				e.reply("No todos found starting with \"{0}\".".format(e.args));
+				break;
+			case 1:
+				list.splice(list.indexOf(filteredlist[0]), 1);
+				this.saveUsers();
+				e.notice("Ok, deleted \"{0}\".".format(filteredlist[0]));
+				break;
+			default:
+				var formattedlist = [], currentindex = 0;
+				// O(list.length) way of finding these. No indexOf found here.
+				for (var i = 0; i < list.length; i++) {
+					if (list[i] == filteredlist[currentindex]) {
+						formattedlist[currentindex] = "[{0}] {1}".format(i, filteredlist[currentindex]);
+						currentindex++;
+					}
+				}
+				e.reply("Did you mean: {0}".format(formattedlist.join("; ")));
+		}
+	}
 	return true;
 };
-module.exports.cmd_tododel.help = "Delete an item from your todo list. Usage: tododel <index>";
+module.exports.cmd_tododel.help = "Delete an item from your todo list. Usage: tododel [<index> | <startswith>]";
+
+module.exports.cmd_todoins = function cmd_todoins(e) {
+	var regex = /^([0-9]+) (.+)$/;
+	if (!e.args || ! regex.test(e.args)) {
+		e.reply(this.cmd_todoins.help);
+		return true;
+	}
+	var match = regex.exec(e.args);
+	var list = this.getList(e.nick);
+	var index = Number(match[1]), todo = match[2];
+
+	if (index >= list.length)
+		e.reply("You only have {0} todo{1} on your todo list.".format(list.length, list.length == 1 ? "" : "s"));
+	else {
+		list.splice(index, 0, todo);
+		this.saveUsers();
+		e.notice("Ok.");
+	}
+	return true;
+}
+
+module.exports.cmd_todoins.help = "Inserts a todo before the specified index. Usage: todoins <index> <todo>";
 
 try { module.exports.loadUsers(); } catch (ex) {
 	println("Error while loading todo lists from disk: ", ex);