From d42e971be63047f4f33414e88488077c15120afe Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Sun, 5 Jun 2016 10:09:01 +0200
Subject: [PATCH] Made some updates to the tag command. Among other things,
 resolves #993.

---
 evennia/commands/default/building.py | 30 ++++++++++++++++++++--------
 1 file changed, 22 insertions(+), 8 deletions(-)

diff --git a/evennia/commands/default/building.py b/evennia/commands/default/building.py
index c8f01a7501..733aa97cb3 100644
--- a/evennia/commands/default/building.py
+++ b/evennia/commands/default/building.py
@@ -2404,10 +2404,10 @@ class CmdTag(COMMAND_DEFAULT_CLASS):
 
     Usage:
       @tag[/del] <obj> [= <tag>[:<category>]]
-      @tag/search <tag>
+      @tag/search <tag>[:<category]
 
     Switches:
-      search - return all objects
+      search - return all objects with a given Tag
       del - remove the given tag. If no tag is specified,
             clear all tags on object.
 
@@ -2421,8 +2421,10 @@ class CmdTag(COMMAND_DEFAULT_CLASS):
     """
 
     key = "@tag"
+    aliases = ["@tags"]
     locks = "cmd:perm(tag) or perm(Builders)"
     help_category = "Building"
+    arg_regex = r"(/\w+?(\s|$))|\s|$"
 
     def func(self):
         "Implement the @tag functionality"
@@ -2463,14 +2465,26 @@ class CmdTag(COMMAND_DEFAULT_CLASS):
                 category = None
                 if ":" in tag:
                     tag, category = [part.strip() for part in tag.split(":", 1)]
-                obj.tags.remove(tag, category=category)
-                string = "Removed tag '%s'%s from %s (if it existed)" % (tag,
-                                                    " (category: %s)" % category if category else "",
-                                                    obj)
+                if obj.tags.get(tag, category=category):
+                    obj.tags.remove(tag, category=category)
+                    string = "Removed tag '%s'%s from %s." % (
+                                            tag,
+                                            " (category: %s)" % category if category else "",
+                                            obj)
+                else:
+                    string = "No tag '%s'%s to delete on %s." % (
+                                            tag,
+                                            " (category: %s)" % category if category else "",
+                                            obj)
             else:
                 # no tag specified, clear all tags
-                obj.tags.clear()
-                string = "Cleared all tags from from %s." % obj
+                old_tags = ["%s%s" % (tag, " (category: %s" % category if category else "")
+                            for tag, category in obj.tags.all(return_key_and_category=True)]
+                if old_tags:
+                    obj.tags.clear()
+                    string = "Cleared all tags from %s: %s" % (obj, ", ".join(old_tags))
+                else:
+                    string = "No Tags to clear on %s." % obj
             self.caller.msg(string)
             return
         # no search/deletion