Mirrors/cloudcmd
1
0
Fork 0
mirror of https://github.com/coderaiser/cloudcmd.git synced 2026-01-23 18:55:26 +00:00
Code Issues Projects Releases Wiki Activity

feature(flop) read: rm isFile

Browse source
This commit is contained in:
coderaiser 2014-06-19 10:36:10 -04:00
parent 08e9862839
commit 13e22e9898
2 changed files with 15 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

10
cloudcmd.js
View file

@ -235,12 +235,14 @@
} else if (isFS) {
name = Util.rmStrOnce(name, CloudFunc.FS) || main.SLASH;
flop.read(name, function(error, data, isFile) {
if (error)
main.sendError(p, error);
else if (isFile) {
flop.read(name, function(error, data) {
var isFile = error.code === 'ENOTDIR';
if (isFile) {
p.name = name;
main.sendFile(p);
} else if (error) {
main.sendError(p, error);
} else
readIndex(data, function(error, data) {
var NOT_LOG = true;

17
lib/server/rest.js
View file

@ -140,15 +140,16 @@
switch (p.request.method) {
case 'GET':
onFSGet(query, p.name, function(error, data, isFile) {
onFSGet(query, p.name, function(error, data) {
var str,
isStr = Util.isString(data);
isStr = Util.isString(data);
if (error)
sendError(params, error);
else if (isFile)
main.sendFile(p);
else {
if (error) {
if (error.code === 'ENOTDIR')
main.sendFile(p);
else
sendError(params, error);
} else {
p.name += '.json';
p.query = query;
@ -390,7 +391,7 @@
function copyFiles(files, callbackProcess, callback) {
var names = files.names,
isFunc = Util.isFunction(callbackProcess),
processFunc = names ? flop.copy : fs.rename,
processFunc = names ? flop.cp : fs.rename,
copy = function() {
var isLast, name, process,