github/plexpy
1
0
Fork 0
mirror of https://github.com/Tautulli/Tautulli.git synced 2025-08-19 21:03:21 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Always try to delete export images folder

Browse source
This commit is contained in:
JonnyWong16 2020-10-07 20:41:10 -07:00
commit 8552b00be4
No known key found for this signature in database
GPG key ID: B1F1F9807184697A
1 changed files with 5 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

11
plexpy/exporter.py
View file

@ -1784,8 +1784,7 @@ class Export(object):
filename = helpers.clean_filename('{} [{}].{}.jpg'.format(item_title, rating_key, image)) filename = helpers.clean_filename('{} [{}].{}.jpg'.format(item_title, rating_key, image))
filepath = os.path.join(folder, filename) filepath = os.path.join(folder, filename)
if not os.path.exists(folder): os.makedirs(folder, exist_ok=True)
os.makedirs(folder)
image_url = None image_url = None
if image == 'art': if image == 'art':
@ -1872,10 +1871,8 @@ def delete_export(export_id):
logger.info("Tautulli Exporter :: Deleting exported file from '%s'.", filepath) logger.info("Tautulli Exporter :: Deleting exported file from '%s'.", filepath)
try: try:
os.remove(filepath) os.remove(filepath)
if export_data['include_thumb'] or export_data['include_art']:
images_folder = get_export_filepath(export_data['filename'], images=True) images_folder = get_export_filepath(export_data['filename'], images=True)
if os.path.exists(images_folder): shutil.rmtree(images_folder, ignore_errors=True)
shutil.rmtree(images_folder)
except OSError as e: except OSError as e:
logger.error("Tautulli Exporter :: Failed to delete exported file '%s': %s", filepath, e) logger.error("Tautulli Exporter :: Failed to delete exported file '%s': %s", filepath, e)
return True return True
@ -1895,10 +1892,8 @@ def delete_all_exports():
filepath = get_export_filepath(row['filename']) filepath = get_export_filepath(row['filename'])
try: try:
os.remove(filepath) os.remove(filepath)
if row['include_thumb'] or row['include_art']:
images_folder = get_export_filepath(row['filename'], images=True) images_folder = get_export_filepath(row['filename'], images=True)
if os.path.exists(images_folder): shutil.rmtree(images_folder, ignore_errors=True)
shutil.rmtree(images_folder)
except OSError as e: except OSError as e:
logger.error("Tautulli Exporter :: Failed to delete exported file '%s': %s", filepath, e) logger.error("Tautulli Exporter :: Failed to delete exported file '%s': %s", filepath, e)
deleted_files = False deleted_files = False