Merge pull request #1 from meeb/meeb

[irc/quakenet/newserv.git] / clonehistogram / clonehistogram.c

diff --git a/clonehistogram/clonehistogram.c b/clonehistogram/clonehistogram.c
index 8b80c2da08f29e1b1f41729fb45ce262c7237291..0d77ab8a200fd964af1d7c086425378d17a4622d 100644 (file)
--- a/clonehistogram/clonehistogram.c
+++ b/clonehistogram/clonehistogram.c
@@ -3,34 +3,68 @@
 #include "../control/control.h"
 #include "../lib/irc_string.h"
 #include "../localuser/localuserchannel.h"
+#include "../lib/version.h"
 
-int ch_clonehistogram(void *source, int cargc, char **cargv);
+MODULE_VERSION("");
 
-#define MAX_CLONES 0
+int ch_clonehistogram(void *source, int cargc, char **cargv);
+int ch_chanhistogram(void *source, int cargc, char **cargv);
 
+#define MAX_CLONES 5
+#define MAX_CHANS 20
 
 void _init() {
   registercontrolhelpcmd("clonehistogram", NO_OPER, 1, ch_clonehistogram, "Usage: clonehistogram <hostmask>\nShows the distribution of user clone counts of a given mask.");
+  registercontrolhelpcmd("chanhistogram", NO_OPER, 1, ch_chanhistogram, "Usage: chanhistogram\nShows the channel histogram.");
 }
 
 void _fini () {
   deregistercontrolcmd("clonehistogram", ch_clonehistogram);
+  deregistercontrolcmd("chanhistogram", ch_chanhistogram);
 }
 
 void histoutput(nick *np, int clonecount, int amount, int total) {
   char max[51];
-  float percentage = (amount / total) * 100;
+  float percentage = ((float)amount / (float)total) * 100;
 
   if(percentage > 1)
     memset(max, '#', (int)(percentage / 2));
   max[(int)(percentage / 2)] = '\0';
 
-  controlreply(np, "%s%d %02.2f %s", (clonecount<1)?">":"=", abs(clonecount), percentage, max);
+  controlreply(np, "%s%d %06.2f%% %s", (clonecount<1)?">":"=", abs(clonecount), percentage, max);
+}
+
+int ch_chanhistogram(void *source, int cargc, char **cargv) {
+  nick *np = (nick *)source;
+  nick *np2;
+  int count[MAX_CHANS + 2], j, n, total = 0;
+
+  memset(count, 0, sizeof(count));
+
+  for (j=0;j<NICKHASHSIZE;j++) {
+    for(np2=nicktable[j];np2;np2=np2->next) {
+      total++;
+      n = np2->channels->cursi;
+      if(n > MAX_CHANS) {
+        count[MAX_CHANS + 1]++;
+      } else {
+        count[n]++;
+      }
+    }
+  }
+
+
+  for(j=1;j<=MAX_CHANS;j++)
+    histoutput(np, j, count[j], total);
+
+  histoutput(np, -(MAX_CHANS + 1), count[MAX_CHANS + 1], total);
+
+  return CMD_OK;
 }
 
 int ch_clonehistogram(void *source, int cargc, char **cargv) {
   nick *np = (nick *)source;
-  int count[MAX_CLONES + 1], j, total = 0;
+  int count[MAX_CLONES + 1], j, total = 0, totalusers = 0;
   host *hp;
   char *pattern;
 
@@ -40,28 +74,29 @@ int ch_clonehistogram(void *source, int cargc, char **cargv) {
   pattern = cargv[0];
 
   memset(count, 0, sizeof(count));
-  controlreply(np, "Applying pattern, please wait. . .");
 
   for (j=0;j<HOSTHASHSIZE;j++)
     for(hp=hosttable[j];hp;hp=hp->next)
       if (match2strings(pattern, hp->name->content)) {
-        total+=hp->clonecount;
+        total++;
+        totalusers+=hp->clonecount;
+
         if(hp->clonecount && (hp->clonecount > MAX_CLONES)) {
           count[0]++;
         } else {
-          count[hp->clonecount++]++;
+          count[hp->clonecount]++;
         }
       }
 
   if(total == 0) {
-    controlreply(np, "No users matched.");
+    controlreply(np, "No hosts matched.");
   } else {
     for(j=1;j<=MAX_CLONES;j++)
       histoutput(np, j, count[j], total);
 
     histoutput(np, -MAX_CLONES, count[0], total);
 
-    controlreply(np, "%d users matched.", total);
+    controlreply(np, "%d hosts/%d users matched.", total, totalusers);
   }
 
   controlreply(np, "Done.");