Changeset 746:003c2d428dd8 in hatta-dev

Timestamp:

01/24/10 15:31:54 (2 years ago)

Author:

sheep@…

Branch:

default

Message:

remove empty subdirectories after page delete

Files:

• hatta.py (modified) (1 diff)
• tests/test_repo.py (modified) (1 diff)

hatta.py

@@ -708 +708 @@
                                                        author, comment, parent)
 
+    def delete_page(self, title, author=u'', comment=u''):
+        super(WikiSubdirectoryStorage, self).delete_page(title, author, comment)
+        file_path = self._file_path(title)
+        self._check_path(file_path)
+        dir_path = os.path.dirname(file_path)
+        os.removedirs(dir_path)
 
 class WikiParser(object):

tests/test_repo.py

@@ -95 +95 @@
             exists = os.path.exists(filepath)
             assert exists
+
+    def test_subdirectory_delete(self, subdir_repo):
+        title = u'foo/bar'
+        filepath = os.path.join(subdir_repo.path, 'foo/bar')
+        dirpath = os.path.join(subdir_repo.path, 'foo')
+        subdir_repo.save_text(title, self.text, self.author, self.comment,
+                              parent=-1)
+        subdir_repo.delete_page(title, self.author, self.comment)
+        exists = os.path.exists(filepath)
+        assert not exists
+        exists = os.path.exists(dirpath)
+        assert not exists