Skip to content

Commit 7c8fe9c

Browse files
HHHartmannmarcoskirsch
HHHartmann
authored and
marcoskirsch
committed
Upload for all files fix 119 (#120)
* allow uploading files not only to http + replace symbol images by unicode symbols allow uploading files to root dir and http. + replace symbol images by unicode symbols * backend for uploading arbitrary files * fix uploading to http
1 parent 5cf303d commit 7c8fe9c

File tree

2 files changed

+79
-37
lines changed

2 files changed

+79
-37
lines changed

‎http/upload.html‎

Lines changed: 59 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,29 @@
3333

3434
.dropBox {width:100vw; height:100vh; margin-top: -200px; padding-top: 200px;}
3535

36+
#uploaddir{
37+
background-color: #2E3134;
38+
font-size:16px;
39+
font-weight:bold;
40+
color:#7f858a;
41+
padding: 40px 50px;
42+
margin-bottom: 30px;
43+
}
44+
45+
#uploaddir a{
46+
background-color:#007a96;
47+
padding:12px 26px;
48+
color:#fff;
49+
font-size:14px;
50+
border-radius:2px;
51+
cursor:pointer;
52+
margin-top:12px;
53+
line-height:1;
54+
margin-left: 10px;
55+
}
56+
#selectedDir {
57+
margin-top:20px;
58+
}
3659
#upload{
3760
font-family:'PT Sans Narrow', sans-serif;
3861
background-color:#373a3d;
@@ -140,14 +163,24 @@
140163
position: absolute;
141164
}
142165

166+
.delete:after{
167+
color: #ff0000;
168+
content: "\2718";
169+
}
170+
171+
.uploaded:after{
172+
color: #00ff00;
173+
content: "\2714";
174+
}
175+
143176
#upload ul li span{
144177
width: 15px;
145178
height: 12px;
146-
background: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA8AAAAaCAYAAABozQZiAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA2RpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMC1jMDYwIDYxLjEzNDc3NywgMjAxMC8wMi8xMi0xNzozMjowMCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDpFQUY1MzY0QUU3QjdFMjExODE0NkUyMUJBNERDNDk0NyIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDpCOTc5MTBDQ0I3RUYxMUUyOUVBQkNFOURERDIzQkU4NSIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDpCOTc5MTBDQkI3RUYxMUUyOUVBQkNFOURERDIzQkU4NSIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgQ1M1IFdpbmRvd3MiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDpFQUY1MzY0QUU3QjdFMjExODE0NkUyMUJBNERDNDk0NyIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDpFQUY1MzY0QUU3QjdFMjExODE0NkUyMUJBNERDNDk0NyIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/PvX6SiYAAAGjSURBVHjanJRPRMRREMfbNtE19hQlolNdomsRaZUiIlHKdiml7CpFolU6pEOWTUTRJZKIakmHsqQ99UedOiT2lG6xRPSdzFtjGi+/ho99836/78z8Zt7bUN3VfElAKwcRkC/9h/AAPIKmsgDCMNgB3ezvB8m8BQZ4/QkmSVwJbsCcR7gOYrz+Av0gQ2WfgWaGvimphEsgLvwRcEQLypxVLy4KP678cbDnHMqc4GZMiQBU2huX62wWbMqSXLenWeDKW1alr4A13QjZ7YT1AmwDLFhd1KOi0naFf8lVmWYdklHuQTXo8g3eOiT07UOgFXy4zcPB2wpTjAdpcA8iVgbs0yTe8dsi90N3NdEUfifYfwBtPCZn9CzF6wJXlGt8Of3JXCVebAAXfOXIxoTQfVJYlk3n9NgIQGc9LfYpaxRcSzHdkD4jwKoStqujXOy2FUBnzPpGRQHODfErePprzjHVHGf1qom/xCTcVlXkPFMoiocNYQ/PM+MLQOIZJexlUUGsZYBOKaYRPAvhieq0DJCUt45uVZ5LrLXGIQJ0uP8uZ98CDADM9WkEBoK0xwAAAABJRU5ErkJggg==') no-repeat;
179+
cursor:pointer;
147180
position: absolute;
148181
top: 34px;
149182
right: 33px;
150-
cursor:pointer;
183+
font-size:18px;
151184
}
152185

153186
#upload ul li.working span{
@@ -189,7 +222,7 @@
189222
var chunkSize = 128;
190223
var totalUploaded = 0;
191224

192-
var tpl = '<li class="working" id="file%filenum%"><div class="chart" id="graph%filenum%" data-percent="0"></div><p>%filename%<i>%filesize%</i></p><span id="fileStatus%filenum%" onclick="DeleteFiles(%filenum%);"></span></li>';
225+
var tpl = '<li class="working" id="file%filenum%"><div class="chart" id="graph%filenum%" data-percent="0"></div><p>%filename%<i>%filesize%</i></p><span class="delete" id="fileStatus%filenum%" onclick="DeleteFiles(%filenum%);"></span></li>';
193226

194227
document.addEventListener("DOMContentLoaded", function() {
195228
var dropbox;
@@ -200,6 +233,8 @@
200233
dropbox.addEventListener("drop", drop, false);
201234

202235
UpdateFileList();
236+
237+
UploadDir("http");
203238
});
204239

205240
function dragenter(e) {
@@ -235,13 +270,13 @@
235270
var fileNames = {};
236271

237272
for (var i = 0; i < filesCount; i++) {
238-
fileNames[tfiles[i].name] = i;
273+
fileNames[uploadDir + tfiles[i].name] = i;
239274
}
240275

241276
Keys(fileNames).sort(function(a,b){var c=a.toLowerCase(),d=b.toLowerCase();return c<d?-1:c>d?1:0}).forEach(function(item) {
242277
var i = fileNames[item];
243278

244-
var append = tpl.replace(/%filename%/g, tfiles[i].name);
279+
var append = tpl.replace(/%filename%/g, uploadDir + tfiles[i].name);
245280
append = append.replace(/%filesize%/g, formatFileSize(tfiles[i].size));
246281
append = append.replace(/%filenum%/g, i);
247282

@@ -380,7 +415,7 @@
380415
totalUploaded = 0;
381416

382417
if (statusElement) {
383-
statusElement.style["background-position"] = "0 3px";
418+
statusElement.classList.add("uploaded");
384419
}
385420

386421
if (currentUploadingFile < files.length) {
@@ -396,7 +431,7 @@
396431
fileUploadRequest = 0;
397432
}
398433

399-
lastRequest = 'upload.lua?cmd=upload&filename=' + file.name + '&filesize=' + file.size + '&len=' + chunkLen + '&offset=' + sendingOffset + '&data=' + filedata;
434+
lastRequest = 'upload.lua?cmd=upload&filename=' + uploadDir + file.name + '&filesize=' + file.size + '&len=' + chunkLen + '&offset=' + sendingOffset + '&data=' + filedata;
400435

401436
fileUploadRequest.timeout = 5000;
402437
fileUploadRequest.open('GET', lastRequest, true);
@@ -406,6 +441,16 @@
406441
fr.readAsArrayBuffer(file);
407442
}
408443

444+
function UploadDir(dir) {
445+
if (uploadingInProgress == 0) {
446+
document.getElementById('dir').innerHTML = "/" + dir;
447+
uploadDir = dir;
448+
if (!(uploadDir == "")) {
449+
uploadDir += "/";
450+
}
451+
}
452+
}
453+
409454
function formatFileSize(bytes) {
410455
if (typeof bytes !== 'number') {
411456
return '';
@@ -494,14 +539,14 @@
494539

495540
document.getElementById('fileInfo').innerHTML = '';
496541

497-
var tpl = '<li class="working"><p style="left: 30px;">%filenamelink%<i>%filesize%</i></p><span id="fileStatus" onclick="RemoveFile(\'%filename%\');"></span></li>';
542+
var tpl = '<li class="working"><p style="left: 30px;">%filenamelink%<i>%filesize%</i></p><span class="delete" id="fileStatus" onclick="RemoveFile(\'%filename%\');"></span></li>';
498543
var tplTotal = '<li class="working"><p style="left: 30px;">Used:<i>%used%</i></p></li><li class="working"><p style="left: 30px;">Free:<i>%free%</i></p></li><li class="working"><p style="left: 30px;">Total:<i>%total%</i></p></li>';
499544

500545
var append, link;
501546

502547
Keys(fileList).sort(function(a,b){var c=a.toLowerCase(),d=b.toLowerCase();return c<d?-1:c>d?1:0}).forEach(function(item) {
503-
if (!(item.match(/\.lc$/ig))) {
504-
link = item.replace(/\.gz$/g, '');
548+
if (!item.match(/\.lc$/ig) && item.match(/^http\//ig)) {
549+
link = item.replace(/\.gz$/g, '').replace(/^http\//g, '');
505550
append = tpl.replace(/%filenamelink%/g, '<a href="' + link + '" target="_blank">' + item + '</a>');
506551
}
507552
else {
@@ -549,6 +594,10 @@
549594
<body>
550595
<div id="dropbox" class="dropBox">
551596
<div id="upload">
597+
<div id="uploaddir" class="uploadDir">
598+
<a onclick='UploadDir("");'>/</a>
599+
<a onclick='UploadDir("http");'>/http</a>
600+
<div id="selectedDir">selected Directory: <div id = "dir">bla</div></div></div>
552601
<div id="drop">
553602
Drop Here
554603

‎http/upload.lua‎

Lines changed: 20 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -48,18 +48,16 @@ return function (connection, req, args)
4848

4949
if (mbCmd == 'upload') then
5050
if (fieldsCount > 5) then
51-
if (mbFilename ~= 'upload.lua') then
51+
if (mbFilename ~= 'http/upload.lua') then
5252
connection:send('"offset":"' .. mbOffset .. '",')
5353
connection:send('"len":"' .. mbLen .. '",')
5454
connection:send('"filename":"' .. mbFilename .. '"')
55-
56-
mbFilename = 'http/' .. mbFilename
57-
55+
5856
for i=1,string.len(mbData),2 do
5957
currentByte = tonumber(string.sub(mbData, i, i + 1), 16)
6058
binaryData = binaryData .. string.char(currentByte)
6159
end
62-
60+
6361
local mbTmpFilename = string.sub(mbFilename, 0, 27) .. '.dnl'
6462
if (mbOffset > 0) then
6563
file.open(mbTmpFilename,'a+')
@@ -77,7 +75,7 @@ return function (connection, req, args)
7775
file.remove(mbFilename)
7876
file.rename(mbTmpFilename, mbFilename)
7977
file.remove(mbTmpFilename)
80-
78+
8179
if (string.sub(mbFilename, -4) == '.lua') then
8280
file.remove(string.sub(mbFilename, 0, -3) .. "lc")
8381
node.compile(mbFilename)
@@ -90,39 +88,34 @@ return function (connection, req, args)
9088
local remaining, used, total=file.fsinfo()
9189

9290
local headerExist = 0
93-
91+
9492
connection:send('"files":{')
95-
93+
9694
for name, size in pairs(file.list()) do
97-
local isHttpFile = string.match(name, "(http/)") ~= nil
98-
99-
if isHttpFile then
100-
if (headerExist > 0) then
101-
connection:send(',')
102-
end
103-
104-
local url = string.match(name, ".*/(.*)")
105-
106-
connection:send('"' .. url .. '":"' .. size .. '"')
107-
108-
headerExist = 1
109-
end
95+
if (headerExist > 0) then
96+
connection:send(',')
97+
end
98+
99+
local url = string.match(name, ".*/(.*)")
100+
url = name
101+
connection:send('"' .. url .. '":"' .. size .. '"')
102+
103+
headerExist = 1
110104
end
111-
105+
112106
connection:send('},')
113-
107+
114108
connection:send('"total":"' .. total .. '",')
115109
connection:send('"used":"' .. used .. '",')
116110
connection:send('"free":"' .. remaining .. '"')
117111
elseif (mbCmd == 'remove') then
118112
if (fieldsCount > 1) then
119-
if (mbFilename ~= 'upload.lua') and (mbFilename ~= 'upload.lc') and (mbFilename ~= 'upload.html.gz') then
120-
file.remove('http/' .. mbFilename)
113+
if (mbFilename ~= 'http/upload.lua') and (mbFilename ~= 'http/upload.lc') and (mbFilename ~= 'http/upload.html.gz') then
114+
file.remove(mbFilename)
121115
end
122116
end
123117
end
124-
118+
125119
connection:send('}')
126120
collectgarbage()
127121
end
128-

0 commit comments

Comments
 (0)