Delete exported images folder
This commit is contained in:
@@ -22,6 +22,7 @@ from backports import csv
|
|||||||
import json
|
import json
|
||||||
import os
|
import os
|
||||||
import requests
|
import requests
|
||||||
|
import shutil
|
||||||
import threading
|
import threading
|
||||||
|
|
||||||
from functools import partial, reduce
|
from functools import partial, reduce
|
||||||
@@ -1430,7 +1431,9 @@ 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)
|
||||||
# TODO: Delete images as well
|
folder = '{}.images'.format(os.path.splitext(filepath)[0])
|
||||||
|
if os.path.exists(folder):
|
||||||
|
shutil.rmtree(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
|
||||||
@@ -1450,6 +1453,9 @@ def delete_all_exports():
|
|||||||
filepath = get_export_filepath(row['filename'])
|
filepath = get_export_filepath(row['filename'])
|
||||||
try:
|
try:
|
||||||
os.remove(filepath)
|
os.remove(filepath)
|
||||||
|
folder = '{}.images'.format(os.path.splitext(filepath)[0])
|
||||||
|
if os.path.exists(folder):
|
||||||
|
shutil.rmtree(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
|
||||||
|
Reference in New Issue
Block a user