Changeset 55

Timestamp:

05/14/2011 07:13:41 AM (2 years ago)

Author:

reyalp

Message:

improve error checking for upload/download arguments, use clean up path handling for downloaddir and deletefiles

Location:

trunk/lua

Files:

• chdku.lua (modified) (2 diffs)
• cli.lua (modified) (3 diffs)
• util.lua (modified) (1 diff)

trunk/lua/chdku.lua

@@ -456 +456 @@
         end
         for i,name in ipairs(filenames) do
-                local src = srcpath .. '/' .. name
-                local dst = dstpath .. '/' .. name
+                local src = joinpath(srcpath,name)
+                local dst = joinpath(dstpath,name)
                 printf("%s -> %s\n",src,dst)
                 status,err = chdk.download(src,dst)
                 if not status then
                         return status,err
+                end
+        end
+        return true
+end
+--[[
+quick and dirty bulk delete, this may change or go away
+
+delete files from directory, optionally matching pattern
+note directory should not end in a /, unless it is A/
+only *files* will be deleted, directories will not be touched
+]]
+function chdku.deletefiles(dir,pattern)
+        local files,err=chdku.listdir(dir,{stat="*",match=pattern})
+        if not files then
+                return false, err
+        end
+        for i,st in ipairs(files) do
+                if st.is_file then
+                        local status,err=chdku.execwait("return os.remove('"..joinpath(dir,st.name).."')")
+                        if not status then
+                                return false,err
+                        end
+--                      print('del '..st.name)
                 end
         end
@@ -755 +778 @@
         end
 end
---[[
-quick and dirty bulk delete, this may change or go away
-
-delete files from directory, optionally matching pattern
-note directory should not end in a /, unless it is A/
-only *files* will be deleted, directories will not be touched
-]]
-function chdku.deletefiles(dir,match)
-        local files,err=chdku.listdir(dir,{stat="*",match=match})
-        if not files then
-                return false, err
-        end
-        -- TODO we should fix up the path properly like CLI does
-        if dir ~= 'A/' then
-                dir = dir .. '/'
-        end
-        for i,st in ipairs(files) do
-                if st.is_file then
-                        local status,err=chdku.execwait("return os.remove('"..dir..st.name.."')")
-                        if not status then
-                                return false,err
-                        end
---                      print('del '..st.name)
-                end
-        end
-        return true
-end
 return chdku

trunk/lua/cli.lua

@@ -361 +361 @@
                 func=function(self,args) 
                         local src,args = cli:get_string_arg(args)
+                        if not src then
+                                return false, "missing source"
+                        end
                         local dst = cli:get_string_arg(args)
                         -- no dst, use filename of source
@@ -387 +390 @@
                 func=function(self,args) 
                         local src,args = cli:get_string_arg(args)
+                        if not src then
+                                return false, "missing source"
+                        end
                         local dst = cli:get_string_arg(args)
                         -- use final component
@@ -392 +398 @@
                                 dst = util.basename(src)
                         -- trailing slash, append filename of source
+                        -- TODO should use stat to figure out if target is a directory
                         elseif string.find(dst,'[\\/]$') then
                                 dst = dst .. util.basename(src)
                         end
-                        if not (src and dst) then
+                        if not dst then
                                 return false, "bad/missing args ?"
                         end

trunk/lua/util.lua

@@ -234 +234 @@
 ]]
 function util.basename(path,sfx)
+        if not path then
+                return nil
+        end
         local s,e,bn=string.find(path,'([^\\/]+)[\\/]?$')
         if not s then