removing file can change in time

cairo/cairo.py

@@ -79,9 +79,13 @@ def ft_at_time(node: FileTree, dt: datetime) -> None:
  change_time = True
  pass # case 2
  if (_rc(node, node.curr_dt) != _rc(node, dt)):
- # children have changed (or is FP good enough?)
+ # node has been removed
+ print(node.path, "change3")
+ curr_chld = _rc(node, node.curr_dt)
+ dt_chld = _rc(node, dt)
+ _add_children(dt_chld - curr_chld, dt)
+ _rmv_children(curr_chld - dt_chld)
  change_time = True
- pass #case 3
 
  if change_time: node.curr_dt = dt
 
@@ -250,6 +254,8 @@ def mv_file(root: FileTree, fp: Path, parent: Path, version = None) -> FileTree:
  _save_tree(root)
 
 
+# helpers
+
 def _add_file_to_tree(root, fp, version = None):
  version = version or _mk_ver()
  parent = find_file_path(root, fp.parent)
@@ -259,8 +265,6 @@ def _add_file_to_tree(root, fp, version = None):
  _add_new_mod(parent, 'children', pc, version)
 
 
-# helpers
-
 def _save_tree(root: FileTree) -> None:
  tree_file = _rfp(root)/PKL_FILE
  with open(tree_file, 'wb') as tf:
@@ -318,6 +322,24 @@ def _rd(ft: FileTree, dt: datetime = None):
 def _rfp(ft: FileTree, dt: datetime = None) -> Path:
  return resolve(ft, dt).get('path', ft.path)
 
+
+def _add_children(child_paths: Set[UUID], dt: datetime = None):
+ for c in child_paths:
+ child = File_Index.get(c)
+ if child:
+ (child.path).touch()
+ with open(child.path, 'w') as f:
+ f.write(_rd(child, dt))
+
+
+def _rmv_children(child_paths: Set[UUID]):
+ for c in child_paths:
+ child = File_Index.get(c)
+ if child: 
+ try: child.path.unlink()
+ except: continue
+
+
 def _find_file(root: FileTree, ID: UUID) -> FileTree:
  if root.ID == ID:
  return root
@@ -342,23 +364,27 @@ def _mk_ver() -> Version:
 def _fp_in_tree(root: FileTree, fp: Path) -> bool:
  return find_file_path(root, fp) is not None
 
+
 def _mod_time(fp: Path) -> datetime:
  return datetime.fromtimestamp(fp.stat().st_mtime)
 
+
 def _make_sets(root: FileTree, dt: datetime = None) -> (Set[Path], Set[Path]):
  files = (set(_rfp(root, dt).glob('**/*')))
  files -= set(filter(lambda p: any(n in ignored for n in str(p).split('/')), files))
  ft_files = _tree_to_set(root, dt)
  ft_files.remove(_rfp(root, dt=dt))
  return files, ft_files
 
+
 def _tree_to_set(node: FileTree, s = None, dt: datetime = None) -> Set[Path]:
  s = s or set()
  s.add(_rfp(node, dt))
  for c in _rc(node, dt):
  _tree_to_set(File_Index[c], s=s, dt=dt)
  return s
 
+
 def _rm_f_or_d(fp):
  if fp.is_dir(): 
  rmtree(fp)

test/test_cairo.py

@@ -268,4 +268,20 @@ def test_path_change_in_time(cleandir):
 
  c.ft_at_time(root, after)
  assert not (Path()/'test3.txt').exists()
- assert (Path()/'test_dir'/'test3.txt').exists()
+ assert (Path()/'test_dir'/'test3.txt').exists()
+
+
+def test_remove_change_in_time(cleandir):
+ root = c.init()
+ p = Path()/'test_dir'/'test.txt'
+ c.rm_file(root, p)
+
+ vtime = c.get_versions(root)[-1].time
+ before = vtime - timedelta(microseconds=10)
+ after = vtime + timedelta(microseconds=10)
+
+ c.ft_at_time(root, before)
+ assert p.exists()
+
+ c.ft_at_time(root, after)
+ assert not p.exists()