Merge pull request #1 from pldubouilh/mv

Mv
This commit is contained in:
Pierre Dubouilh 2018-11-16 23:51:06 +01:00 committed by GitHub
commit 13cf1db89d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 276 additions and 218 deletions

2
.gitignore vendored
View file

@ -1,5 +1,6 @@
debug
test
gossa.go
gossa
gossa-linux
gossa-linux-arm
@ -7,6 +8,7 @@ gossa-linux-arm64
gossa-mac
gossa-windows.exe
.vscode
fixture/*
fixture/*/*
!fixture/compress

View file

@ -3,6 +3,28 @@ build:
go build gossa.go
rm gossa.go
embed:
echo "embedding css and js into binary"
cp src/main.go gossa.go
perl -pe 's/css_will_be_here/`cat src\/style.css`/ge' -i gossa.go
perl -pe 's/js_will_be_here/`cat src\/script.js`/ge' -i gossa.go
perl -pe 's/favicon_will_be_here/`base64 -w0 src\/favicon.png`/ge' -i gossa.go
run:
make build
./gossa fixture
ci:
cd src && go vet && go fmt
timeout 5 make run &
cd src && sleep 1 && go test
ci-watch:
ls src/* | entr -rc make ci
watch:
ls src/* | entr -rc make run
build-all:
make embed
env GOOS=linux GOARCH=amd64 go build gossa.go
@ -25,25 +47,3 @@ clean:
-rm gossa-linux-arm64
-rm gossa-mac
-rm gossa-windows.exe
embed:
echo "embedding css and js into binary"
cp main.go gossa.go
perl -pe 's/some_css/`cat style.css`/ge' -i gossa.go
perl -pe 's/some_js/`cat script.js`/ge' -i gossa.go
go build gossa.go
ci:
go fmt
go vet
timeout 5 go run main.go fixture &
sleep 1 && go test
ci-watch:
ls main.go script.js main_test.go | entr -rc make ci
debug-watch:
ls main.go script.js | entr -rc go run main.go fixture
run:
go run main.go fixture

View file

@ -8,31 +8,30 @@ gossa
🎶 A fast and simple webserver for your files. It's dependency-free and with under 250 lines for the server code, easily code-reviewable.
### features
* upload files and folders with drag-and-drop
* browse throughout files/directories
* browse through files/directories
* upload with drag-and-drop
* create new folders
* browse throughout pictures with a full-screen carousel
* move files with drag-and-drop and keyboard
* browse through pictures with a full-screen carousel
* simple keyboard navigation/shortcuts
* fast ; fills my 80MB/s AC wifi link
### run
```sh
# run
go run main.go fixture
# build embedding the js/css in the binary
# build
make
./gossa --help
# run CI tests
make ci
# run
./gossa -h 192.168.100.33 ~/storage
```
### keyboard shortcuts
* Arrows/Enter browse throughout the files/directories and pictures
* Ctrl/Meta + C copy selected path to clipboard
* Ctrl/Meta + C copy URL to clipboard
* Ctrl/Meta + D create a new directory
* \<any letter\> search on first letters in filename
* Ctrl/Meta + X cut selected path
* Ctrl/Meta + V paste previously selected paths to directory
* \<any letter\> search
### built blobs
built blobs are available on the [release page](https://github.com/pldubouilh/gossa/releases).

BIN
src/favicon.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 470 B

View file

@ -17,32 +17,33 @@ import (
"strings"
)
func check(e error) {
if e != nil {
panic(e)
}
}
var fs http.Handler
var host = flag.String("h", "127.0.0.1", "host to listen to")
var port = flag.String("p", "8001", "port to listen to")
var verb = flag.Bool("verb", true, "verbosity")
var skipHidden = flag.Bool("k", true, "skip hidden files")
var initPath = ""
var css = `some_css`
var jsTag = `some_js`
var css = `css_will_be_here` // js will be embedded here
var js = `js_will_be_here` // id. css
var favicon = "data:image/png;base64,favicon_will_be_here" // id. b64 favicon
var units = [8]string{"k", "M", "G", "T", "P", "E", "Z", "Y"}
var fs http.Handler
type rpcCall struct {
Call string `json:"call"`
Args []string `json:"args"`
}
func check(e error) {
if e != nil {
panic(e)
}
}
func logVerb(s ...interface{}) {
if *verb {
log.Println(s)
log.Println(s...)
}
}
@ -55,11 +56,9 @@ func sizeToString(bytes float64) string {
bytes = bytes / 1024
u++
if bytes < 1024 {
break
return strconv.FormatFloat(bytes, 'f', 1, 64) + units[u]
}
}
return strconv.FormatFloat(bytes, 'f', 1, 64) + units[u]
}
func row(name string, href string, size float64, ext string) string {
@ -71,7 +70,7 @@ func row(name string, href string, size float64, ext string) string {
<td><i class="btn icon icon-` + strings.ToLower(ext) + ` icon-blank"></i></td>
<td class="file-size"><code>` + sizeToString(size) + `</code></td>
<td class="arrow"><i class="arrow-icon"></i></td>
<td class="display-name"><a href="` + url.PathEscape(href) + `">` + name + `</a></td>
<td class="display-name"><a class="list-links" onclick="return onClickLink(event)" href="` + url.PathEscape(href) + `">` + name + `</a></td>
</tr>`
}
@ -84,17 +83,17 @@ func replyList(w http.ResponseWriter, path string) {
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width">
<title>` + html.EscapeString(path) + `</title>
<script>window.onload = function(){` + jsTag + `}</script>
<title>` + html.EscapeString(path) + `</title>
<link href="` + favicon + `" rel="icon" type="image/png"/>
<script>window.onload = function(){` + js + `}</script>
<style type="text/css">` + css + `</style>
</head>
<body>
<div onclick="window.mkdir()" id="newFolder"></div>
<div onclick="window.picsToggle()" id="picsToggle"></div>
<div id="pics" style="display:none;"> <div onclick="window.picsToggle()" id="picsToggleCinema"></div> <img onclick="window.picsNav()" id="picsHolder"/> <span id="picsLabel"></span> </div>
<body>
<div id="drop-grid"> Drop here to upload </div>
<div id="progressBars"></div>
<h1>.` + html.EscapeString(path) + `</h1>
<div class="icHolder"><div style="display:none;" class="ic icon-large-images" onclick="window.picsToggle()"></div>
<div class="ic icon-large-folder" onclick="window.mkdirBtn()"></div></div>
<div id="pics" style="display:none;"> <div onclick="window.picsToggle()" id="picsToggleCinema"></div> <img onclick="window.picsNav()" id="picsHolder"/> <span id="picsLabel"></span> </div>
<table>`
_files, err := ioutil.ReadDir(initPath + path)
@ -122,21 +121,14 @@ func replyList(w http.ResponseWriter, path string) {
}
}
var resp = head + dirs + files + `</table>
<br><address><a href="https://github.com/pldubouilh/gossa">Gossa 🎶</a></address>
</body></html>`
w.Write([]byte(resp))
w.Write([]byte(head + dirs + files + `</table>
<br><address><a href="https://github.com/pldubouilh/gossa">Gossa 🎶</a></address>
<div id="progress" style="display:none;"><span id="dlBarName"></span><div id="dlBarPc">1%</div></div>
</body></html>`))
}
func doContent(w http.ResponseWriter, r *http.Request) {
path := html.UnescapeString(r.URL.Path)
if strings.Contains(path, "/favicon.ico") {
w.Write([]byte(" "))
return
}
fullPath, errPath := checkPath(path)
stat, errStat := os.Stat(fullPath)
@ -174,22 +166,28 @@ func upload(w http.ResponseWriter, r *http.Request) {
}
func rpc(w http.ResponseWriter, r *http.Request) {
var err error
bodyBytes, _ := ioutil.ReadAll(r.Body)
bodyString := string(bodyBytes)
var payload rpcCall
json.Unmarshal([]byte(bodyString), &payload)
unparsed, _ := url.PathUnescape(payload.Args[0])
p, err := checkPath(unparsed)
logVerb("RPC", err, unparsed)
if err != nil {
w.Write([]byte("error"))
return
} else if payload.Call == "mkdirp" {
os.MkdirAll(p, os.ModePerm)
for i := range payload.Args {
payload.Args[i], err = checkPath(payload.Args[i])
if err != nil {
logVerb("Cant read path", err, payload)
w.Write([]byte("error"))
return
}
}
if payload.Call == "mkdirp" {
err = os.MkdirAll(payload.Args[0], os.ModePerm)
} else if payload.Call == "mv" {
err = os.Rename(payload.Args[0], payload.Args[1])
}
logVerb("RPC", err, payload)
w.Write([]byte("ok"))
}
@ -198,7 +196,7 @@ func checkPath(p string) (string, error) {
fp, err := filepath.Abs(p)
if err != nil || !strings.HasPrefix(fp, initPath) {
return fp, errors.New("error")
return "", errors.New("error")
}
return fp, nil
@ -217,20 +215,6 @@ func main() {
initPath, err = filepath.Abs(initPath)
check(err)
// Read CSS file if not embedded
if len(css) < 10 {
c, err := ioutil.ReadFile("./style.css")
check(err)
css = string(c)
}
// Read JS file if not embedded
if len(jsTag) < 10 {
j, err := ioutil.ReadFile("./script.js")
check(err)
jsTag = string(j)
}
var hostString = *host + ":" + *port
fmt.Println("Gossa startig on directory " + initPath)
fmt.Println("Listening on http://" + hostString)

View file

@ -65,19 +65,19 @@ func testDefaults(t *testing.T, url string) string {
t.Fatal("error header")
}
if !strings.Contains(bodyStr, `<a href="hols">hols/</a>`) {
if !strings.Contains(bodyStr, `href="hols">hols/</a>`) {
t.Fatal("error hols folder")
}
if !strings.Contains(bodyStr, `<a href="curimit@gmail.com%20%2840%25%29">curimit@gmail.com (40%)/</a>`) {
if !strings.Contains(bodyStr, `href="curimit@gmail.com%20%2840%25%29">curimit@gmail.com (40%)/</a>`) {
t.Fatal("error curimit@gmail.com (40%) folder")
}
if !strings.Contains(bodyStr, `<a href="%E4%B8%AD%E6%96%87">中文/</a>`) {
if !strings.Contains(bodyStr, `href="%E4%B8%AD%E6%96%87">中文/</a>`) {
t.Fatal("error 中文 folder")
}
if !strings.Contains(bodyStr, `<tr> <td><i class="btn icon icon-types icon-blank"></i></td> <td class="file-size"><code>0.2k</code></td> <td class="arrow"><i class="arrow-icon"></i></td> <td class="display-name"><a href="custom_mime_type.types">custom_mime_type.types</a></td> </tr>`) {
if !strings.Contains(bodyStr, `<tr> <td><i class="btn icon icon-types icon-blank"></i></td> <td class="file-size"><code>0.2k</code></td> <td class="arrow"><i class="arrow-icon"></i></td> <td class="display-name"><a class="list-links" onclick="return onClickLink(event)" href="custom_mime_type.types">custom_mime_type.types</a></td> </tr>`) {
t.Fatal("error row custom_mime_type")
}
@ -110,28 +110,40 @@ func TestGetFolder(t *testing.T) {
// ~~~~~~~~~~~~~~~~~
fmt.Println("\r\n~~~~~~~~~~ test mkdir rpc")
bodyStr = postJSON(t, "http://127.0.0.1:8001/rpc", `{"call":"mkdirp","args":["%2FAAA"]}`)
bodyStr = postJSON(t, "http://127.0.0.1:8001/rpc", `{"call":"mkdirp","args":["/AAA"]}`)
if !strings.Contains(bodyStr, `ok`) {
t.Fatal("error returned value")
}
bodyStr = testDefaults(t, "http://127.0.0.1:8001/")
if !strings.Contains(bodyStr, `<tr> <td><i class="btn icon icon-folder icon-blank"></i></td> <td class="file-size"><code>0</code></td> <td class="arrow"><i class="arrow-icon"></i></td> <td class="display-name"><a href="AAA">AAA/</a></td> </tr>`) {
if !strings.Contains(bodyStr, `<tr> <td><i class="btn icon icon-folder icon-blank"></i></td> <td class="file-size"><code>0</code></td> <td class="arrow"><i class="arrow-icon"></i></td> <td class="display-name"><a class="list-links" onclick="return onClickLink(event)" href="AAA">AAA/</a></td> </tr>`) {
t.Fatal("error new folder created")
}
// ~~~~~~~~~~~~~~~~~
fmt.Println("\r\n~~~~~~~~~~ test invalid mkdir rpc")
bodyStr = postJSON(t, "http://127.0.0.1:8001/rpc", `{"call":"mkdirp","args":["..%2FBBB"]}`)
bodyStr = postJSON(t, "http://127.0.0.1:8001/rpc", `{"call":"mkdirp","args":["../BBB"]}`)
if !strings.Contains(bodyStr, `error`) {
t.Fatal("error not returned")
}
bodyStr = postJSON(t, "http://127.0.0.1:8001/rpc", `{"call":"mkdirp","args":["%2F..%2FBBB"]}`)
bodyStr = postJSON(t, "http://127.0.0.1:8001/rpc", `{"call":"mkdirp","args":["/../BBB"]}`)
if !strings.Contains(bodyStr, `error`) {
t.Fatal("error not returned")
}
// ~~~~~~~~~~~~~~~~~
fmt.Println("\r\n~~~~~~~~~~ test mv rpc")
bodyStr = postJSON(t, "http://127.0.0.1:8001/rpc", `{"call":"mv","args":["/AAA", "/hols/AAA"]}`)
if !strings.Contains(bodyStr, `ok`) {
t.Fatal("error returned value")
}
bodyStr = testDefaults(t, "http://127.0.0.1:8001/")
if strings.Contains(bodyStr, `<tr> <td><i class="btn icon icon-folder icon-blank"></i></td> <td class="file-size"><code>0</code></td> <td class="arrow"><i class="arrow-icon"></i></td> <td class="display-name"><a class="list-links" onclick="return onClickLink(event)" href="AAA">AAA/</a></td> </tr>`) {
t.Fatal("error folder moved")
}
// ~~~~~~~~~~~~~~~~~
fmt.Println("\r\n~~~~~~~~~~ test post file")
bodyStr = postDummyFile(t, "http://127.0.0.1:8001/post", "%2F%E1%84%92%E1%85%A1%20%E1%84%92%E1%85%A1")
@ -145,7 +157,7 @@ func TestGetFolder(t *testing.T) {
}
bodyStr = testDefaults(t, "http://127.0.0.1:8001/")
if !strings.Contains(bodyStr, `<tr> <td><i class="btn icon icon-하 하 icon-blank"></i></td> <td class="file-size"><code>0.0k</code></td> <td class="arrow"><i class="arrow-icon"></i></td> <td class="display-name"><a href="%E1%84%92%E1%85%A1%20%E1%84%92%E1%85%A1">하 하</a></td> </tr>`) {
if !strings.Contains(bodyStr, `<tr> <td><i class="btn icon icon-하 하 icon-blank"></i></td> <td class="file-size"><code>0.0k</code></td> <td class="arrow"><i class="arrow-icon"></i></td> <td class="display-name"><a class="list-links" onclick="return onClickLink(event)" href="%E1%84%92%E1%85%A1%20%E1%84%92%E1%85%A1">하 하</a></td> </tr>`) {
t.Fatal("error checking new file row")
}

View file

@ -1,25 +1,30 @@
/* eslint-env browser */
/* eslint-disable no-multi-str */
function cancelDefault (e) {
e.preventDefault()
e.stopPropagation()
}
const checkDupes = test => allA.find(a => a.innerText.replace('/', '') === test)
// RPC
function rpcFs (call, args, cb) {
const decodedPath = decodeURI(window.location.pathname)
args = args.map(a => a.startsWith('/') ? a.slice(1) : a)
args = args.map(a => encodeURIComponent(decodedPath + a))
console.log('RPC', call, args)
const xhr = new window.XMLHttpRequest()
xhr.open('POST', window.location.origin + '/rpc')
xhr.open('POST', location.origin + '/rpc')
xhr.setRequestHeader('Content-Type', 'application/json;charset=UTF-8')
xhr.send(JSON.stringify({call, args}))
xhr.send(JSON.stringify({ call, args }))
xhr.onload = cb
}
const mkdirCall = (path, cb) => rpcFs('mkdirp', [path], cb)
const prependPath = (a) => a.startsWith('/') ? a : decodeURI(location.pathname) + a
function mkdir () {
// RPC Handlers
const mkdirCall = (path, cb) => rpcFs('mkdirp', [prependPath(path)], cb)
const mvCall = (path1, path2, cb) => rpcFs('mv', [path1, path2], cb)
// Mkdir switch
window.mkdirBtn = function () {
const folder = window.prompt('New folder name', '')
if (!folder) {
@ -28,31 +33,13 @@ function mkdir () {
return window.alert('Name already already exists')
}
mkdirCall(folder, () => browseTo(location.href))
mkdirCall(folder, refresh)
}
function warning (e) {
return 'Leaving will interrupt transfer\nAre you sure you want to leave?'
}
function newBar (name) {
const id = Math.random().toString(36).substring(7)
document.getElementById('progressBars').innerHTML += '\
<div id="' + id + '" class="barBackground">\
<span> ' + name.split('/').pop() + ' <span>\
<div class="barForeground">1%</div>\
</div>'
return id
}
function updatePercent (id, percent) {
const el = document.getElementById(id).querySelectorAll('div.barForeground')[0]
const width = Math.floor(100 * percent).toString() + '%'
el.innerText = width
el.style.width = width
}
function shouldRefresh () {
totalDone += 1
if (totalUploads === totalDone) {
@ -60,31 +47,52 @@ function shouldRefresh () {
console.log('Done uploading ' + totalDone + ' files')
totalDone = 0
totalUploads = 0
document.getElementById('progressBars').innerHTML = ''
browseTo(location.href)
totalUploadsSize = 0
totalUploadedSize = []
barDiv.style.display = 'none'
refresh()
}
}
const checkDupes = test => allA.find(a => a.innerText.replace('/', '') === test)
const barName = document.getElementById('dlBarName')
const barPc = document.getElementById('dlBarPc')
const barDiv = document.getElementById('progress')
let totalDone = 0
let totalUploads = 0
let totalUploadsSize = 0
let totalUploadedSize = []
function updatePercent (ev) {
totalUploadedSize[ev.target.id] = ev.loaded
const ttlDone = totalUploadedSize.reduce((s, x) => s + x)
const pc = Math.floor(100 * ttlDone / totalUploadsSize) + '%'
barPc.innerText = pc
barPc.style.width = pc
}
function postFile (file, path) {
totalUploads += 1
path = decodeURI(location.pathname).slice(0, -1) + path
window.onbeforeunload = warning
const xhr = new window.XMLHttpRequest()
path = decodeURI(location.pathname).slice(0, -1) + path
xhr.open('POST', window.location.origin + '/post')
xhr.setRequestHeader("gossa-path", encodeURIComponent(path))
xhr.upload.id = newBar(path)
barDiv.style.display = 'block'
totalUploads += 1
totalUploadsSize += file.size
barName.innerText = totalUploads > 1 ? totalUploads + ' files' : file.name
const formData = new window.FormData()
formData.append(file.name, file)
xhr.upload.addEventListener('progress', a => {
updatePercent(a.target.id, a.loaded / a.total)
})
const xhr = new window.XMLHttpRequest()
xhr.open('POST', location.origin + '/post')
xhr.setRequestHeader('gossa-path', encodeURIComponent(path))
xhr.upload.addEventListener('load', shouldRefresh)
xhr.upload.addEventListener('progress', updatePercent)
xhr.upload.id = totalUploads
xhr.send(formData)
}
@ -100,7 +108,9 @@ function parseDomItem (domFile, shoudCheckDupes) {
if (domFile.isFile) {
domFile.file(f => postFile(f, domFile.fullPath))
} else {
mkdirCall(domFile.fullPath, () => parseDomFolder(domFile))
// remove absolute path
const f = domFile.fullPath.startsWith('/') ? domFile.fullPath.slice(1) : domFile.fullPath
mkdirCall(f, () => parseDomFolder(domFile))
}
}
@ -114,13 +124,35 @@ function pushEntry (entry) {
parseDomItem(entry, true)
}
// Move files and folders
const isTextEvent = e => e.dataTransfer.items[0].type === 'text/plain'
const isFolder = e => e && e.href && e.innerText.endsWith('/')
const resetBackgroundLinks = () => { allA.forEach(a => { a.parentElement.style.backgroundColor = 'unset' }) }
const setBackgroundLinks = t => { t.style.backgroundColor = 'rgba(123, 123, 123, 0.2)' }
const getLink = e => e.target.parentElement.querySelectorAll('a.list-links')[0]
const upGrid = document.getElementById('drop-grid')
document.ondragenter = (e) => {
if (isPicMode()) { return }
cancelDefault(e)
e.dataTransfer.dropEffect = 'copy'
upGrid.style.display = 'flex'
resetBackgroundLinks()
if (isTextEvent(e) && (isFolder(e.target) || isFolder(e.target.firstChild))) {
const t = getLink(e)
if (!t) return
setBackgroundLinks(t.parentElement)
}
if (!isTextEvent(e)) {
upGrid.style.display = 'flex'
e.dataTransfer.dropEffect = 'copy'
}
}
upGrid.ondragleave = (e) => {
@ -133,17 +165,27 @@ document.ondragover = (e) => {
return false
}
// Handle drop - upload or move
document.ondrop = (e) => {
cancelDefault(e)
upGrid.style.display = 'none'
resetBackgroundLinks()
if (isTextEvent(e)) {
const t = e.target.classList.contains('fav') ? e.target : getLink(e)
if (!t || !t.innerText.endsWith('/')) return
e.dataTransfer.items[0].getAsString(s => {
const root = decodeURIComponent(s.replace(location.href, ''))
const dest = t.innerText + root
mvCall(prependPath(root), prependPath(dest), refresh)
})
} else {
Array.from(e.dataTransfer.items).forEach(pushEntry)
}
Array.from(e.dataTransfer.items).forEach(pushEntry)
return false
}
let totalUploads = 0
let totalDone = 0
const getArrowSelected = () => document.querySelectorAll('i.arrow-selected')[0]
function getASelected () {
@ -164,12 +206,12 @@ function clearArrowSelected () {
function restoreCursorPos () {
clearArrowSelected()
const hrefSelected = window.localStorage.getItem('last-selected' + location.href)
const hrefSelected = localStorage.getItem('last-selected' + location.href)
let a = allA.find(el => el.href === hrefSelected)
if (!a) {
if (allA[0].innerText === '../') {
a = allA[1]
a = allA[1] || allA[0]
} else {
a = allA[0]
}
@ -180,7 +222,7 @@ function restoreCursorPos () {
scrollToArrow()
}
const storeLastArrowSrc = src => window.localStorage.setItem('last-selected' + location.href, src)
const storeLastArrowSrc = src => localStorage.setItem('last-selected' + location.href, src)
function moveArrow (down) {
const all = Array.from(document.querySelectorAll('i.arrow-icon'))
@ -210,12 +252,9 @@ function moveArrow (down) {
}
}
function setCursorToClosest () {
const a = allA.find(el => el.innerText.toLocaleLowerCase().startsWith(path))
if (!a) { return }
storeLastArrowSrc(a.href)
restoreCursorPos()
}
const refresh = () => browseTo(location.href)
const prevPage = () => browseTo(location.href + '../')
window.onpopstate = prevPage
@ -231,22 +270,12 @@ function browseTo (href) {
document.head.querySelectorAll('title')[0].innerText = title
document.body.querySelectorAll('h1')[0].innerText = '.' + title
window.history.pushState({}, '', window.encodeURI(title))
}
}
init()
}))
}
function nextPage () {
const a = getASelected()
if (!a.href || !a.innerText.endsWith('/')) { return }
browseTo(a.href)
}
function prevPage () {
browseTo(window.location.href + "../")
}
function cpPath () {
var t = document.createElement('textarea')
t.value = getASelected().href
@ -275,8 +304,8 @@ function setImage (src) {
storeLastArrowSrc(src)
}
function picsOn (ifImgSelected) {
const href = getASelected().href
function picsOn (ifImgSelected, href) {
href = href || getASelected().href
if (isPicMode()) {
return false
@ -317,8 +346,28 @@ function picsNav (down) {
return true
}
let path = ''
let clearPathToken = null
let allA
let typedPath = ''
let typedToken = null
function setCursorToClosestTyped () {
const a = allA.find(el => el.innerText.toLocaleLowerCase().startsWith(typedPath))
if (!a) { return }
storeLastArrowSrc(a.href)
restoreCursorPos()
}
let cuts = []
function onPaste () {
if (!cuts.length) { return refresh() }
const root = cuts.pop()
const pwd = decodeURIComponent(location.pathname)
const isFolderDest = getASelected().innerText.endsWith('/')
const filename = root.split('/').pop()
const dest = isFolderDest ? pwd + getASelected().innerText : pwd
mvCall(root, dest + filename, onPaste)
}
// Kb handler
document.body.addEventListener('keydown', e => {
@ -332,9 +381,10 @@ document.body.addEventListener('keydown', e => {
e.preventDefault()
return picsNav(false) || moveArrow(false)
case 'Enter':
case 'ArrowRight':
e.preventDefault()
return picsOn(true) || picsNav(true) || nextPage()
return picsOn(true) || picsNav(true) || getASelected().click()
case 'ArrowLeft':
e.preventDefault()
@ -345,10 +395,6 @@ document.body.addEventListener('keydown', e => {
e.preventDefault()
return picsToggle()
}
case 'Enter':
e.preventDefault()
return picsOn(true) || picsNav(true) || getASelected().click()
}
// Ctrl keys
@ -356,41 +402,50 @@ document.body.addEventListener('keydown', e => {
switch (e.code) {
case 'KeyD':
e.preventDefault()
return isPicMode() || mkdir()
return isPicMode() || window.mkdirBtn()
case 'KeyC':
e.preventDefault()
return isPicMode() || cpPath()
case 'KeyX':
e.preventDefault()
const x = decodeURIComponent(getASelected().href).replace(location.origin, '')
cuts.push(prependPath(x))
return false
case 'KeyV':
e.preventDefault()
return onPaste()
}
}
// Any other key, for text search
if (e.code.includes('Key')) {
path += e.code.replace('Key', '').toLocaleLowerCase()
window.clearTimeout(clearPathToken)
clearPathToken = setTimeout(() => { path = '' }, 1000)
setCursorToClosest()
typedPath += e.code.replace('Key', '').toLocaleLowerCase()
window.clearTimeout(typedToken)
typedToken = setTimeout(() => { typedPath = '' }, 1000)
setCursorToClosestTyped()
}
}, false)
function partialBrowseOnClickFolders () {
allA.forEach(a => {
if (!a.innerText.endsWith('/')) { return }
a.addEventListener('click', e => {
e.preventDefault()
storeLastArrowSrc(e.target.href)
browseTo(e.target.href)
})
}, false)
window.onClickLink = e => {
if (e.target.innerText.endsWith('/')) {
storeLastArrowSrc(e.target.href)
browseTo(e.target.href)
return false
} else if (picsOn(true, e.target.href)) {
return false
}
return true
}
function init () {
allA = Array.from(document.querySelectorAll('a'))
allA = Array.from(document.querySelectorAll('a.list-links'))
allImgs = allA.map(el => el.href).filter(isPic)
document.getElementById('picsToggle').style.display = allImgs.length > 0 ? 'flex' : 'none'
document.getElementsByClassName('icon-large-images')[0].style.display = allImgs.length > 0 ? 'inline-block' : 'none'
imgsIndex = 0
partialBrowseOnClickFolders()
restoreCursorPos()
console.log('Browsed to ' + location.href)
}
@ -399,4 +454,3 @@ init()
window.picsToggle = picsToggle
window.picsNav = () => picsNav(true)
window.mkdir = mkdir

View file

@ -31,27 +31,30 @@ td.file-size {
td.display-name {
padding-left: 0.2em;
width: 100%;
}
#newFolder {
background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAFG0lEQVRYR81XfUxbVRQ/77XQrgxWZB06ZZjNOFaklfIxxhbM5owaIqLgZGUhQUOCRBLJJKCwZPEPNBoXFgPuI+G/zT/mki2Zc5uZATNBRBiDoqXA6ootbdnaUWD9bj33ta9pS8vYaMJOcnLffb33nt/5nXPPeaVgjYVaY/vw5ADo7OwsMBgMzVwu10pYcbvdEcmhKMrO4XCOtLa2TseCPYaBlpaWNJFIdDEnJyfbarWCx+Nh1Ov1MiMRdqRpGqamppQqlSoPQS+sFgQDoLm5OTkpKalXKpVmGI1GxnuiLJBgQAQUgrinVqvfam9v74sJgLq6uvWpqan9BQUF4tnZ2QCAcCDEuB+ABxnownD8uFy4cC2no6Pj8nIgGQbq6+t5QqFwKC8vT6zX68HlcjEgyEi8Z9kgxon4gbgSEhIcAoGAPR/x+HIac4SwRNSrVCq/a2tra44Ggr0FVFNTkyI3N1es0+kCxqMxwAIhhxKjrPqNMgCIkvdarbYPQ1X4MADQ2Ng4gkmYhRvA7nSD1UkFmAjOhWDjQa4zxggA1nt21OsMt245Je+wa21cWBw5UWUM7GUfGhoaBgsLC2UzMzMwcjcRzJ4NwOXQhO8A7aFe+N4jB4HXzJM/DGQkc4fTYXdRfC27yE3TNqN+rnLgdOVwyG7Mg978/PxdhIHRxS3w6is7wWJzRc2fSBWMtb10k291PJeGnr+m51R3tAcGTx26FgKgtra2B3OgiAAYd2VA0W4Z6My2qAAe5wd+HAeG/tboNFpT+Z8n5cwVDjhSU1NzDQG8ptXq4DYtgd0FUpgxM0UxJuL2eGFdPAf6x9RTeq3l7YHT8rFwAJcwBMUanRH0PAm8LM0Aw/3YMODBPLI63CBK4sNv/ZNKg9n8+uCpKk0IgOrq6vPZ2dnv/qszgU20EzK2b4O78/ZVe0+M2xxY2nF8Jnkd/HxDqZhdXCwa/b7SHAKgqqrqrEQiOTilswB/axFsSU8D84JjVQBcSLsdPWfvS9pGAVy4rhjZpHXLzp07wHS7QA7I5fIuBFA9MfMAUjL3w0bRJliwOR8LAIm3w4UVFMdgSUsRwMVfFX3d7WWBwhQAUFFR0SmTyT5SGZwgemk/JCYmgg0LUiQhdJKzfSXZt4KMOMPSjZ2TfRm2+ekNPLjcM3al+/h7b7I/BQCUl5cfy8rKapgwceF52RvAE/DBiV4QIZ6w6sHnUL9WTlJKQhz88sf4me5jZYeWACgtLW3LzMz8bGJeCC/m7QM6Lh7j5wEX812wciPLrUyMp+D6wOTxG+3lnywBUFJSckQsFn8xad0ML2TvAYc3+tdaAM8ywMJ/IlWS63VB7+Dtz3/veP/LJQCKi4s/xQ+Sb8bt6ZC2IwfcgH0gXJg4LycRwuPfQCMCh90Gw4o7H/afONgVDoDeu3fvYeyGX4+7d8Bz26VoKJQBf0t6iHmSjZGXEAbum+acY6PDHyh+OHwWVzEJxlp5CjthDVbCr1QghdRtYqa1shLVa/YGrCBFiKF7erNlZODqx+qr3/6EUxMLgFgS4Q0o2bWv5KQ2LotKfjZ9BUc+2hICQKPW6G6eP1pm0f6jxuksYYFlQIiTlD3yo5e4fGGqFz+l8LrRkS6c1+uvDdGuhr8nUxSHFATKS1NWzvrNA85FE++/oQsd0zevkCZEvA8txfgiCTURlYf6AJWAipUo8aCtqKS5zKNa2IMj3TUSEqLoQsyEGCZn+ipbkDw5f81i5usjHrTmDPwPh1d5PwAYMkwAAAAASUVORK5CYII=");
position: fixed;
right: 20px;
top: 20px;
h1 {
display: inline-block;
margin-top: 10px;
}
.icHolder {
display: inline-block;
right: 15px;
top: 25px;
position: absolute;
}
.ic {
width: 32px;
height: 32px;
cursor: pointer;
display: inline-block;
overflow: hidden;
color: transparent;
}
#picsToggle {
background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAABxUlEQVRYR+2XyyuFQRjGz3HPNfIPiEL5D0RYyNJeVlYuycIlf4EkSRQLG1bWkrKwo7BSyg5LZUW533+PZvQ1nL7jO2echTP1NDPffO/7POed55vmxGMZbvEM88eyAoIVGGY7pkCx5225I/8EWBRPUMAN8xLP5Db9LYNSV8C7Wa2lP/MkpJG8Jyb3548PVsAK8GnMIjjvfQsohGAW9BqiNfpR8Ai09uBbgMw16GzhAnOZ/E8EXENU7gi4Yl4JCkwlvrbfhwcyLkDlHnIqMM98BOSDp1Q80ETwtjFSJ/2pQ6Sp9nkmYMJVxuOGOCUB1SQ5BDWG9Jy+GVz8ICLRozwWnqNUQMp3QIuT+Zh5K5DJbLO+sudKMCSygBWy9CX4WXs813bojK8HG+AFtINLJybXrOlx0iehzDMXUuZd1rfAGNDnpnYE2oC+Ctt+LaCLyE2gwChNwlQde/zmMH41iUIr0MCL+6AiCnMgRpXpBjJf0gKqePkA1KVIbsPXGfQAGfMtrAJyvL71jjSR2zTLDAaSEbDES/1pJrfpdOOaDKuAJ+5vaROa8P8K+MtLqbjKVOrgfUC3mGng+2asG7FOTJk9+88oW4HYB/NaXyF6NJlmAAAAAElFTkSuQmCC");
position: fixed;
right: 60px;
top: 20px;
width: 32px;
height: 32px;
cursor: pointer;
}
#picsToggleCinema {
background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAACXBIWXMAAAsTAAALEwEAmpwYAAAAoElEQVRYhe2Wuw3AIAxEbZRRMwFlJiBLMCBDcClCCwq2gRRc7/cO8RFEOzt/DAAPIABwBixXWL5nKOBN1JQo8lhYQTooKqFmaAAWCxCDzOQSoLm8BzxM/kUwXN4STZM3SsyTV0qo5HMaW2bpFiw9hEuv4dKHqAdsXkICNCuhAalLWKxCxcDEL9lRmU1EdBPRxcxZWoCZM4Cz8JKUs7MzNA81r4TL7qAyXAAAAABJRU5ErkJggg==");
@ -70,7 +73,7 @@ td.display-name {
zoom: 1 !important;
}
#progressBars {
#progress {
background-color: white;
width: 99%;
left: 0.5%;
@ -81,18 +84,14 @@ td.display-name {
max-height: 50%;
overflow-y: scroll;
overflow-x: hidden;
}
#progressBars::-webkit-scrollbar {
display: none;
}
.barBackground {
#dlBarName {
width: 100%;
margin-top: 15px;
}
.barForeground {
#dlBarPc {
width: 1%;
height: 30px;
text-align: center;
@ -156,6 +155,14 @@ td.display-name {
image-orientation: from-image;
}
.icon-large-folder {
background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAFG0lEQVRYR81XfUxbVRQ/77XQrgxWZB06ZZjNOFaklfIxxhbM5owaIqLgZGUhQUOCRBLJJKCwZPEPNBoXFgPuI+G/zT/mki2Zc5uZATNBRBiDoqXA6ootbdnaUWD9bj33ta9pS8vYaMJOcnLffb33nt/5nXPPeaVgjYVaY/vw5ADo7OwsMBgMzVwu10pYcbvdEcmhKMrO4XCOtLa2TseCPYaBlpaWNJFIdDEnJyfbarWCx+Nh1Ov1MiMRdqRpGqamppQqlSoPQS+sFgQDoLm5OTkpKalXKpVmGI1GxnuiLJBgQAQUgrinVqvfam9v74sJgLq6uvWpqan9BQUF4tnZ2QCAcCDEuB+ABxnownD8uFy4cC2no6Pj8nIgGQbq6+t5QqFwKC8vT6zX68HlcjEgyEi8Z9kgxon4gbgSEhIcAoGAPR/x+HIac4SwRNSrVCq/a2tra44Ggr0FVFNTkyI3N1es0+kCxqMxwAIhhxKjrPqNMgCIkvdarbYPQ1X4MADQ2Ng4gkmYhRvA7nSD1UkFmAjOhWDjQa4zxggA1nt21OsMt245Je+wa21cWBw5UWUM7GUfGhoaBgsLC2UzMzMwcjcRzJ4NwOXQhO8A7aFe+N4jB4HXzJM/DGQkc4fTYXdRfC27yE3TNqN+rnLgdOVwyG7Mg978/PxdhIHRxS3w6is7wWJzRc2fSBWMtb10k291PJeGnr+m51R3tAcGTx26FgKgtra2B3OgiAAYd2VA0W4Z6My2qAAe5wd+HAeG/tboNFpT+Z8n5cwVDjhSU1NzDQG8ptXq4DYtgd0FUpgxM0UxJuL2eGFdPAf6x9RTeq3l7YHT8rFwAJcwBMUanRH0PAm8LM0Aw/3YMODBPLI63CBK4sNv/ZNKg9n8+uCpKk0IgOrq6vPZ2dnv/qszgU20EzK2b4O78/ZVe0+M2xxY2nF8Jnkd/HxDqZhdXCwa/b7SHAKgqqrqrEQiOTilswB/axFsSU8D84JjVQBcSLsdPWfvS9pGAVy4rhjZpHXLzp07wHS7QA7I5fIuBFA9MfMAUjL3w0bRJliwOR8LAIm3w4UVFMdgSUsRwMVfFX3d7WWBwhQAUFFR0SmTyT5SGZwgemk/JCYmgg0LUiQhdJKzfSXZt4KMOMPSjZ2TfRm2+ekNPLjcM3al+/h7b7I/BQCUl5cfy8rKapgwceF52RvAE/DBiV4QIZ6w6sHnUL9WTlJKQhz88sf4me5jZYeWACgtLW3LzMz8bGJeCC/m7QM6Lh7j5wEX812wciPLrUyMp+D6wOTxG+3lnywBUFJSckQsFn8xad0ML2TvAYc3+tdaAM8ywMJ/IlWS63VB7+Dtz3/veP/LJQCKi4s/xQ+Sb8bt6ZC2IwfcgH0gXJg4LycRwuPfQCMCh90Gw4o7H/afONgVDoDeu3fvYeyGX4+7d8Bz26VoKJQBf0t6iHmSjZGXEAbum+acY6PDHyh+OHwWVzEJxlp5CjthDVbCr1QghdRtYqa1shLVa/YGrCBFiKF7erNlZODqx+qr3/6EUxMLgFgS4Q0o2bWv5KQ2LotKfjZ9BUc+2hICQKPW6G6eP1pm0f6jxuksYYFlQIiTlD3yo5e4fGGqFz+l8LrRkS6c1+uvDdGuhr8nUxSHFATKS1NWzvrNA85FE++/oQsd0zevkCZEvA8txfgiCTURlYf6AJWAipUo8aCtqKS5zKNa2IMj3TUSEqLoQsyEGCZn+ipbkDw5f81i5usjHrTmDPwPh1d5PwAYMkwAAAAASUVORK5CYII=");
}
.icon-large-images {
background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAABxUlEQVRYR+2XyyuFQRjGz3HPNfIPiEL5D0RYyNJeVlYuycIlf4EkSRQLG1bWkrKwo7BSyg5LZUW533+PZvQ1nL7jO2echTP1NDPffO/7POed55vmxGMZbvEM88eyAoIVGGY7pkCx5225I/8EWBRPUMAN8xLP5Db9LYNSV8C7Wa2lP/MkpJG8Jyb3548PVsAK8GnMIjjvfQsohGAW9BqiNfpR8Ai09uBbgMw16GzhAnOZ/E8EXENU7gi4Yl4JCkwlvrbfhwcyLkDlHnIqMM98BOSDp1Q80ETwtjFSJ/2pQ6Sp9nkmYMJVxuOGOCUB1SQ5BDWG9Jy+GVz8ICLRozwWnqNUQMp3QIuT+Zh5K5DJbLO+sudKMCSygBWy9CX4WXs813bojK8HG+AFtINLJybXrOlx0iehzDMXUuZd1rfAGNDnpnYE2oC+Ctt+LaCLyE2gwChNwlQde/zmMH41iUIr0MCL+6AiCnMgRpXpBjJf0gKqePkA1KVIbsPXGfQAGfMtrAJyvL71jjSR2zTLDAaSEbDES/1pJrfpdOOaDKuAJ+5vaROa8P8K+MtLqbjKVOrgfUC3mGng+2asG7FOTJk9+88oW4HYB/NaXyF6NJlmAAAAAElFTkSuQmCC");
}
.icon-blank {
background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAWBJREFUeNqEUj1LxEAQnd1MVA4lyIEWx6UIKEGUExGsbC3tLfwJ/hT/g7VlCnubqxXBwg/Q4hQP/LhKL5nZuBsvuGfW5MGyuzM7jzdvVuR5DgYnZ+f99ai7Vt5t9K9unu4HLweI3qWYxI6PDosdy0fhcntxO44CcOBzPA7mfEyuHwf7ntQk4jcnywOxIlfxOCNYaLVgb6cXbkTdhJXq2SIlNMC0xIqhHczDbi8OVzpLSUa0WebRfmigLHqj1EcPZnwf7gbDIrYVRyEinurj6jTBHyI7pqVrFQqEbt6TEmZ9v1NRAJNC1xTYxIQh/MmRUlmFQE3qWOW1nqB2TWk1/3tgJV0waVvkFIEeZbHq4ElyKzAmEXOx6gnEVJuWBzmkRJBRPYGZBDsVaOlpSgVJE2yVaAe/0kx/3azBRO0VsbMFZE3CDSZKweZfYIVg+DZ6v7h9GDVOwZPw/PoxKu/fAgwALbDAXf7DdQkAAAAASUVORK5CYII=");
}