mirror/puter
1
0
Fork 0
mirror of https://github.com/HeyPuter/puter.git synced 2026-01-08 14:10:41 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #69 from vineeth-vk11/#6

Browse Source 
delaying progress window for quick move/copy operations
This commit is contained in:
Nariman Jelveh
2024-03-09 21:42:57 -08:00
committed by GitHub
parent 61c3d3571d 2afb1a295b
commit 4e1fb06b94
2 changed files with 35 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/globals.js
View File

@@ -104,7 +104,7 @@ window.default_taskbar_height = 50;
window.taskbar_height = window.default_taskbar_height;
window.upload_progress_hide_delay = 500;
window.active_uploads = {};
window.copy_progress_hide_delay = 1000;
window.copy_progress_hide_delay = 2000;
window.busy_indicator_hide_delay = 600;
window.global_element_id = 0;
window.operation_id = 0;

45
src/helpers.js
View File

@@ -1508,7 +1508,13 @@ window.copy_clipboard_items = async function(dest_path, dest_container_element){
let overwrite_all = false;
(async()=>{
let copy_progress_window_init_ts = Date.now();
let progwin = await UIWindowCopyProgress({operation_id: copy_op_id});
// only show progress window if it takes longer than 2s to copy
let progwin;
let progwin_timeout = setTimeout(async () => {
progwin = await UIWindowCopyProgress({operation_id: copy_op_id});
}, 2000);
for(let i=0; i<clipboard.length; i++){
let copy_path = clipboard[i].path;
let item_with_same_name_already_exists = true;
@@ -1563,10 +1569,12 @@ window.copy_clipboard_items = async function(dest_path, dest_container_element){
}
// done
clearTimeout(progwin_timeout);
let copy_duration = (Date.now() - copy_progress_window_init_ts);
if( copy_duration >= copy_progress_hide_delay){
if(progwin && copy_duration >= copy_progress_hide_delay){
$(progwin).close();
}else{
}else if(progwin){
setTimeout(() => {
setTimeout(() => {
$(progwin).close();
@@ -1587,7 +1595,13 @@ window.copy_items = function(el_items, dest_path){
let overwrite_all = false;
(async()=>{
let copy_progress_window_init_ts = Date.now();
let progwin = await UIWindowCopyProgress({operation_id: copy_op_id});
// only show progress window if it takes longer than 2s to copy
let progwin;
let progwin_timeout = setTimeout(async () => {
progwin = await UIWindowCopyProgress({operation_id: copy_op_id});
}, 2000);
for(let i=0; i < el_items.length; i++){
let copy_path = $(el_items[i]).attr('data-path');
let item_with_same_name_already_exists = true;
@@ -1644,10 +1658,12 @@ window.copy_items = function(el_items, dest_path){
}
// done
clearTimeout(progwin_timeout);
let copy_duration = (Date.now() - copy_progress_window_init_ts);
if( copy_duration >= copy_progress_hide_delay){
if(progwin && copy_duration >= copy_progress_hide_delay){
$(progwin).close();
}else{
}else if(progwin){
setTimeout(() => {
setTimeout(() => {
$(progwin).close();
@@ -2282,8 +2298,11 @@ window.move_items = async function(el_items, dest_path){
// when did this operation start
let move_init_ts = Date.now();
// create progress window
let progwin = await UIWindowMoveProgress({operation_id: move_op_id});
// only show progress window if it takes longer than 2s to move
let progwin;
let progwin_timeout = setTimeout(async () => {
progwin = await UIWindowMoveProgress({operation_id: move_op_id});
}, 2000);
// Go through each item and try to move it
for(let i=0; i<el_items.length; i++){
@@ -2629,6 +2648,8 @@ window.move_items = async function(el_items, dest_path){
}
}
clearTimeout(progwin_timeout);
// log stats to console
let move_duration = (Date.now() - move_init_ts);
console.log(`moved ${el_items.length} item${el_items.length > 1 ? 's':''} in ${move_duration}ms`);
@@ -2636,9 +2657,11 @@ window.move_items = async function(el_items, dest_path){
// -----------------------------------------------------------------------
// DONE! close progress window with delay to allow user to see 100% progress
// -----------------------------------------------------------------------
setTimeout(() => {
$(progwin).close();
}, copy_progress_hide_delay);
if(progwin){
setTimeout(() => {
$(progwin).close();
}, copy_progress_hide_delay);
}
}
/**