Skip to content

Commit d38dca9

Browse files
committed
update display
1 parent 006ff51 commit d38dca9

File tree

3 files changed

+17
-15
lines changed

3 files changed

+17
-15
lines changed

VERSION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.9.13
1+
0.9.14

plex_image_cleanup.py

+15-13
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
print("Requirements Error: Requirements are not installed")
2020
sys.exit(0)
2121

22-
if sys.version_info[0] != 3 or sys.version_info[1] < 10:
23-
print("Version Error: Version: %s.%s.%s incompatible please use Python 3.10+" % (sys.version_info[0], sys.version_info[1], sys.version_info[2]))
22+
if sys.version_info[0] != 3 or sys.version_info[1] < 11:
23+
print("Version Error: Version: %s.%s.%s incompatible please use Python 3.11+" % (sys.version_info[0], sys.version_info[1], sys.version_info[2]))
2424
sys.exit(0)
2525

2626
def not_failed(exception):
@@ -74,10 +74,9 @@ def not_failed(exception):
7474
]
7575
script_name = "Plex Image Cleanup"
7676
plex_db_name = "com.plexapp.plugins.library.db"
77-
metadata_folders = ["Movies", "TV Shows", "Playlists", "Collections", "Artists", "Albums"]
7877
base_dir = os.path.dirname(os.path.abspath(__file__))
7978
config_dir = os.path.join(base_dir, "config")
80-
pmmargs = PMMArgs("meisnate12/Plex-Image-Cleanup", os.path.dirname(os.path.abspath(__file__)), options, use_nightly=False)
79+
pmmargs = PMMArgs("meisnate12/Plex-Image-Cleanup", base_dir, options, use_nightly=False)
8180
logger = logging.PMMLogger(script_name, "plex_image_cleanup", os.path.join(config_dir, "logs"), discord_url=pmmargs["discord"], log_requests=pmmargs["trace"])
8281
logger.secret([pmmargs["url"], pmmargs["discord"], pmmargs["token"], quote(str(pmmargs["url"])), requests.utils.urlparse(pmmargs["url"]).netloc])
8382
requests.Session.send = util.update_send(requests.Session.send, pmmargs["timeout"])
@@ -113,6 +112,11 @@ def run_plex_image_cleanup(attrs):
113112
if extras:
114113
description += f" with {', '.join(extras[:-1])}{', and ' if len(extras) > 1 else ''}{extras[-1]} set to True"
115114
logger.info(description)
115+
116+
try:
117+
logger.info("Script Started", log=False, discord=True, start="script")
118+
except Failed as e:
119+
logger.error(f"Discord URL Error: {e}")
116120
report = []
117121
messages = []
118122
try:
@@ -122,11 +126,6 @@ def run_plex_image_cleanup(attrs):
122126
logger.info(f"{mode.capitalize()}: {modes[mode]['desc']}")
123127
do_metadata = mode in ["report", "move", "remove"]
124128

125-
try:
126-
logger.info("Script Started", log=False, discord=True)
127-
except Failed as e:
128-
logger.error(f"Discord URL Error: {e}")
129-
130129
# Check Plex Path
131130
if not pmmargs["plex"]:
132131
if not os.path.exists(os.path.join(base_dir, "plex")):
@@ -330,7 +329,8 @@ def plex_connect():
330329
space = util.format_bytes(logger["size"])
331330
logger.info(f"{modes[mode]['space']}: {space}")
332331
logger.info(f"Runtime: {logger.runtime()}")
333-
report.append([(f"{modes[mode]['ing']} Bloat Images", f"{space} of {modes[mode]['space']} {modes[mode]['ing']} {len(bloat_paths)} Files")])
332+
report.append([(f"{modes[mode]['ing']} Bloat Images", "")])
333+
report.append([("", f"{space} of {modes[mode]['space']} {modes[mode]['ing']} {len(bloat_paths)} Files")])
334334
report.append([("Scan Time", f"{logger.runtime('scanning')}"), (f"{mode.capitalize()} Time", f"{logger.runtime('work')}")])
335335
elif mode in ["restore", "clear"]:
336336
if not os.path.exists(restore_dir):
@@ -379,7 +379,8 @@ def plex_connect():
379379
space = util.format_bytes(logger["size"])
380380
logger.info(f"Space Recovered: {space}")
381381
logger.info(f"Runtime: {logger.runtime()}")
382-
report.append([("Removing PIC Restore Bloat Images", f"{space} of Space Recovered Removing {len(del_paths)} Files")])
382+
report.append([("Removing PIC Restore Bloat Images", "")])
383+
report.append([("", f"{space} of Space Recovered Removing {len(del_paths)} Files")])
383384
report.append([("Scan Time", f"{logger.runtime('scanning')}"), ("Restore Time", f"{logger.runtime('work')}")])
384385
except Failed as e:
385386
logger.error(f"Metadata Error: {e}")
@@ -409,7 +410,8 @@ def plex_connect():
409410
space = util.format_bytes(logger["size"])
410411
logger.info(f"Space Recovered: {space}")
411412
logger.info(f"Runtime: {logger.runtime()}")
412-
report.append([("Remove PhotoTranscoder Images", f"{space} of Space Recovered Removing {len(transcode_images)} Files")])
413+
report.append([("Remove PhotoTranscoder Images", "")])
414+
report.append([("", f"{space} of Space Recovered Removing {len(transcode_images)} Files")])
413415
report.append([("Scan Time", f"{logger.runtime('transcode_scan')}"), ("Remove Time", f"{logger.runtime('transcode')}")])
414416

415417
# Plex Operations
@@ -444,7 +446,7 @@ def plex_connect():
444446
logger.error_report()
445447
logger.switch()
446448
report.append([(f"{script_name} Finished", "")])
447-
report.append([("Total Runtime", f"{logger.runtime()}")])
449+
report.append([("Total Runtime", f"{logger.runtime('script')}")])
448450
logger.report(f"{script_name} Summary", description=description, rows=report, width=18, discord=True)
449451
logger.remove_main_handler()
450452

requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ numpy==1.24.2
33
opencv-python==4.7.0.68
44
pillow==9.4.0
55
PlexAPI==4.13.2
6-
pmmutils==0.3.15
6+
pmmutils==0.3.19
77
requests==2.28.2
88
retrying==1.3.4
99
tmdbapis==1.1.0

0 commit comments

Comments
 (0)