Fixed bad category list building.

src/fr/devinsy/statoolinfos/core/Categories.java

@@ -54,7 +54,7 @@ public class Categories extends ArrayList<Category>
 
         for (Category category : this)
         {
-            if (category.getSoftwares().containsAnyIgnoreCase(softwareName))
+            if (category.matchesSoftware(softwareName))
             {
                 result.add(category);
             }
@@ -84,7 +84,7 @@ public class Categories extends ArrayList<Category>
             {
                 Category category = iterator.next();
 
-                if (category.getSoftwares().containsIgnoreCase(softwareName))
+                if (category.matchesSoftware(softwareName))
                 {
                     ended = true;
                     result = true;

src/fr/devinsy/statoolinfos/core/Category.java

@@ -18,6 +18,8 @@
  */
 package fr.devinsy.statoolinfos.core;
 
+import java.util.Iterator;
+
 import org.apache.commons.lang3.StringUtils;
 
 import fr.devinsy.strings.StringList;
@@ -126,13 +128,46 @@ public class Category
     {
         boolean result;
 
-        if (this.softwares.containsIgnoreCase(service.getSoftwareName()))
+        result = matchesSoftware(service.getSoftwareName());
+
+        //
+        return result;
+    }
+
+    /**
+     * Matches.
+     *
+     * @param softwareName
+     *            the software name
+     * @return true, if successful
+     */
+    public boolean matchesSoftware(final String softwareName)
+    {
+        boolean result;
+
+        String target = StringUtils.stripAccents(softwareName).replaceAll("[\\W\\s]", "");
+
+        boolean ended = false;
+        Iterator<String> iterator = this.softwares.iterator();
+        result = false;
+        while (!ended)
         {
-            result = true;
+            if (iterator.hasNext())
-        }
+            {
-        else
+                String source = iterator.next();
-        {
+                source = StringUtils.stripAccents(source).replaceAll("[\\W\\s]", "");
-            result = false;
+
+                if (StringUtils.equalsIgnoreCase(target, source))
+                {
+                    ended = true;
+                    result = true;
+                }
+            }
+            else
+            {
+                ended = true;
+                result = false;
+            }
         }
 
         //

src/fr/devinsy/statoolinfos/metrics/http/userAgentBotDetectorData.txt

@@ -38,6 +38,7 @@ Nutch-
 ^Python-urllib/
  SemrushBot
 ^Synapse/
+TinyStatus
 ^Tusky/
 YisouSpider
  zgrab/

src/fr/devinsy/statoolinfos/stats/StatAgent.java

@@ -92,7 +92,7 @@ public class StatAgent
             for (Service service : federation.getServices())
             {
                 String softwareName = service.getSoftwareName();
-                if (category.getSoftwares().containsIgnoreCase(softwareName))
+                if (category.matchesSoftware(softwareName))
                 {
                     stat.incServiceCount();
                     YearMonth month = YearMonth.now().minusMonths(1);

src/fr/devinsy/statoolinfos/stats/properties/PropertyStats.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2022 Christian Pierre MOMON <christian@momon.org>
+ * Copyright (C) 2020 Christian Pierre MOMON <christian@momon.org>
  * 
  * This file is part of StatoolInfos, simple service statistics tool.
  *