diff --git a/Radarr/delete_files.py b/Radarr/delete_files.py index 0a23bf7..e89d199 100644 --- a/Radarr/delete_files.py +++ b/Radarr/delete_files.py @@ -6,9 +6,9 @@ import logging import glob -logging.basicConfig(filename='/home/rouggy/Scripts/ArrDeleteFiles/Radarr.log', encoding='utf-8', level=logging.DEBUG) +logging.basicConfig(filename='/home/rouggy/Scripts/ArrDeleteFiles/Radarr/Radarr.log', encoding='utf-8', level=logging.DEBUG) -PATH_LIST = ["Movies", "Series", "4K-Movies", "4K-Series", "Cartoons"] +PATH_LIST = ["Movies", "Series", "4K-Movies", "4K-Series", "Cartoons", "Kids", "Concerts"] BasePath = "" SourcePath = "" diff --git a/Sonarr/delete_files.py b/Sonarr/delete_files.py index da2f95c..d21dc24 100644 --- a/Sonarr/delete_files.py +++ b/Sonarr/delete_files.py @@ -3,15 +3,16 @@ import requests import os import logging +import glob -logging.basicConfig(filename='/home/rouggy/Scripts/ArrDeleteFiles/Sonarr.log', level=logging.DEBUG) +logging.basicConfig(filename='/home/rouggy/Scripts/ArrDeleteFiles/Sonarr/Sonarr.log', level=logging.DEBUG) -PATH_LIST = ["Movies", "Series", "4K-Movies", "4K-Series", "Cartoons"] +PATH_LIST = ["Movies", "Series", "4K-Movies", "4K-Series", "Cartoons", "Kids", "Concerts"] BasePath = "" SourcePath = "" -MovieFolder = "" +SourceFolder = "" def sendNotifications(title, message, priority): resp = requests.post('https://gotify.rouggy.com/message?token=AKMj5SsZblmpAJ_', json={ @@ -31,9 +32,7 @@ try: # Get the folder name of the file to check if movie/serie is inside a folder or not - MovieFolder = os.path.dirname(SourcePath) - logging.debug(f"Serie Folder: {MovieFolder}") - BasePath = os.path.basename(MovieFolder) + BasePath = os.path.basename(SourceFolder) logging.debug(f"Base Path: {BasePath}") except: logging.warning("Could not get environment variables") @@ -41,9 +40,12 @@ except: if BasePath not in PATH_LIST: try: os.remove(SourcePath) - logging.debug(f"Removing folder {SourcePath}") - os.rmdir(MovieFolder) - logging.debug(f"Deleting folder {MovieFolder}") + logging.debug(f"Removing file {SourcePath}") + for file in glob.glob(SourceFolder + "/*"): + os.remove(file) + logging.debug(f"Removing file {file} from {SourceFolder}") + os.rmdir(SourceFolder) + logging.debug(f"Deleting folder {SourceFolder}") except: pass else: