Merge pull request #366 from Eswcvlad/master

Fix YouTube package update logic

configuration.default.ini

@@ -65,6 +65,7 @@ tmp_folder_max_size = 10
 username = botamusique
 volume = 0.8
 when_nobody_in_channel = nothing
+when_nobody_in_channel_ignore =
 
 [webinterface]
 access_address = http://127.0.0.1:8181

configuration.example.ini

@@ -134,6 +134,10 @@ port = 64738
 #     - leave empty (do nothing)
 #when_nobody_in_channel =
 
+# 'when_nobody_in_channel_ignore': Specify the list of users that should be ignored, from the list of active users.
+#   This is typically used when other bots are present in the channel.
+#when_nobody_in_channel_ignore =
+
 # 'youtube_query_cookie': Sometimes youtube will block the request of our bot and
 #   request the bot to complete a captcha to verify the request is not made by a
 #   bot.

mumbleBot.py

@@ -103,6 +103,7 @@ class MumbleBot:
             tokens = var.config.get("server", "tokens")
             tokens = tokens.split(',')
 
+
         if args.user:
             self.username = args.user
         else:
@@ -132,8 +133,11 @@ class MumbleBot:
         self.join_channel()
         self.mumble.set_bandwidth(self.bandwidth)
 
+        bots = var.config.get("bot", "when_nobody_in_channel_ignore",fallback="")
+        self.bots = set(bots.split(','))
         self._user_in_channel = self.get_user_count_in_channel()
 
+
         # ====== Volume ======
         self.volume_helper = util.VolumeHelper()
 
@@ -374,8 +378,18 @@ class MumbleBot:
     # =======================
 
     def get_user_count_in_channel(self):
+        # Get the channel, based on the channel id
         own_channel = self.mumble.channels[self.mumble.users.myself['channel_id']]
-        return len(own_channel.get_users())
+
+        # Build set of unique usernames
+        users = set([user.get_property("name") for user in own_channel.get_users()])
+
+        # Exclude all bots from the set of usernames
+        users = users.difference(self.bots)
+
+        # Return the number of elements in the set, as the final user count
+        return len(users)
+
 
     def users_changed(self, user, message):
         # only check if there is one more user currently in the channel

util.py

@@ -12,13 +12,15 @@ import zipfile
 import re
 import subprocess as sp
 import logging
-import yt_dlp as youtube_dl
 from importlib import reload
 from sys import platform
 import traceback
 import requests
 from packaging import version
 
+import yt_dlp as youtube_dl
+YT_PKG_NAME = 'yt-dlp'
+
 log = logging.getLogger("bot")
 
 
@@ -137,7 +139,7 @@ def update(current_version):
     new_version = new_release_version(target)
     msg = ""
     if target == "git":
-        msg = "git install, I do nothing"
+        msg = "git install, I do nothing<br/>"
 
     elif (target == "stable" and version.parse(new_version) > version.parse(current_version)) or \
             (target == "testing" and version.parse(new_version) != version.parse(current_version)):
@@ -146,17 +148,17 @@ def update(current_version):
         log.debug(tp)
         log.info('update: update pip libraries dependencies')
         sp.check_output([var.config.get('bot', 'pip3_path'), 'install', '--upgrade', '-r', 'requirements.txt']).decode()
-        msg = "New version installed, please restart the bot."
+        msg = "New version installed, please restart the bot.<br/>"
 
-    log.info('update: starting update youtube-dl via pip3')
-    tp = sp.check_output([var.config.get('bot', 'pip3_path'), 'install', '--upgrade', 'youtube-dl']).decode()
-    if "Requirement already up-to-date" in tp:
-        msg += "Youtube-dl is up-to-date"
-    else:
+    log.info(f'update: starting update {YT_PKG_NAME} via pip3')
+    tp = sp.check_output([var.config.get('bot', 'pip3_path'), 'install', '--upgrade', YT_PKG_NAME]).decode()
+    if f"Collecting {YT_PKG_NAME}" in tp.splitlines():
         msg += "Update done: " + tp.split('Successfully installed')[1]
+    else:
+        msg += YT_PKG_NAME.capitalize() + " is up-to-date"
 
     reload(youtube_dl)
-    msg += "<br/> Youtube-dl reloaded"
+    msg += "<br/>" + YT_PKG_NAME.capitalize() + " reloaded"
     return msg