danvics/soulsync
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

cleanup staging folder same as download folder

Browse source
This commit is contained in:
Broque Thomas 2026-03-09 17:10:35 -07:00
parent 07a79e7af6
commit d1890c768c
2 changed files with 23 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
web_server.py
View file

@ -1109,25 +1109,33 @@ def _register_automation_handlers():
_update_automation_progress(automation_id,
log_line=f'Empty directories: removed {dirs_removed}', log_type='success' if dirs_removed else 'info')
# --- 4. Clear staging folder ---
_update_automation_progress(automation_id, phase='Clearing staging folder...', progress=60)
# --- 4. Sweep empty staging directories ---
_update_automation_progress(automation_id, phase='Sweeping staging folder...', progress=60)
staging_path = _get_staging_path()
s_removed = 0
if os.path.isdir(staging_path):
for f in os.listdir(staging_path):
fp = os.path.join(staging_path, f)
for dirpath, _dirnames, _filenames in os.walk(staging_path, topdown=False):
if os.path.normpath(dirpath) == os.path.normpath(staging_path):
continue
try:
if os.path.isfile(fp):
os.remove(fp)
entries = os.listdir(dirpath)
except OSError:
continue
visible = [e for e in entries if not e.startswith('.')]
if not visible:
for hidden in entries:
try:
os.remove(os.path.join(dirpath, hidden))
except Exception:
pass
try:
os.rmdir(dirpath)
s_removed += 1
elif os.path.isdir(fp):
_shutil.rmtree(fp)
s_removed += 1
except Exception:
pass
steps.append(f'Staging: removed {s_removed} items')
except OSError:
pass
steps.append(f'Staging: removed {s_removed} empty directories')
_update_automation_progress(automation_id,
log_line=f'Staging: removed {s_removed} items', log_type='success' if s_removed else 'info')
log_line=f'Staging: removed {s_removed} empty directories', log_type='success' if s_removed else 'info')
# --- 5. Clean search history ---
_update_automation_progress(automation_id, phase='Cleaning search history...', progress=80)

4
webui/static/script.js
View file

@ -17583,7 +17583,7 @@ const TOOL_HELP_CONTENT = {
<li><strong>Clear Quarantine</strong> — permanently deletes all quarantined files</li>
<li><strong>Clear Download Queue</strong> — removes completed, errored, and cancelled downloads from Soulseek</li>
<li><strong>Sweep Empty Directories</strong> — removes empty folders left behind in the downloads directory</li>
<li><strong>Clear Staging Folder</strong> — deletes all files and folders from the import staging area</li>
<li><strong>Sweep Staging Folder</strong> — removes empty directories from the import staging area</li>
<li><strong>Clean Search History</strong> — trims old Soulseek search queries</li>
</ol>
@ -47483,7 +47483,7 @@ const _RESULT_DISPLAY_MAP = {
],
'full_cleanup': [
{ key: 'quarantine_removed', label: 'Quarantine Removed' },
{ key: 'staging_removed', label: 'Staging Removed' },
{ key: 'staging_removed', label: 'Staging Dirs Removed' },
{ key: 'total_removed', label: 'Total Items Removed' },
],
};