Update filesystem
This commit is contained in:
33
svelte/src/filesystem/filemanager/CreateDirectory.svelte
Normal file
33
svelte/src/filesystem/filemanager/CreateDirectory.svelte
Normal file
@@ -0,0 +1,33 @@
|
||||
<script>
|
||||
import { onMount, createEventDispatcher } from "svelte";
|
||||
import { fs_create_directory } from "../FilesystemAPI.svelte";
|
||||
let dispatch = createEventDispatcher()
|
||||
|
||||
export let state;
|
||||
let name_input;
|
||||
let create_dir_name = ""
|
||||
let create_dir = () => {
|
||||
dispatch("loading", true)
|
||||
|
||||
let form = new FormData()
|
||||
form.append("type", "dir")
|
||||
|
||||
fs_create_directory(
|
||||
state.bucket.id, state.base.path, create_dir_name,
|
||||
).then(resp => {
|
||||
create_dir_name = "" // Clear input field
|
||||
}).catch(err => {
|
||||
alert("Error: "+err)
|
||||
}).finally(() => {
|
||||
dispatch("done")
|
||||
})
|
||||
}
|
||||
|
||||
onMount(() => { name_input.focus() })
|
||||
</script>
|
||||
|
||||
<form class="node" on:submit|preventDefault={create_dir}>
|
||||
<td><img src="/res/img/mime/folder.png" class="node_icon" alt="icon"/></td>
|
||||
<td><input type="text" style="width: 100%;" bind:this={name_input} bind:value={create_dir_name} /></td>
|
||||
<td><input type="submit" value="create"/></td>
|
||||
</form>
|
||||
275
svelte/src/filesystem/filemanager/FileManager.svelte
Normal file
275
svelte/src/filesystem/filemanager/FileManager.svelte
Normal file
@@ -0,0 +1,275 @@
|
||||
<script>
|
||||
import { formatDataVolume } from '../../util/Formatting.svelte'
|
||||
import { fs_delete_node } from './../FilesystemAPI.svelte'
|
||||
import { createEventDispatcher } from 'svelte'
|
||||
import CreateDirectory from './CreateDirectory.svelte'
|
||||
import FileUploader from './FileUploader.svelte'
|
||||
let dispatch = createEventDispatcher()
|
||||
|
||||
export let state
|
||||
let mode = "viewing"
|
||||
let creating_dir = false
|
||||
let uploader
|
||||
|
||||
const node_click = (index) => {
|
||||
creating_dir = false
|
||||
|
||||
// We prefix our custom state properties with fm_ to not interfere with
|
||||
// other modules
|
||||
if (mode === "viewing") {
|
||||
dispatch("navigate", state.base.children[index].path)
|
||||
} else if (mode === "selecting") {
|
||||
state.base.children[index].fm_selected = !state.base.children[index].fm_selected
|
||||
} else if (mode === "deleting") {
|
||||
state.base.children[index].fm_delete = !state.base.children[index].fm_delete
|
||||
}
|
||||
}
|
||||
const navigate_up = () => {
|
||||
creating_dir = false
|
||||
|
||||
// Go to the path of the last parent
|
||||
if (state.parents.length !== 0) {
|
||||
dispatch("navigate", state.parents[state.parents.length-1].path)
|
||||
}
|
||||
}
|
||||
const reload = () => { dispatch("navigate", state.base.path) }
|
||||
|
||||
const node_icon = node => {
|
||||
if (node.type === "dir") {
|
||||
return "/res/img/mime/folder.png"
|
||||
}
|
||||
|
||||
switch (node.file_type) {
|
||||
case "image/gif":
|
||||
return "/res/img/mime/image-gif.png"
|
||||
case "image/png", "image/apng":
|
||||
return "/res/img/mime/image-png.png"
|
||||
case "image/jpeg":
|
||||
return "/res/img/mime/image-jpeg.png"
|
||||
case "application/pdf":
|
||||
return "/res/img/mime/pdf.png"
|
||||
case "application/ogg":
|
||||
return "/res/img/mime/audio.png"
|
||||
}
|
||||
|
||||
if (node.file_type.startsWith("audio/")) {
|
||||
return "/res/img/mime/audio.png"
|
||||
} else if (node.file_type.startsWith("video/")) {
|
||||
return "/res/img/mime/video.png"
|
||||
} else if (node.file_type.startsWith("text/")) {
|
||||
return "/res/img/mime/text.png"
|
||||
} else if (node.file_type.startsWith("image/")) {
|
||||
return "/res/img/mime/image-png.png"
|
||||
} else if (node.file_type.startsWith("application/")) {
|
||||
return "/res/img/mime/archive.png"
|
||||
}
|
||||
return "/res/img/mime/empty.png"
|
||||
}
|
||||
|
||||
const delete_node = () => {
|
||||
if (mode !== "deleting") {
|
||||
mode = "deleting"
|
||||
return
|
||||
}
|
||||
|
||||
dispatch("loading", true)
|
||||
|
||||
// Save all promises with deletion requests in an array
|
||||
let promises = []
|
||||
state.base.children.forEach(child => {
|
||||
if (!child.fm_delete) { return }
|
||||
promises.push(fs_delete_node(state.bucket.id, child.path))
|
||||
})
|
||||
|
||||
// Wait for all the promises to finish
|
||||
Promise.all(promises).catch((err) => {
|
||||
console.error(err)
|
||||
}).finally(() => {
|
||||
mode = "viewing"
|
||||
reload()
|
||||
})
|
||||
}
|
||||
const delete_toggle = () => {
|
||||
// Turn on deletion mode if it's not already
|
||||
if (mode !== "deleting") {
|
||||
mode = "deleting"
|
||||
return
|
||||
}
|
||||
|
||||
// Return to normal and unmark all the marked files
|
||||
mode = "viewing"
|
||||
state.base.children.forEach((child, i) => {
|
||||
if (child.fm_delete) {
|
||||
state.base.children[i].fm_delete = false
|
||||
}
|
||||
})
|
||||
}
|
||||
</script>
|
||||
|
||||
<div class="container">
|
||||
<div class="width_container">
|
||||
<div class="toolbar">
|
||||
<button on:click={navigate_up} class:hidden={state.parents.length === 0}><i class="icon">arrow_back</i></button>
|
||||
<div class="toolbar_spacer"></div>
|
||||
{#if state.bucket.permissions.update}
|
||||
<button on:click={uploader.picker}><i class="icon">cloud_upload</i></button>
|
||||
<button on:click={() => {creating_dir = true}}><i class="icon">create_new_folder</i></button>
|
||||
|
||||
<button
|
||||
on:click={delete_toggle}
|
||||
class:button_red={mode === "deleting"}>
|
||||
<i class="icon">delete</i>
|
||||
</button>
|
||||
{/if}
|
||||
</div>
|
||||
<br/>
|
||||
|
||||
{#if mode === "deleting"}
|
||||
<div class="toolbar toolbar_delete highlight_red">
|
||||
<div style="flex: 1 1 auto; justify-self: center;">
|
||||
Deleting files. Click a file or directory to select it for deletion.
|
||||
Click confirm to delete the files.
|
||||
</div>
|
||||
<div style="display: flex; flex-direction: row; justify-content: center;">
|
||||
<button on:click={delete_toggle}>
|
||||
<i class="icon">undo</i>
|
||||
Cancel
|
||||
</button>
|
||||
<button on:click={delete_node} class="button_red">
|
||||
<i class="icon">delete</i>
|
||||
Delete selected
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
<br/>
|
||||
{/if}
|
||||
|
||||
<FileUploader bind:this={uploader} bucket_id={state.bucket.id} target_dir={state.base.path} on:finished={reload}></FileUploader>
|
||||
|
||||
<div class="directory">
|
||||
<tr>
|
||||
<td></td>
|
||||
<td>name</td>
|
||||
<td>size</td>
|
||||
</tr>
|
||||
|
||||
{#if creating_dir}
|
||||
<CreateDirectory state={state} on:done={() => {reload(); creating_dir = false;}} on:loading></CreateDirectory>
|
||||
{/if}
|
||||
|
||||
{#each state.base.children as child, index}
|
||||
<a
|
||||
href={state.path_root+child.path}
|
||||
on:click|preventDefault={() => {node_click(index)}}
|
||||
class="node"
|
||||
class:node_selected={child.fm_selected}
|
||||
class:node_delete={child.fm_delete}>
|
||||
<td>
|
||||
<img src={node_icon(child)} class="node_icon" alt="icon"/>
|
||||
</td>
|
||||
<td class="node_name">
|
||||
{child.name}
|
||||
</td>
|
||||
<td class="node_size">
|
||||
{formatDataVolume(child.file_size, 3)}
|
||||
</td>
|
||||
</a>
|
||||
{/each}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<style>
|
||||
.hidden { visibility: hidden; }
|
||||
.container {
|
||||
height: 100%;
|
||||
width: 100%;
|
||||
padding: 0;
|
||||
overflow-y: auto;
|
||||
text-align: center;
|
||||
}
|
||||
.width_container {
|
||||
position: relative;
|
||||
display: inline-block;
|
||||
max-width: 94%;
|
||||
width: 1000px;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
}
|
||||
.toolbar {
|
||||
position: relative;
|
||||
display: inline-flex;
|
||||
flex-direction: row;
|
||||
width: 100%;
|
||||
margin: 16px 0 0 0;
|
||||
padding: 0;
|
||||
box-sizing: border-box;
|
||||
justify-content: center;
|
||||
}
|
||||
.toolbar > * { flex: 0 0 auto; }
|
||||
.toolbar_spacer { flex: 1 1 auto; }
|
||||
|
||||
@media(max-width: 800px) {
|
||||
.toolbar_delete {
|
||||
flex-direction: column;
|
||||
}
|
||||
}
|
||||
|
||||
.directory {
|
||||
display: table;
|
||||
position: relative;
|
||||
overflow-x: auto;
|
||||
overflow-y: hidden;
|
||||
width: 100%;
|
||||
margin: 16px 0 16px 0;
|
||||
text-align: left;
|
||||
background-color: var(--layer_2_color);
|
||||
box-shadow: 1px 1px var(--layer_2_shadow) var(--shadow_color);
|
||||
box-sizing: border-box;
|
||||
border-collapse: collapse;
|
||||
}
|
||||
.directory > * { display: table-row; }
|
||||
.directory > * > * { display: table-cell; }
|
||||
.directory :global(.node) {
|
||||
display: table-row;
|
||||
text-decoration: none;
|
||||
color: var(--text-color);
|
||||
padding: 6px;
|
||||
box-sizing: border-box;
|
||||
}
|
||||
.directory :global(.node:not(:last-child)) {
|
||||
border-bottom: 1px solid var(--layer_3_color);
|
||||
}
|
||||
.directory :global(.node:hover:not(.node_selected)) {
|
||||
background-color: var(--input_color_dark);
|
||||
color: var(--input_text_color);
|
||||
text-decoration: none;
|
||||
}
|
||||
.directory :global(.node.node_selected) {
|
||||
background-color: var(--highlight_color) !important;
|
||||
color: var(--highlight_text_color);
|
||||
}
|
||||
.directory :global(.node.node_delete) {
|
||||
background-color: var(--danger_color) !important;
|
||||
color: var(--highlight_text_color);
|
||||
}
|
||||
.directory :global(td) {
|
||||
padding: 4px;
|
||||
vertical-align: middle;
|
||||
}
|
||||
.directory :global(.node_icon) {
|
||||
height: 32px;
|
||||
width: auto;
|
||||
vertical-align: middle;
|
||||
}
|
||||
.directory :global(.node_name) {
|
||||
width: 100%;
|
||||
overflow: hidden;
|
||||
line-height: 1.2em;
|
||||
word-break: break-all;
|
||||
}
|
||||
.directory :global(.node_size) {
|
||||
min-width: 50px;
|
||||
white-space: nowrap;
|
||||
}
|
||||
</style>
|
||||
210
svelte/src/filesystem/filemanager/FileUploader.svelte
Normal file
210
svelte/src/filesystem/filemanager/FileUploader.svelte
Normal file
@@ -0,0 +1,210 @@
|
||||
<script>
|
||||
import { createEventDispatcher } from "svelte";
|
||||
let dispatch = createEventDispatcher()
|
||||
|
||||
export let bucket_id
|
||||
export let target_dir
|
||||
|
||||
let upload_jobs = []
|
||||
let upload_threads = 0
|
||||
let max_upload_threads = 4
|
||||
|
||||
// Adds files to the upload queue. The file_list parameter needs to be of type
|
||||
// FileList. Upload will also create the necessary directories to place nested
|
||||
// files in.
|
||||
export const upload = (file_list) => {
|
||||
for (let i = 0; i < file_list.length; i++) {
|
||||
upload_jobs.push({
|
||||
file: file_list[i],
|
||||
progress: 0,
|
||||
target_dir: target_dir.valueOf(),
|
||||
uploading: false,
|
||||
finished: false,
|
||||
tries: 0,
|
||||
})
|
||||
}
|
||||
|
||||
// This updates the UI
|
||||
upload_jobs = upload_jobs
|
||||
|
||||
while (upload_threads <= max_upload_threads) {
|
||||
upload_threads++
|
||||
setTimeout(upload_file, 1)
|
||||
}
|
||||
}
|
||||
|
||||
const uploads_finished = () => {
|
||||
dispatch("finished")
|
||||
}
|
||||
|
||||
const upload_file = () => {
|
||||
let job = null
|
||||
for (let i = 0; i < upload_jobs.length; i++) {
|
||||
// If a file is done we remove it from the array
|
||||
if (upload_jobs[i].progress >= 1) {
|
||||
upload_jobs.splice(i, 1)
|
||||
continue
|
||||
}
|
||||
|
||||
if (upload_jobs[i].uploading === false && upload_jobs[i].finished === false) {
|
||||
job = upload_jobs[i]
|
||||
job.uploading = true
|
||||
upload_jobs = upload_jobs
|
||||
break
|
||||
}
|
||||
}
|
||||
if (job === null) {
|
||||
upload_threads--
|
||||
|
||||
if (upload_threads === 0) {
|
||||
uploads_finished()
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
console.log(job)
|
||||
|
||||
let form = new FormData();
|
||||
form.append("type", "file")
|
||||
form.append("file", job.file)
|
||||
|
||||
let xhr = new XMLHttpRequest();
|
||||
xhr.open(
|
||||
"POST",
|
||||
"/api/filesystem/"+bucket_id+encodeURIComponent(
|
||||
job.target_dir+"/"+job.file.name,
|
||||
),
|
||||
true,
|
||||
);
|
||||
xhr.timeout = 21600000; // 6 hours, to account for slow connections
|
||||
|
||||
// Report progress updates back to the caller
|
||||
xhr.upload.addEventListener("progress", evt => {
|
||||
if (evt.lengthComputable) {
|
||||
job.progress = evt.loaded / evt.total
|
||||
upload_jobs = upload_jobs
|
||||
}
|
||||
});
|
||||
|
||||
xhr.onreadystatechange = () => {
|
||||
// readystate 4 means the upload is done
|
||||
if (xhr.readyState !== 4) { return; }
|
||||
|
||||
if (xhr.status >= 100 && xhr.status < 400) {
|
||||
// Request is a success
|
||||
|
||||
// Finish the upload job
|
||||
job.uploading = false
|
||||
job.finished = true
|
||||
upload_file()
|
||||
} else if (xhr.status >= 400) {
|
||||
// Request failed
|
||||
console.log("Upload error. status: " + xhr.status + " response: " + xhr.response);
|
||||
let resp = JSON.parse(xhr.response);
|
||||
if (job.tries === 3) { // Upload failed
|
||||
return
|
||||
} else { // Try again
|
||||
job.tries++;
|
||||
job.uploading = false
|
||||
job.finished = false
|
||||
}
|
||||
|
||||
// Sleep the upload thread for 5 seconds
|
||||
setTimeout(upload_file, 5000);
|
||||
} else {
|
||||
// Request did not arrive
|
||||
if (job.tries === 3) { // Upload failed
|
||||
alert("upload failed "+xhr.responseText)
|
||||
job.uploading = false
|
||||
job.finished = false
|
||||
} else { // Try again
|
||||
job.tries++;
|
||||
}
|
||||
|
||||
// Sleep the upload thread for 5 seconds
|
||||
setTimeout(upload_file, 5000);
|
||||
}
|
||||
|
||||
upload_jobs = upload_jobs
|
||||
};
|
||||
xhr.send(form);
|
||||
}
|
||||
|
||||
// File input dialog handling
|
||||
let file_input
|
||||
export const picker = () => { file_input.click() }
|
||||
const file_input_change = e => {
|
||||
upload(e.target.files)
|
||||
file_input.nodeValue = ""
|
||||
}
|
||||
|
||||
// Drag and drop upload
|
||||
let hidden = true
|
||||
const dragover = e => { hidden = false }
|
||||
const dragleave = e => { hidden = true }
|
||||
const drop = e => {
|
||||
hidden = true
|
||||
upload(e.dataTransfer.files)
|
||||
}
|
||||
const paste = e => {
|
||||
if (e.clipboardData.files[0]) {
|
||||
e.preventDefault()
|
||||
e.stopPropagation()
|
||||
console.log(e.clipboardData.files[0].getAsFile())
|
||||
}
|
||||
}
|
||||
|
||||
</script>
|
||||
|
||||
<svelte:body
|
||||
on:dragover|preventDefault|stopPropagation={dragover}
|
||||
on:dragleave|preventDefault|stopPropagation={dragleave}
|
||||
on:drop|preventDefault|stopPropagation={drop}
|
||||
on:paste={paste}
|
||||
/>
|
||||
|
||||
<div>
|
||||
<input class="file_input" bind:this={file_input} on:change={file_input_change} type="file" multiple="multiple"/>
|
||||
<div class:hidden class="highlight_green">
|
||||
Drop files here to upload them
|
||||
</div>
|
||||
|
||||
{#each upload_jobs as c}
|
||||
<div class="file_upload">
|
||||
{c.file.name} <br/>
|
||||
<div class="upload_progress_bar">
|
||||
<div class="upload_progress" style="width: {c.progress*100}%"></div>
|
||||
</div>
|
||||
</div>
|
||||
{/each}
|
||||
</div>
|
||||
|
||||
<style>
|
||||
.hidden {display: none;}
|
||||
|
||||
.file_input {
|
||||
display: block;
|
||||
visibility: hidden;
|
||||
width: 0;
|
||||
height: 0;
|
||||
}
|
||||
|
||||
.file_upload {
|
||||
display: block;
|
||||
text-align: left;
|
||||
width: 100%;
|
||||
margin: 6px 0 0 0;
|
||||
padding: 0;
|
||||
background-color: var(--layer_2_color);
|
||||
box-shadow: 1px 1px var(--layer_2_shadow) var(--shadow_color);
|
||||
}
|
||||
|
||||
.upload_progress_bar {
|
||||
width: 100%;
|
||||
height: 2px;
|
||||
}
|
||||
.upload_progress {
|
||||
background-color: var(--highlight_color);
|
||||
height: 100%;
|
||||
}
|
||||
</style>
|
||||
Reference in New Issue
Block a user