mirror of https://github.com/octoleo/lsyncd.git
do not replace active delays
This commit is contained in:
parent
62923459f4
commit
16919a893e
33
lsyncd.lua
33
lsyncd.lua
|
@ -905,11 +905,6 @@ local Combiner = ( function
|
||||||
if d2.etype == 'Delete'
|
if d2.etype == 'Delete'
|
||||||
or d2.etype == 'Create'
|
or d2.etype == 'Create'
|
||||||
then
|
then
|
||||||
if d1.status == 'active'
|
|
||||||
then
|
|
||||||
return 'stack'
|
|
||||||
end
|
|
||||||
|
|
||||||
return 'toDelete,stack'
|
return 'toDelete,stack'
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -2435,14 +2430,17 @@ local Sync = ( function
|
||||||
nd.dpos = self.delays:push( nd )
|
nd.dpos = self.delays:push( nd )
|
||||||
elseif ac == 'toDelete,stack'
|
elseif ac == 'toDelete,stack'
|
||||||
then
|
then
|
||||||
-- turns delay1 into a delete
|
if od.status ~= 'active'
|
||||||
|
then
|
||||||
|
-- turns olddelay into a delete
|
||||||
|
local rd = Delay.new( 'Delete', self, od.alarm, od.path )
|
||||||
|
|
||||||
|
self.delays:replace( il, rd )
|
||||||
|
|
||||||
|
rd.dpos = il
|
||||||
|
end
|
||||||
|
|
||||||
-- and stacks delay2
|
-- and stacks delay2
|
||||||
local rd = Delay.new( 'Delete', self, od.alarm, od.path )
|
|
||||||
|
|
||||||
self.delays:replace( il, rd )
|
|
||||||
|
|
||||||
rd.dpos = il
|
|
||||||
|
|
||||||
stack( rd, nd )
|
stack( rd, nd )
|
||||||
|
|
||||||
nd.dpos = self.delays:push( nd )
|
nd.dpos = self.delays:push( nd )
|
||||||
|
@ -2451,9 +2449,16 @@ local Sync = ( function
|
||||||
-- nada
|
-- nada
|
||||||
elseif ac == 'replace'
|
elseif ac == 'replace'
|
||||||
then
|
then
|
||||||
self.delays:replace( il, nd )
|
if od.status ~= 'active'
|
||||||
|
then
|
||||||
|
self.delays:replace( il, nd )
|
||||||
|
|
||||||
nd.dpos = il
|
nd.dpos = il
|
||||||
|
else
|
||||||
|
stack( od, nd )
|
||||||
|
|
||||||
|
nd.dpos = self.delays:push( nd )
|
||||||
|
end
|
||||||
elseif ac == 'split'
|
elseif ac == 'split'
|
||||||
then
|
then
|
||||||
delay( self, 'Delete', time, path, nil )
|
delay( self, 'Delete', time, path, nil )
|
||||||
|
|
Loading…
Reference in New Issue