tyler.durden/cockpit-navigator
1
0
Fork 0
mirror of https://github.com/45Drives/cockpit-navigator.git synced 2025-09-26 03:08:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

only recurse on refresh

Browse Source
This commit is contained in:
joshuaboud 2022-05-30 14:31:12 -03:00
parent 0a339d5828
commit 38417ab661
No known key found for this signature in database
GPG Key ID: 17EFB59E2A8BF50E
4 changed files with 36 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
navigator/src/components/DirectoryEntry.vue
View File

@ -136,8 +136,8 @@ export default {
}
}
const getEntries = () => {
return directoryViewRef.value?.getEntries?.();
const refresh = () => {
return directoryViewRef.value?.refresh?.();
}
const toggleShowEntries = () => {
@ -183,7 +183,7 @@ export default {
showEntries,
directoryViewRef,
doubleClickCallback,
getEntries,
refresh,
toggleShowEntries,
getSelected,
selectAll,

50
navigator/src/components/DirectoryEntryList.vue
View File

@ -25,7 +25,6 @@ import { notificationsInjectionKey, settingsInjectionKey } from '../keys';
import DirectoryEntry from './DirectoryEntry.vue';
import getDirListing from '../functions/getDirListing';
import getDirEntryObjects from '../functions/getDirEntryObjects';
import { RECORD_SEPARATOR, UNIT_SEPARATOR } from '../constants';
import FileSystemWatcher from '../functions/fileSystemWatcher';
export default {
@ -48,7 +47,13 @@ export default {
},
setup(props, { emit }) {
const settings = inject(settingsInjectionKey);
/**
* @type {Ref<DirectoryEntryObj[]>}
*/
const entries = ref([]);
/**
* @type {Ref<DirectoryEntryObj[]>}
*/
const visibleEntries = ref([]);
const notifications = inject(notificationsInjectionKey);
const entryRefs = ref([]);
@ -146,8 +151,6 @@ export default {
processingHandler.start();
try {
const cwd = props.path;
const procs = [];
procs.push(...entryRefs.value.filter(entryRef => entryRef.showEntries).map(entryRef => entryRef.getEntries()));
const entryNames = await getDirListing(cwd, props.host, (message) => notifications.value.constructNotification("Failed to parse file name", message, 'error'));
const tmpEntries = (
await getDirEntryObjects(
@ -157,15 +160,9 @@ export default {
(message) => notifications.value.constructNotification("Failed to parse file name", message, 'error')
)
);
processingHandler.start();
return Promise.all(procs)
.then(() => {
if (props.path !== cwd)
return;
entries.value = [...tmpEntries.sort(sortCallbackComputed.value)].map(entry => reactive(entry));
emitStats();
})
.finally(() => processingHandler.stop());
if (props.path !== cwd)
return; // changed directory before could finish
entries.value = [...tmpEntries.sort(sortCallbackComputed.value)].map(entry => reactive(entry));
} catch (error) {
entries.value = [];
notifications.value.constructNotification("Error getting directory entries", errorStringHTML(error), 'error');
@ -175,30 +172,36 @@ export default {
}
}
const refresh = async () => {
processingHandler.start();
await Promise.all([
getEntries(),
...entryRefs.value.filter(entryRef => entryRef.showEntries).map(entryRef => entryRef.refresh())
]);
processingHandler.stop();
}
const emitStats = () => {
emit('updateStats', entries.value.reduce((stats, entry) => {
emit('updateStats', visibleEntries.value.reduce((stats, entry) => {
if (entry.type === 'directory' || (entry.type === 'symbolic link' && entry.target?.type === 'directory'))
stats.dirs++;
else
stats.files++;
stats.size += entry.size;
return stats;
}, { files: 0, dirs: 0 }));
}, { files: 0, dirs: 0, size: 0 }));
}
const sortEntries = () => {
if (processingHandler.count) {
setTimeout(sortEntries, 100); // poll until nothing processing
} else {
processingHandler.start();
entries.value = [...entries.value].sort(sortCallbackComputed.value);
processingHandler.stop();
}
processingHandler.start();
entries.value = [...entries.value].sort(sortCallbackComputed.value);
processingHandler.stop();
}
const entryFilterCallback = (entry) =>
(!/^\./.test(entry.name) || settings?.directoryView?.showHidden)
&& (props.searchFilterRegExp?.test(entry.name) ?? true);
const host = undefined;
@ -255,6 +258,8 @@ export default {
visibleEntries.value = entries.value.filter(entryFilterCallback);
})
watch(visibleEntries, emitStats);
watch(() => props.path, (current, old) => {
if (current === old)
return;
@ -268,6 +273,7 @@ export default {
entryRefs,
selection,
getEntries,
refresh,
emitStats,
sortEntries,
entryFilterCallback,

6
navigator/src/components/DirectoryView.vue
View File

@ -147,8 +147,8 @@ export default {
}
const sortCallback = ref(() => 0);
const getEntries = () => {
return directoryEntryListRef.value?.getEntries?.();
const refresh = () => {
return directoryEntryListRef.value?.refresh?.();
}
const getSelected = () => directoryEntryListRef.value?.selection.getSelected?.() ?? [];
@ -172,7 +172,7 @@ export default {
directoryEntryListRef,
sortCallbacks,
sortCallback,
getEntries,
refresh,
getSelected,
keyHandler,
}

4
navigator/src/views/Browser.vue
View File

@ -60,7 +60,7 @@
>
<ArrowUpIcon class="size-icon icon-default" />
</button>
<button class="p-2 rounded-lg hover:bg-accent" @click="directoryViewRef.getEntries()">
<button class="p-2 rounded-lg hover:bg-accent" @click="directoryViewRef.refresh()">
<RefreshIcon class="size-icon icon-default" />
</button>
</div>
@ -91,7 +91,7 @@
:searchFilterRegExp="searchFilterRegExp"
@cd="newPath => cd(newPath)"
@edit="openEditor"
@updateStats="stats => $emit('updateFooterText', `${stats.files} file${stats.files === 1 ? '' : 's'}, ${stats.dirs} director${stats.dirs === 1 ? 'y' : 'ies'}`)"
@updateStats="stats => $emit('updateFooterText', `${stats.files} file${stats.files === 1 ? '' : 's'}, ${stats.dirs} director${stats.dirs === 1 ? 'y' : 'ies'} (${cockpit.format_bytes(stats.size, 1000).replace(/(?<!B)$/, ' B')})`)"
ref="directoryViewRef"
/>
</div>