From a477c3a167527c70d90e1ea8210fd08ff31e5789 Mon Sep 17 00:00:00 2001 From: rouggy Date: Mon, 21 Nov 2022 11:05:25 +0700 Subject: [PATCH] update --- Radarr/delete_files.py | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/Radarr/delete_files.py b/Radarr/delete_files.py index c005218..0a23bf7 100644 --- a/Radarr/delete_files.py +++ b/Radarr/delete_files.py @@ -3,6 +3,7 @@ import requests import os import logging +import glob logging.basicConfig(filename='/home/rouggy/Scripts/ArrDeleteFiles/Radarr.log', encoding='utf-8', level=logging.DEBUG) @@ -11,7 +12,7 @@ PATH_LIST = ["Movies", "Series", "4K-Movies", "4K-Series", "Cartoons"] BasePath = "" SourcePath = "" -MovieFolder = "" +SourceFolder = "" def sendNotifications(title, message, priority): resp = requests.post('https://gotify.rouggy.com/message?token=AKMj5SsZblmpAJ_', json={ @@ -29,11 +30,8 @@ try: SourceFolder = os.environ.get('radarr_moviefile_sourcefolder') logging.debug(f"Source Folder: {SourceFolder}") - # 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"Movie 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 +39,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: