mirror of
https://github.com/lrnselfreliance/wrolpi.git
synced 2026-11-21 23:46:18 -05:00
Adding Counting step to file refreshing.
This commit is contained in:
parent
d84e9726fe
commit
a3321cf2fa
3 changed files with 36 additions and 10 deletions
|
|
@ -487,15 +487,29 @@ export function FilesRefreshProgress() {
|
|||
return;
|
||||
}
|
||||
|
||||
const {refreshing, modeling, indexing, cleanup, indexed, unindexed, total_files, total_file_groups, modeled}
|
||||
= progress;
|
||||
const {
|
||||
discovery,
|
||||
refreshing,
|
||||
modeling,
|
||||
indexing,
|
||||
cleanup,
|
||||
indexed,
|
||||
unindexed,
|
||||
counted_files,
|
||||
total_file_groups,
|
||||
modeled
|
||||
} = progress;
|
||||
|
||||
if (refreshing) {
|
||||
// Default is Discovery / Step 1.
|
||||
let params = {value: total_file_groups, total: total_files, progress: 'ratio'};
|
||||
let label = 'Refresh: Discovery';
|
||||
// Default is Counting / Step 1. Move progress bar toward the middle to avoid clipping out of the screen.
|
||||
let params = {value: Math.floor(counted_files / 5), total: counted_files, progress: 'ratio'};
|
||||
let label = 'Refresh: Counting';
|
||||
|
||||
if (modeling) {
|
||||
if (discovery) {
|
||||
params['value'] = total_file_groups;
|
||||
params['total'] = counted_files;
|
||||
label = 'Refresh: Discovery'
|
||||
} else if (modeling) {
|
||||
params['value'] = modeled;
|
||||
params['total'] = total_file_groups;
|
||||
label = 'Refresh: Modeling';
|
||||
|
|
|
|||
|
|
@ -461,10 +461,20 @@ async def refresh_files(paths: List[pathlib.Path] = None, send_events: bool = Tr
|
|||
|
||||
# Add all files in the media directory to the DB.
|
||||
paths = paths or [get_media_directory()]
|
||||
|
||||
directories = list(filter(lambda i: i.is_dir(), paths))
|
||||
if directories:
|
||||
with flags.refresh_counting:
|
||||
while directories:
|
||||
directory = directories.pop()
|
||||
files, dirs = get_files_and_directories(directory)
|
||||
directories.extend(dirs)
|
||||
REFRESH['counted_files'] = REFRESH.get('counted_files', 0) + len(files)
|
||||
# Sleep to catch cancel.
|
||||
await asyncio.sleep(0)
|
||||
refresh_logger.info(f'Counted {REFRESH["counted_files"]} files')
|
||||
|
||||
with flags.refresh_discovery:
|
||||
from wrolpi.count_files import count_files
|
||||
total_count = sum(count_files(i) for i in paths)
|
||||
REFRESH['total_files'] = total_count
|
||||
await refresh_discover_paths(paths, idempotency)
|
||||
if send_events:
|
||||
Events.send_global_refresh_discovery_completed()
|
||||
|
|
@ -853,13 +863,14 @@ def get_refresh_progress():
|
|||
|
||||
status = dict(
|
||||
cleanup=flags.cleanup.is_set(),
|
||||
counting=flags.refresh_counting.is_set(),
|
||||
discovery=flags.refresh_discovery.is_set(),
|
||||
indexed=results['indexed'],
|
||||
indexing=flags.refresh_indexing.is_set(),
|
||||
modeled=results['modeled'],
|
||||
modeling=flags.refresh_modeling.is_set(),
|
||||
refreshing=flags.refreshing.is_set(),
|
||||
total_files=REFRESH.get('total_files', 0),
|
||||
counted_files=REFRESH.get('counted_files', 0),
|
||||
total_file_groups=results['total_file_groups'],
|
||||
unindexed=results['unindexed'],
|
||||
)
|
||||
|
|
|
|||
|
|
@ -111,6 +111,7 @@ db_up = Flag('db_up')
|
|||
refreshing = Flag('refreshing')
|
||||
|
||||
# Steps of refreshing.
|
||||
refresh_counting = Flag('refresh_counting')
|
||||
refresh_discovery = Flag('refresh_discovery')
|
||||
refresh_modeling = Flag('refresh_modeling')
|
||||
refresh_indexing = Flag('refresh_indexing')
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue