diff --git a/bot.py b/bot.py index d2bb2cd..9270b0d 100644 --- a/bot.py +++ b/bot.py @@ -69,6 +69,9 @@ MUZYKA_MOJEGO_LUDU_HISTORIA = 1500 MUZYKA_MOJEGO_LUDU_SLOWA_KLUCZOWE = 15 MUZYKA_MOJEGO_LUDU_PLAJLISTA = 30 +FILE_SERVICE_ADDRESS = "http://192.161.168.1.15:5000" +GET_MP3 = "/mp3" + # *=========================================== Platform Specific Predefines if platform in ("linux", "linux2"): @@ -162,11 +165,21 @@ logger.info("Playlist generation") # *=========================================== Load Data files music_file_list = [] -for mp3_item in Path.glob(Path(MUSIC_FOLDER), "**/*.mp3"): - temp_music_file = mp3_item.as_posix() - if platform == "win32": - temp_music_file = temp_music_file.replace("/", "\\") - music_file_list.append(temp_music_file) +try: + response = requests.get(f'{FILE_SERVICE_ADDRESS}{GET_MP3}',timeout=360) + music_file_list = response.json() +except: + for mp3_item in Path.glob(Path(MUSIC_FOLDER), "**/*.mp3"): + temp_music_file = mp3_item.as_posix() + if platform == "win32": + temp_music_file = temp_music_file.replace("/", "\\") + music_file_list.append(temp_music_file) + logger.error("Service Unavailable") +finally: + sys,exit() + + + with open(SYSTEM_GPT_SETTINGS, "r+", encoding=ENCODING) as temp_settings_file: # First we load existing data into a dict. GPT_SETTINGS = json.load(temp_settings_file) diff --git a/file_webservice/conjurer_musician.py b/file_webservice/conjurer_musician.py index 5088ae3..6dd204b 100644 --- a/file_webservice/conjurer_musician.py +++ b/file_webservice/conjurer_musician.py @@ -43,7 +43,7 @@ def get_music_list(): return jsonify({'music_file_list':music_file_list}) if __name__=='__main__': - app.run(debug=True, host="0.0.0.0") + app.run(debug=False, host="192.168.161.1.15") #TODO: Reskan co 24h