smd-client/server: refactoring and new options

smd-client

@@ -139,6 +139,48 @@ function get_header_and_merge(name,hsha)
 	end
 end
 
+-- ============================= renaming ====================================
+
+function compute_renamings(actions)
+	local copy = {}
+	local delete = {}
+	local script = {}
+	for _, cmd in ipairs(actions) do
+		local opcode = parse(cmd, '^(%S+)')
+		if opcode == "COPY" then
+			local name_src, hsha, bsha, name_tgt = 
+				parse(cmd, '^COPY (%S+) (%S+) (%S+) TO (%S+)$')
+			name_src = url_decode(name_src)
+			name_tgt = url_decode(name_tgt)
+			copy[#copy + 1] = { src = name_src, tgt = name_tgt}
+		elseif opcode == "DELETE" then
+			local name, hsha, bsha = parse(cmd, '^DELETE (%S+) (%S+) (%S+)$')
+			name = url_decode(name)
+			delete[name] = true
+		end
+	end
+	for _, cp in ipairs(copy) do
+		-- it is a real move
+		if delete[cp.src] then
+			local absolute1, t1, last1 = tokenize_path(cp.src)
+			local absolute2, t2, last2 = tokenize_path(cp.tgt)
+			local dir1 = table.concat(t1,'/')
+			local dir2 = table.concat(t2,'/')
+			if not absolute1 and not absolute2 and 
+				last1 ~= nil and last2 ~= nil and
+				(t1[#t1] == "cur" or t1[#t1] == "new") and
+				(t2[#t2] == "cur" or t2[#t2] == "new") and
+				dir1 == dir2 and is_translator_set() then
+				local t_dir =  homefy(translate(dir1))
+				script[#script + 1] = string.format( "mv %s %s",
+					quote(t_dir..'/'..last1),
+					quote(t_dir..'/'..last2))
+			end
+		end
+	end
+	return script
+end
+
 -- ============================= actions =====================================
 
 function execute_add(name, hsha, bsha)
@@ -489,6 +531,8 @@ function main()
 	local usage = "Usage: "..arg[0]:match('[^/]+$')..
 		" [-vd] [-t translatorRL] endpointname mailboxes...\n"
 	local apply_xdelta = true
+	local rename_only = false
+	local override_db = nil
 	while #arg > 2 do
 		if arg[1] == '-v' or arg[1] == '--verbose' then
 			set_verbose(true)
@@ -503,6 +547,13 @@ function main()
 			set_translator(arg[2])
 			table.remove(arg,1)
 			table.remove(arg,1)
+		elseif arg[1] == '--rename-only' then
+			rename_only = true
+			table.remove(arg,1)
+		elseif arg[1] == '--override-db' then
+			override_db = arg[2]
+			table.remove(arg,1)
+			table.remove(arg,1)
 		else
 			break
 		end
@@ -516,7 +567,12 @@ function main()
 	-- here we go
 	local endpoint = arg[1]
 	table.remove(arg,1)
-	local dbfile = dbfile_name(endpoint, arg)
+	local dbfile = nil
+	if override_db ~= nil then
+		dbfile = override_db:gsub('^~',os.getenv('HOME'))
+	else
+		dbfile = dbfile_name(endpoint, arg)
+	end
 	local xdelta = dbfile .. '.xdelta'
 	local newdb = dbfile .. '.new'
 	
@@ -542,6 +598,20 @@ function main()
 	
 	-- receive and process commands
 	local commands = receive_delta(io.stdin, firsttime)
+	if rename_only then
+			-- in renaming mode, we handle commands in a peculiar way
+			log_progress('Phase 2: renaming script generation')
+			local script = compute_renamings(commands)
+			local fname = os.getenv('HOME')..'/smd-rename.sh'
+			local f = io.open(fname,'w')
+			f:write('#!/bin/sh\n\n')
+			f:write(table.concat(script,'\n'))
+			f:close()
+			log('Please check and run: '..fname)
+			-- and we exit
+			os.exit(0)
+	end
+
 	log_progress('Phase 2: synchronization')
 	if firsttime then
 		log_progress([[

smd-client.1.txt

@@ -2,7 +2,9 @@ NAME
   smd-client - receives diffs and performs actions
 
 SYNOPSIS
-  smd-client [-v|--verbose] [-d|--dry-run] [-t|--translator] endpoint mailboxes
+  smd-client [-v|--verbose] [-d|--dry-run] [-t|--translator]
+	[-l|--local-sync] [--rename-only]
+	[--override-db dbf] endpoint mailboxes
 
 DESCRIPTION
   smd-client needs to know a name (endpoint) for the client (that must not
@@ -18,6 +20,10 @@ OPTIONS
                    program) is optimized away
   -l --local-sync  Local synchronization, no changes is made to the db-file
                    since smd-server takes care of it
+  --rename-only    Do not synchronize the mailboxes but generate the 
+                   script '~/smd-rename.sh' to uniform the files names in the
+                   mailbox
+  --override-db dbf  Use dbf as the db-file
   -v --verbose     Increase program verbosity (printed on stderr)
   -d --dry-run     Do not perform any action for real
 

smd-server

@@ -20,7 +20,9 @@ function main()
 	local exclude = {}
 	local no_delete = false
 	local just_mddiff = false
-	local just_dbfile = false
+	local stop_after_diff = false
+	local override_db = nil
+	local dump_stdin_to = nil
 	local usage = "Usage: "..arg[0]:match('[^/]+$')..
 		" [-vdn] endpointname mailboxes...\n"
 	while #arg > 2 do
@@ -38,11 +40,19 @@ function main()
 			exclude[#exclude + 1] = arg[2]
 			table.remove(arg,1)
 			table.remove(arg,1)
-		elseif arg[1] == '--just-print-mddiff-cmdline' then
+		elseif arg[1] == '--get-mddiff-cmdline' then
 			just_mddiff = true
 			table.remove(arg,1)
-		elseif arg[1] == '--just-print-db-filename' then
-			just_dbfile = true
+		elseif arg[1] == '--override-db' then
+			override_db = arg[2]
+			table.remove(arg,1)
+			table.remove(arg,1)
+		elseif arg[1] == '--stop-after-diff' then
+			stop_after_diff = true
+			table.remove(arg,1)
+		elseif arg[1] == '--dump-stdin' then
+			dump_stdin_to = arg[2]
+			table.remove(arg,1)
 			table.remove(arg,1)
 		else
 			break
@@ -54,9 +64,27 @@ function main()
 		os.exit(2)
 	end
 
+	if dump_stdin_to ~= nil then
+		dump_stdin_to = dump_stdin_to:gsub('^~',os.getenv('HOME'))
+		mkdir_p(dump_stdin_to)
+		local f = io.open(dump_stdin_to,'w')
+		local data = nil
+		repeat
+				data = io.read(4096)
+				if data then f:write(data) end
+		until data == nil
+		f:close()
+		os.exit(0)
+	end
+
 	local endpoint = arg[1]
 	table.remove(arg,1)
-	local dbfile = dbfile_name(endpoint, arg)
+	local dbfile = nil
+	if override_db ~= nil then
+		dbfile = override_db:gsub('^~',os.getenv('HOME'))
+	else
+		dbfile = dbfile_name(endpoint, arg)
+	end
 	local xdelta = dbfile .. '.xdelta'
 	local dbfilemt = dbfile .. '.mtime'
 	local newdb = dbfile .. '.new'
@@ -72,12 +100,10 @@ function main()
 	local mddiff = MDDIFF..' '..dry_opt..' '..database_opt..' '..
 		exclude_opt..' '..no_delete_opt..' '..mailbox_opt
 	
+	-- to call mddiff from another tool with the same cmdline
 	if just_mddiff then
-			print(mddiff)
-			os.exit(0)
-	elseif just_dbfile then
-			print(dbfile)
-			os.exit(0)
+		print(mddiff)
+		os.exit(0)
 	end
 
 
@@ -103,6 +129,17 @@ function main()
 	-- of some data
 	io.write('END\n')
 	io.flush()
+
+	-- if renaming mode, we exit
+	if stop_after_diff then
+		if override_db ~= nil then
+			os.remove(dbfile)
+			os.remove(dbfilemt)
+			os.remove(newdb)
+			os.remove(newdbmt)
+		end
+		os.exit(0)
+	end
 	
 	-- process client commands
 	while true do

smd-server.1.txt

@@ -3,8 +3,8 @@ NAME
 
 SYNOPSIS
   smd-server [--exclude glob] [-v|--verbose] [-d|--dry-run]
-	[--just-print-mddiff-cmdline]
-	[--just-print-db-filename] endpoint mailboxes
+	[--get-mddiff-cmdline] [--stop-after-diff]
+	[--override-db dbf] [--dump-stdin tgt] endpoint mailboxes
 
 DESCRIPTION
   smd-server needs to know a name (endpoint) for the client (that must not
@@ -22,8 +22,12 @@ OPTIONS
   -d --dry-run    Do not perform any action for real
   -n --no-delete  Do not track deleted files
   --exclude glob  Exclude paths matching glob
-  --just-print-mddiff-cmdline  Prints the command like used for mddiff and then exists
-  --just-print-db-filename  Prints the db-file name and then exists
+  --override-db dbf  Use dbf as the db-file
+  --get-mddiff-cmdline  Print the command line used for mddiff and then exist
+  --stop-after-diff  Send the actions to the other endpoint and exit. If used
+                     in conjunction with --override-db, dbf is removed just
+                     before exiting
+  --dump-stdin tgt  Dump standard input to tgt and exit
 
 NOTES
   smd-server is a low level utility. You should use higher level tools like

syncmaildir.lua

@@ -372,26 +372,34 @@ function make_dir_aux(absolute, pieces)
 	end
 end
 
-function mkdir_p(path)
+function tokenize_path(path)
 	local t = {} 
-
 	local absolute = false
+	local file = ""
+
 	if string.byte(path,1) == string.byte('/',1) then absolute = true end
 
 	-- tokenization
 	for m in path:gmatch('([^/]+)') do t[#t+1] = m end
 
-	-- strip last component is not ending with '/'
-	if string.byte(path,string.len(path)) ~= string.byte('/',1) then 
+	-- strip last component if not ending with '/'
+	if string.byte(path,string.len(path)) ~= string.byte('/',1) then
+		file=t[#t]
 		table.remove(t,#t) 
 	end
 
+	return absolute, t, file
+end
+
+-- creates a directory that can contains a path, should be equivalent
+-- to mkdir -p `dirname path`. moreover, if the last component is 'tmp',
+-- 'cur' or 'new', they are all are created too. exampels:
+--  mkdir_p('/foo/bar')     creates /foo
+--  mkdir_p('/foo/bar/')    creates /foo/bar/
+--  mkdir_p('/foo/tmp/baz') creates /foo/tmp/, /foo/cur/ and /foo/new/
+function mkdir_p(path)
+	local absolute, t, _ = tokenize_path(path)
+
 	make_dir_aux(absolute, t)
 
 	--  ensure new, tmp and cur are there