Skip to content

Multiselect support (#22) #23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Multiselect support (#22) #23

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7e69378
Started on multiselect support (#22)
andersevenrud Jun 27, 2020
993a548
More work on multiselect (#22)
andersevenrud Jul 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
106 changes: 59 additions & 47 deletions index.js
View file
Original file line number Diff line number Diff line change
@@ -128,7 +128,9 @@ const createInitialPaths = (core, proc) => {
/**
* Formats file status message
*/
const formatFileMessage = file => `${file.filename} (${file.size} bytes)`;
const formatFileMessage = files => files
.map(file => `${file.filename} (${file.size} bytes)`)
.join(', ');

/**
* Formats directory status message
@@ -332,7 +334,7 @@ const vfsActionFactory = (core, proc, win, dialog, state) => {
} catch (error) {
dialog('error', error, __('MSG_READDIR_ERROR', dir.path));
} finally {
state.currentFile = undefined;
state.currentFile = [];
win.setState('loading', false);
}
};
@@ -343,29 +345,36 @@ const vfsActionFactory = (core, proc, win, dialog, state) => {
.catch(error => dialog('error', error, __('MSG_UPLOAD_ERROR')));
});

const paste = (move, currentPath) => ({item, callback}) => {
const dest = {path: pathJoin(currentPath.path, item.filename)};
const paste = (move, currentPath) => ({items, callback}) => {
const promises = items.map((item) => {
const dest = {
path: pathJoin(currentPath.path, item.filename)
};

const fn = move
? vfs.move(item, dest)
: vfs.copy(item, dest);
return move
? vfs.move(item, dest)
: vfs.copy(item, dest);
});

return fn
.then(() => {
return Promise
.all(promises)
.then((results) => {
refresh(true);

if (typeof callback === 'function') {
callback();
}

return results;
})
.catch(error => dialog('error', error, __('MSG_PASTE_ERROR')));
};

return {
download: file => vfs.download(file),
download: files => files.forEach(file => vfs.download(file)),
action,
upload,
refresh,
action,
drop,
readdir,
paste
@@ -378,10 +387,10 @@ const vfsActionFactory = (core, proc, win, dialog, state) => {
const clipboardActionFactory = (core, state, vfs) => {
const clipboard = core.make('osjs/clipboard');

const set = item => clipboard.set(({item}), 'filemanager:copy');
const set = items => clipboard.set(({items}), 'filemanager:copy');

const cut = item => clipboard.set(({
item,
const cut = items => clipboard.set(({
items,
callback: () => vfs.refresh(true)
}), 'filemanager:move');

@@ -418,20 +427,20 @@ const dialogFactory = (core, proc, win) => {
action(() => vfs.mkdir({path: newPath}), value, __('MSG_MKDIR_ERROR'));
}));

const renameDialog = (action, file) => dialog('prompt', {
const renameDialog = (action, files) => files.forEach(file => dialog('prompt', {
message: __('DIALOG_RENAME_MESSAGE', file.filename),
value: file.filename
}, usingPositiveButton(value => {
const idx = file.path.lastIndexOf(file.filename);
const newPath = file.path.substr(0, idx) + value;

action(() => vfs.rename(file, {path: newPath}), value, __('MSG_RENAME_ERROR'));
}));
})));

const deleteDialog = (action, file) => dialog('confirm', {
message: __('DIALOG_DELETE_MESSAGE', file.filename),
const deleteDialog = (action, files) => dialog('confirm', {
message: __('DIALOG_DELETE_MESSAGE', files.map(f => f.filename).join(', ')),
}, usingPositiveButton(() => {
action(() => vfs.unlink(file), true, __('MSG_DELETE_ERROR'));
action(() => Promise.all(files.map(f => vfs.unlink(f))), true, __('MSG_DELETE_ERROR'));
}));

const errorDialog = (error, message) => dialog('alert', {
@@ -474,40 +483,42 @@ const menuFactory = (core, proc, win) => {
{label: _('LBL_QUIT'), onclick: () => win.emit('filemanager:menu:quit')}
]);

const createEditMenu = (item, isContextMenu) => {
const emitter = name => win.emit(name, item);
const createEditMenu = (items, isContextMenu) => {
console.log(items)
const emitter = name => win.emit(name, items);
const item = items[items.length - 1];

if (item && isSpecialFile(item.filename)) {
if (items.length === 1 && item && isSpecialFile(item.filename)) {
return [{
label: _('LBL_GO'),
onclick: () => emitter('filemanager:navigate')
}];
}

const isValidFile = item && !isSpecialFile(item.filename);
const isDirectory = item && item.isDirectory;
const canDownload = items.some(i => !i.isDirectory && !isSpecialFile(i.filename));
const hasValidFile = items.some(i => !isSpecialFile(i.filename));

const openMenu = isDirectory ? [{
const openMenu = items.length === 1 && item.isDirectory ? [{
label: _('LBL_GO'),
disabled: !item,
disabled: !items.length,
onclick: () => emitter('filemanager:navigate')
}] : [{
label: _('LBL_OPEN'),
disabled: !item,
disabled: !items.length,
onclick: () => emitter('filemanager:open')
}, {
label: __('LBL_OPEN_WITH'),
disabled: !item,
disabled: !items.length,
onclick: () => emitter('filemanager:openWith')
}];

const clipboardMenu = [{
label: _('LBL_COPY'),
disabled: !isValidFile,
disabled: !hasValidFile,
onclick: () => emitter('filemanager:menu:copy')
}, {
label: _('LBL_CUT'),
disabled: !isValidFile,
disabled: !hasValidFile,
onclick: () => emitter('filemanager:menu:cut')
}];

@@ -523,18 +534,18 @@ const menuFactory = (core, proc, win) => {
...openMenu,
{
label: _('LBL_RENAME'),
disabled: !isValidFile,
disabled: !hasValidFile,
onclick: () => emitter('filemanager:menu:rename')
},
{
label: _('LBL_DELETE'),
disabled: !isValidFile,
disabled: !hasValidFile,
onclick: () => emitter('filemanager:menu:delete')
},
...clipboardMenu,
{
label: _('LBL_DOWNLOAD'),
disabled: !item || isDirectory || !isValidFile,
disabled: !canDownload,
onclick: () => emitter('filemanager:menu:download')
}
];
@@ -659,7 +670,8 @@ const createApplication = (core, proc) => {
}),

fileview: listView.state({
columns: []
columns: [],
multiselect: true
})
};

@@ -696,12 +708,12 @@ const createApplication = (core, proc) => {
setStatus: status => ({status}),
setMinimalistic: minimalistic => ({minimalistic}),
setList: ({list, path, selectFile}) => ({fileview, mountview}) => {
let selectedIndex;
let selectedIndex = [];

if (selectFile) {
const foundIndex = list.findIndex(file => file.filename === selectFile);
if (foundIndex !== -1) {
selectedIndex = foundIndex;
selectedIndex = [foundIndex];
}
}

@@ -725,7 +737,7 @@ const createApplication = (core, proc) => {

fileview: listView.actions({
select: ({data}) => win.emit('filemanager:select', data),
activate: ({data}) => win.emit(`filemanager:${data.isFile ? 'open' : 'navigate'}`, data),
activate: ({data}) => data.forEach(d => win.emit(`filemanager:${d.isFile ? 'open' : 'navigate'}`, d)),
contextmenu: args => win.emit('filemanager:contextmenu', args),
created: ({el, data}) => {
if (data.isFile) {
@@ -747,7 +759,7 @@ const createApplication = (core, proc) => {
*/
const createWindow = (core, proc) => {
let wired;
const state = {currentFile: undefined, currentPath: undefined};
const state = {currentFile: [], currentPath: undefined};
const {homePath, initialPath} = createInitialPaths(core, proc);

const title = core.make('osjs/locale').translatableFlat(proc.metadata.title);
@@ -766,13 +778,13 @@ const createWindow = (core, proc) => {
const onDrop = (...args) => vfs.drop(...args);
const onHome = () => vfs.readdir(homePath, 'clear');
const onNavigate = (...args) => vfs.readdir(...args);
const onSelectItem = file => (state.currentFile = file);
const onSelectStatus = file => win.emit('filemanager:status', formatFileMessage(file));
const onSelectItem = files => (state.currentFile = files);
const onSelectStatus = files => win.emit('filemanager:status', formatFileMessage(files));
const onContextMenu = ({ev, data}) => createMenu({ev, name: 'edit'}, data, true);
const onReaddirRender = args => wired.setList(args);
const onRefresh = (...args) => vfs.refresh(...args);
const onOpen = file => core.open(file, {useDefault: true});
const onOpenWith = file => core.open(file, {useDefault: true, forceDialog: true});
const onOpen = files => files.forEach(file => core.open(file, {useDefault: true}));
const onOpenWith = files => files.forEach(file => core.open(file, {useDefault: true, forceDialog: true}));
const onHistoryPush = file => wired.history.push(file);
const onHistoryClear = () => wired.history.clear();
const onMenu = (props, args) => createMenu(props, args || state.currentFile);
@@ -783,11 +795,11 @@ const createWindow = (core, proc) => {
const onMenuToggleMinimalistic = () => wired.toggleMinimalistic();
const onMenuShowDate = () => setSetting('showDate', !proc.settings.showDate);
const onMenuShowHidden = () => setSetting('showHiddenFiles', !proc.settings.showHiddenFiles);
const onMenuRename = file => dialog('rename', vfs.action, file);
const onMenuDelete = file => dialog('delete', vfs.action, file);
const onMenuDownload = (...args) => vfs.download(...args);
const onMenuCopy = item => clipboard.set(item);
const onMenuCut = item => clipboard.cut(item);
const onMenuRename = files => dialog('rename', vfs.action, files);
const onMenuDelete = files => dialog('delete', vfs.action, files);
const onMenuDownload = files => vfs.download(files);
const onMenuCopy = items => clipboard.set(items);
const onMenuCut = items => clipboard.cut(items);
const onMenuPaste = () => clipboard.paste();

return win