Changeset 6908ab7

Timestamp:

2016-12-26T00:18:55Z (8 years ago)

Author:

dequis <dx@…>

Branches:

master

Children:

7486853

Parents:

1999fe5

git-author:

dequis <dx@…> (25-12-16 22:50:31)

git-committer:

dequis <dx@…> (26-12-16 00:18:55)

Message:

Add 'plugins info' subcommand, only show plugin details there

Files:

• doc/user-guide/commands.xml (modified) (1 diff)
• root_commands.c (modified) (1 diff)

doc/user-guide/commands.xml

@@ -1869 +1869 @@
         <bitlbee-command name="plugins">
                 <short-description>List all the external plugins and protocols</short-description>
-                <syntax>plugins</syntax>
+                <syntax>plugins [info &lt;name&gt;]</syntax>
 
                 <description>
                         <para>
                                 This gives you a list of all the external plugins and protocols.
+                        </para>
+
+                        <para>
+                                Use the <emphasis>info</emphasis> subcommand to get more details about a plugin.
                         </para>
                 </description>

root_commands.c

@@ -1164 +1164 @@
 }
 
+static void cmd_plugins_info(irc_t *irc, char **cmd)
+{
+        GList *l;
+        struct plugin_info *info;
+
+        MIN_ARGS(2);
+
+        for (l = get_plugins(); l; l = l->next) {
+                info = l->data;
+                if (g_strcasecmp(cmd[2], info->name) == 0) {
+                        break;
+                }
+        }
+
+        if (!l) {
+                return;
+        }
+
+        irc_rootmsg(irc, "%s:", info->name);
+        irc_rootmsg(irc, "  Version: %s", info->version);
+
+        if (info->description) {
+                irc_rootmsg(irc, "  Description: %s", info->description);
+        }
+
+        if (info->author) {
+                irc_rootmsg(irc, "  Author: %s", info->author);
+        }
+
+        if (info->url) {
+                irc_rootmsg(irc, "  URL: %s", info->url);
+        }
+}
+
 static void cmd_plugins(irc_t *irc, char **cmd)
 {
         GList *prpls;
         GString *gstr;
+
+        if (cmd[1] && g_strcasecmp(cmd[1], "info") == 0) {
+                cmd_plugins_info(irc, cmd);
+                return;
+        }
 
 #ifdef WITH_PLUGINS
         GList *l;
         struct plugin_info *info;
+        char *format;
+
+        if (strchr(irc->umode, 'b') != NULL) {
+                format = "%s\t%s";
+        } else {
+                format = "%-30s  %s";
+        }
+
+        irc_rootmsg(irc, format, "Plugin", "Version");
 
         for (l = get_plugins(); l; l = l->next) {
                 info = l->data;
-                irc_rootmsg(irc, "%s:", info->name);
-                irc_rootmsg(irc, "  Version: %s", info->version);
-
-                if (info->description) {
-                        irc_rootmsg(irc, "  Description: %s", info->description);
-                }
-
-                if (info->author) {
-                        irc_rootmsg(irc, "  Author: %s", info->author);
-                }
-
-                if (info->url) {
-                        irc_rootmsg(irc, "  URL: %s", info->url);
-                }
-
-                irc_rootmsg(irc, "");
+                irc_rootmsg(irc, format, info->name, info->version);
         }
 #endif
+
+        irc_rootmsg(irc, "");
 
         gstr = g_string_new(NULL);