+
+
+
+
+
+
+
+
+
diff --git a/svelte/src/filesystem/Sharebar.svelte b/svelte/src/filesystem/Sharebar.svelte
new file mode 100644
index 0000000..1516a7f
--- /dev/null
+++ b/svelte/src/filesystem/Sharebar.svelte
@@ -0,0 +1,45 @@
+
+
+
+
+
diff --git a/svelte/src/filesystem/Toolbar.svelte b/svelte/src/filesystem/Toolbar.svelte
new file mode 100644
index 0000000..9b4508c
--- /dev/null
+++ b/svelte/src/filesystem/Toolbar.svelte
@@ -0,0 +1,112 @@
+
+
+
+
+
diff --git a/svelte/src/filesystem/viewers/Directory.svelte b/svelte/src/filesystem/viewers/Directory.svelte
new file mode 100644
index 0000000..100280e
--- /dev/null
+++ b/svelte/src/filesystem/viewers/Directory.svelte
@@ -0,0 +1,127 @@
+
+
+
+
+
+
+
+
+
+
+ {#if loading}
+ {navigate(e.detail)}}>
+ {/if}
+
+
+
+ {:else if viewer_type === "dir"}
+ Node details | |
| Name | {currentNode.base.name} |
| Path | {currentNode.base.path} |
| Type | {currentNode.base.type} |
| Date created | {formatDate(currentNode.base.date_created, true, true, true)} |
| Date modified | {formatDate(currentNode.base.date_modified, true, true, true)} |
| File type | {currentNode.base.file_type} |
| File size | {formatDataVolume(currentNode.base.file_size)} |
Bucket details | |
| ID | {currentNode.bucket.id} |
| Name | {currentNode.bucket.name} |
| Date created | {formatDate(currentNode.bucket.date_created, true, true, true)} |
| Date modified | {formatDate(currentNode.bucket.date_modified, true, true, true)} |
+
+
+
+
+
diff --git a/svelte/src/modal.js b/svelte/src/modal.js
new file mode 100644
index 0000000..8df591e
--- /dev/null
+++ b/svelte/src/modal.js
@@ -0,0 +1,10 @@
+import App from './modal/App.svelte';
+
+const app = new App({
+ target: document.body,
+ props: {
+ name: 'world'
+ }
+});
+
+export default app;
diff --git a/svelte/src/modal/App.svelte b/svelte/src/modal/App.svelte
new file mode 100644
index 0000000..2253be3
--- /dev/null
+++ b/svelte/src/modal/App.svelte
@@ -0,0 +1,45 @@
+
+
+
+
++
+ {#if Array.isArray(node.base.children)}
+ {#each node.base.children as child}
+
+
+ })
+
+ {/each}
+ {/if}
+ {child.name}
+ + +
+-
+
- of or relating to modality in logic +
- containing provisions as to the mode of procedure or the manner of taking effect —used of a contract or legacy +
- of or relating to a musical mode +
- of or relating to structure as opposed to substance + +
- of, relating to, or constituting a grammatical form or category characteristically indicating predication +
- of or relating to a statistical mode +
-
+
- of or relating to modality in logic +
- containing provisions as to the mode of procedure or the manner of taking effect —used of a contract or legacy +
- of or relating to a musical mode +
- of or relating to structure as opposed to substance +
- of, relating to, or constituting a grammatical form or category characteristically indicating predication +
- of or relating to a statistical mode +
+ + +
+
+{/if}
+
+
diff --git a/svelte/src/util/Spinner.svelte b/svelte/src/util/Spinner.svelte
new file mode 100644
index 0000000..055f473
--- /dev/null
+++ b/svelte/src/util/Spinner.svelte
@@ -0,0 +1,39 @@
+
+
+
diff --git a/webcontroller/filesystem.go b/webcontroller/filesystem.go
index 661a49c..41d3c68 100644
--- a/webcontroller/filesystem.go
+++ b/webcontroller/filesystem.go
@@ -1,6 +1,7 @@
package webcontroller
import (
+ "fmt"
"net/http"
"sort"
"strings"
@@ -12,6 +13,7 @@ import (
type filesystemPath struct {
Path []filesystemNode
+ Base filesystemNode
Children []filesystemNode
}
@@ -84,15 +86,18 @@ func (wc *WebController) serveFilesystem(w http.ResponseWriter, r *http.Request,
return
}
- if node.Path[node.NodeIndex].Type == "file" {
+ if node.Base.Type == "file" {
http.Redirect(w, r, "/api/filesystem/"+path, http.StatusSeeOther)
return
}
- for _, v := range node.Path {
+ for _, v := range node.Parents {
fsPath.Path = append(fsPath.Path, convFilesystemNode(node.Bucket.ID, v))
}
- for _, v := range node.Children {
+
+ fsPath.Base = convFilesystemNode(node.Bucket.ID, node.Base)
+
+ for _, v := range node.Base.Children {
fsPath.Children = append(fsPath.Children, convFilesystemNode(node.Bucket.ID, v))
}
}
@@ -114,3 +119,31 @@ func (wc *WebController) serveFilesystem(w http.ResponseWriter, r *http.Request,
log.Error("Error executing template filesystem: %s", err)
}
}
+
+func (wc *WebController) serveDirectory(w http.ResponseWriter, r *http.Request, p httprouter.Params) {
+ var err error
+ var td = wc.newTemplateData(w, r)
+ var path = strings.TrimPrefix(p.ByName("path"), "/")
+
+ node, err := td.PixelAPI.GetFilesystemPath(path)
+ if err != nil {
+ if err.Error() == "not_found" || err.Error() == "path_not_found" {
+ wc.templates.Get().ExecuteTemplate(w, "404", td)
+ } else {
+ log.Error("Failed to get path: %s", err)
+ wc.templates.Get().ExecuteTemplate(w, "500", td)
+ }
+ return
+ }
+
+ if node.Base.Type == "bucket" {
+ td.Title = fmt.Sprintf("%s ~ pixeldrain", node.Base.Name)
+ } else {
+ td.Title = fmt.Sprintf("%s in %s ~ pixeldrain", node.Base.Name, node.Bucket.Name)
+ }
+ td.Other = node
+ err = wc.templates.Get().ExecuteTemplate(w, "filesystem_svelte", td)
+ if err != nil && !strings.Contains(err.Error(), "broken pipe") {
+ log.Error("Error executing template filesystem: %s", err)
+ }
+}
diff --git a/webcontroller/web_controller.go b/webcontroller/web_controller.go
index 7776649..31b6272 100644
--- a/webcontroller/web_controller.go
+++ b/webcontroller/web_controller.go
@@ -141,6 +141,7 @@ func New(
// Filesystem
{GET, "fs/*path", wc.serveFilesystem},
+ {GET, "d/*path", wc.serveDirectory},
{GET, "patreon_activate" /* */, wc.serveForm(wc.patreonLinkForm, true)},
{PST, "patreon_activate" /* */, wc.serveForm(wc.patreonLinkForm, true)},
+
+
+
+ {title}
+
+
+
+