From 41b5de9292ee7a44f2731be681943bf8257b214a Mon Sep 17 00:00:00 2001
From: jokob-sk <jokob-sk@gmail.com>
Date: Tue, 9 Jul 2024 23:30:09 +1000
Subject: [PATCH] =?UTF-8?q?=E2=9A=99=20NAME=5FCLEANUP=5FREGEX=20test?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/php/templates/header.php            |  2 +-
 front/plugins/_publisher_mqtt/config.json |  2 +-
 server/helper.py                          | 43 +++++++++++++++--------
 3 files changed, 30 insertions(+), 17 deletions(-)

diff --git a/front/php/templates/header.php b/front/php/templates/header.php
index 57c2b177..34e3f4a1 100755
--- a/front/php/templates/header.php
+++ b/front/php/templates/header.php
@@ -372,7 +372,7 @@ if ($ENABLED_DARKMODE === True) {
           </a>
           <ul class="treeview-menu " style="display: <?php if (in_array (basename($_SERVER['SCRIPT_NAME']), array('plugins.php', 'workflows.php' ) ) ){ echo 'block'; } else {echo 'none';} ?>;">                    
             <li>
-              <div class="info-icon-nav work-in-progress">  </div>
+              <div class="info-icon-nav">  </div>
               <a href="workflows.php"><?= lang('Navigation_Workflows');?></a>
             </li>
             <li>
diff --git a/front/plugins/_publisher_mqtt/config.json b/front/plugins/_publisher_mqtt/config.json
index 4d6932a0..365ff877 100755
--- a/front/plugins/_publisher_mqtt/config.json
+++ b/front/plugins/_publisher_mqtt/config.json
@@ -685,7 +685,7 @@
       "name": [
         {
           "language_code": "en_us",
-          "string": "Device SQL"
+          "string": "Devices SQL"
         }
       ],
       "description": [
diff --git a/server/helper.py b/server/helper.py
index e15c2e41..bf41d0b7 100755
--- a/server/helper.py
+++ b/server/helper.py
@@ -646,9 +646,12 @@ import dns.resolver
 
 def cleanDeviceName(str, match_IP):
 
+    mylog('debug', ["[cleanDeviceName] input: " + str])
+
     # add matching info
     if match_IP:
         str = str + " (IP match)"
+    
 
     if get_setting_value('NEWDEV_LESS_NAME_CLEANUP'):
         mylog('debug', ["[Name cleanup] Using new cleanDeviceName(" + str + ")"])
@@ -688,22 +691,32 @@ def cleanDeviceName(str, match_IP):
     # OLD cleanDeviceName
     mylog('debug', ["[Name cleanup] Using old cleanDeviceName(" + str + ")"])
 
-    # alternative str.split('.')[0]
-    str = str.replace("._airplay", "")
-    str = str.replace("._tcp", "")
-    str = str.replace(".localdomain", "")
-    str = str.replace(".local", "")
-    str = str.replace("._esphomelib", "")
-    str = str.replace("._googlecast", "")
-    str = str.replace(".lan", "")
-    str = str.replace(".home", "")
-    str = re.sub(r'-[a-fA-F0-9]{32}', '', str)    # removing last part of e.g. Nest-Audio-ff77ff77ff77ff77ff77ff77ff77ff77
-    str = re.sub(r'#.*', '', str) # Remove everything after '#' including the '#'
-    # remove trailing dots
-    if str.endswith('.'):
-        str = str[:-1]
+    # # alternative str.split('.')[0]
+    # str = str.replace("._airplay", "")
+    # str = str.replace("._tcp", "")
+    # str = str.replace(".localdomain", "")
+    # str = str.replace(".local", "")
+    # str = str.replace("._esphomelib", "")
+    # str = str.replace("._googlecast", "")
+    # str = str.replace(".lan", "")
+    # str = str.replace(".home", "")
+    # str = re.sub(r'-[a-fA-F0-9]{32}', '', str)    # removing last part of e.g. Nest-Audio-ff77ff77ff77ff77ff77ff77ff77ff77
+    # str = re.sub(r'#.*', '', str) # Remove everything after '#' including the '#'
+    # # remove trailing dots
+    # if str.endswith('.'):
+    #     str = str[:-1]
 
-    mylog('debug', ["cleanDeviceName = " + str])
+    regexes = get_setting_value('NEWDEV_NAME_CLEANUP_REGEX')
+
+    for rgx in regexes:
+        mylog('debug', ["[cleanDeviceName] applying regex    : " + rgx])
+        mylog('debug', ["[cleanDeviceName] name before regex : " + str])
+        
+        str = re.sub(rgx, "", str)
+        mylog('debug', ["[cleanDeviceName] name after regex  : " + str])
+
+    mylog('debug', ["[cleanDeviceName] output: " + str])
+    
     return str
 
 #-------------------------------------------------------------------------------