From 6bc9a9a8e0d9217fe468b3a9612a44c6cbc61be8 Mon Sep 17 00:00:00 2001
From: Kyle Robbertze <kyle@paddatrapper.com>
Date: Mon, 1 Feb 2021 22:46:07 +0200
Subject: [PATCH] Allow music_folder to not have trailing /

---
 mumbleBot.py | 3 +++
 util.py      | 2 --
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/mumbleBot.py b/mumbleBot.py
index 1268d8b..099b580 100644
--- a/mumbleBot.py
+++ b/mumbleBot.py
@@ -821,6 +821,9 @@ if __name__ == '__main__':
     DatabaseMigration(var.db, var.music_db).migrate()
 
     var.music_folder = util.solve_filepath(var.config.get('bot', 'music_folder'))
+    if not var.music_folder.endswith(os.sep):
+        # The file searching logic assumes that the music folder ends in a /
+        var.music_folder = var.music_folder + os.sep
     var.tmp_folder = util.solve_filepath(var.config.get('bot', 'tmp_folder'))
 
     # ======================
diff --git a/util.py b/util.py
index bfec1ed..5a9db3b 100644
--- a/util.py
+++ b/util.py
@@ -40,8 +40,6 @@ def get_recursive_file_list_sorted(path):
         relroot = root.replace(path, '', 1)
         if relroot != '' and relroot in var.config.get('bot', 'ignored_folders'):
             continue
-        if len(relroot):
-            relroot += '/'
         for file in files:
             if file in var.config.get('bot', 'ignored_files'):
                 continue