From c13d264e3eb1f473e8378d34cf4db19c356567ae Mon Sep 17 00:00:00 2001
From: Terry Geng <gengyanda@gmail.com>
Date: Mon, 9 Mar 2020 10:14:12 +0800
Subject: [PATCH] feat: tag current song

---
 command.py                | 37 +++++++++++++++++++++++++++++--------
 configuration.default.ini |  5 ++---
 2 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/command.py b/command.py
index 30d5e23..7c97ecc 100644
--- a/command.py
+++ b/command.py
@@ -828,10 +828,19 @@ def cmd_add_tag(bot, user, text, command, parameter):
     global log
 
     params = parameter.split()
+    index = ""
+    tags = []
     if len(params) == 2:
         index = params[0]
         tags = list(map(lambda t: t.strip(), params[1].split(",")))
+    elif len(params) == 1:
+        index = str(var.playlist.current_index + 1)
+        tags = list(map(lambda t: t.strip(), params[0].split(",")))
+    else:
+        bot.send_msg(constants.strings('bad_parameter', command=command), text)
+        return
 
+    if tags[0]:
         if index.isdigit() and 1 <= int(index) <= len(var.playlist):
             var.playlist[int(index) - 1].add_tags(tags)
             log.info("cmd: add tags %s to song %s" % (", ".join(tags),
@@ -839,26 +848,39 @@ def cmd_add_tag(bot, user, text, command, parameter):
             bot.send_msg(constants.strings("added_tags",
                                            tags=", ".join(tags),
                                            song=var.playlist[int(index) - 1].format_short_string()), text)
+            return
+
         elif index == "*":
             for item in var.playlist:
                 item.add_tags(tags)
                 log.info("cmd: add tags %s to song %s" % (", ".join(tags),
                                                           item.format_debug_string()))
             bot.send_msg(constants.strings("added_tags_to_all", tags=", ".join(tags)), text)
-        else:
-            bot.send_msg(constants.strings('bad_parameter', command=command), text)
+            return
+
+    bot.send_msg(constants.strings('bad_parameter', command=command), text)
 
 
 def cmd_remove_tag(bot, user, text, command, parameter):
     global log
 
     params = parameter.split()
-    if len(params) == 2 and params[1]:
-        index = params[0]
 
+    index = ""
+    tags = []
+    if len(params) == 2:
+        index = params[0]
+        tags = list(map(lambda t: t.strip(), params[1].split(",")))
+    elif len(params) == 1:
+        index = str(var.playlist.current_index + 1)
+        tags = list(map(lambda t: t.strip(), params[0].split(",")))
+    else:
+        bot.send_msg(constants.strings('bad_parameter', command=command), text)
+        return
+
+    if tags[0]:
         if index.isdigit() and 1 <= int(index) <= len(var.playlist):
-            if params[1] != "*":
-                tags = list(map(lambda t: t.strip(), params[1].split(",")))
+            if tags[0] != "*":
                 var.playlist[int(index) - 1].remove_tags(tags)
                 log.info("cmd: remove tags %s from song %s" % (", ".join(tags),
                                                           var.playlist[int(index) - 1].format_debug_string()))
@@ -874,8 +896,7 @@ def cmd_remove_tag(bot, user, text, command, parameter):
                 return
 
         elif index == "*":
-            if params[1] != "*":
-                tags = list(map(lambda t: t.strip(), params[1].split(",")))
+            if tags[0] != "*":
                 for item in var.playlist:
                     item.remove_tags(tags)
                     log.info("cmd: remove tags %s from song %s" % (", ".join(tags),
diff --git a/configuration.default.ini b/configuration.default.ini
index d349dd5..0e0a6fd 100644
--- a/configuration.default.ini
+++ b/configuration.default.ini
@@ -285,10 +285,9 @@ help = <h3>Commands</h3>
        <b>Music Library</b>
        <ul>
        <li> <b>!<u>se</u>arch </b> {keywords} - find item with {keywords} in the music library, keywords separated by space.</li>
-       <li> <b>!<u>addt</u>ag </b> {index} {tags} - add {tags} to {index}-th item on the playlist, tags separated by ",". </li>
+       <li> <b>!<u>addt</u>ag </b> [{index}] {tags} - add {tags} to {index}-th(current song if {index} is omitted) item on the playlist, tags separated by ",". </li>
        <li> <b>!<u>addt</u>ag </b> * {tags} - add {tags} to all items on the playlist. </li>
-       <li> <b>!<u>un</u>tag </b> {index/*} {tags} - remove {tags} from {index}-th item on the playlist. </li>
-       <li> <b>!<u>un</u>tag </b> {index/*} * - remove all tags from {index}-th item on the playlist. </li>
+       <li> <b>!<u>un</u>tag </b> [{index/*}] {tags}/* - remove {tags}/all tags from {index}-th(current song if {index} is omitted) item on the playlist. </li>
        <li> <b>!<u>fin</u>dtagged </b> (or <b>!ft</b>) {tags} - find item with {tags} in the music library. </li>
        <li> <b>!<u>del</u>ete </b> {index} - delete {index}-th item on the shortlist from the music library. </li>
        </ul>