dgse qt: removed all hsfs usages.

--HG--
extra : convert_revision : svn%3Ac306627e-7827-47d3-bdf0-9a457c9553a1/trunk%40200

se/py/app_cocoa.py

@@ -11,12 +11,11 @@ import logging
 
 from AppKit import *
 
-from hsfs.phys import Directory as DirectoryBase
-from hsfs.phys.bundle import Bundle
+from hsutil import io
 from hsutil.path import Path
-from hsutil.misc import extract
 from hsutil.str import get_file_ext
 
+from dupeguru import fs
 from dupeguru.app_cocoa import DupeGuru as DupeGuruBase
 from dupeguru.directories import Directories as DirectoriesBase, STATE_EXCLUDED
 from . import data
@@ -32,27 +31,17 @@ else: # Tiger
     def is_bundle(str_path): # just return a list of a few known bundle extensions.
         return get_file_ext(str_path) in ('app', 'pages', 'numbers')
 
-class DGDirectory(DirectoryBase):
-    def _create_sub_file(self, name, with_parent=True):
-        if is_bundle(unicode(self.path + name)):
-            parent = self if with_parent else None
-            return Bundle(parent, name)
-        else:
-            return super(DGDirectory, self)._create_sub_file(name, with_parent)
-    
-    def _fetch_subitems(self):
-        subdirs, subfiles = super(DGDirectory, self)._fetch_subitems()
-        apps, normal_dirs = extract(lambda name: is_bundle(unicode(self.path + name)), subdirs)
-        subfiles += apps
-        return normal_dirs, subfiles
+class Bundle(BundleBase):
+    @classmethod
+    def can_handle(cls, path):
+        return not io.islink(path) and io.isdir(path) and is_bundle(unicode(path))
     
 
 class Directories(DirectoriesBase):
     ROOT_PATH_TO_EXCLUDE = map(Path, ['/Library', '/Volumes', '/System', '/bin', '/sbin', '/opt', '/private', '/dev'])
     HOME_PATH_TO_EXCLUDE = [Path('Library')]
     def __init__(self):
-        DirectoriesBase.__init__(self)
-        self.dirclass = DGDirectory
+        DirectoriesBase.__init__(self, fileclasses=[Bundle, fs.File])
     
     def _default_state_for_path(self, path):
         result = DirectoriesBase._default_state_for_path(self, path)

se/py/fs.py

@@ -0,0 +1,43 @@
+# -*- coding: utf-8 -*-
+# Created By: Virgil Dupras
+# Created On: 2009-10-23
+# $Id$
+# Copyright 2009 Hardcoded Software (http://www.hardcoded.net)
+# 
+# This software is licensed under the "HS" License as described in the "LICENSE" file, 
+# which should be included with this package. The terms are also available at 
+# http://www.hardcoded.net/licenses/hs_license
+
+import hashlib
+
+from hsutil import io
+from hsutil.misc import nonone
+
+from dupeguru import fs
+
+class Bundle(fs.File):
+    """This class is for Mac OSX bundles (.app). Bundles are seen by the OS as
+    normal directories, but I don't want that in dupeGuru. I want dupeGuru
+    to see them as files.
+    """
+    def _read_info(self, field):
+        if field in ('size', 'ctime', 'mtime'):
+            files = fs.get_all_files(self.path)
+            size = sum((file.size for file in files), 0)
+            self.size = size
+            stats = io.stat(self.path)
+            self.ctime = nonone(stats.st_ctime, 0)
+            self.mtime = nonone(stats.st_mtime, 0)
+        elif field in ('md5', 'md5partial'):
+            # What's sensitive here is that we must make sure that subfiles'
+            # md5 are always added up in the same order, but we also want a
+            # different md5 if a file gets moved in a different subdirectory.
+            def get_dir_md5_concat():
+                files = fs.get_all_files(self.path)
+                files.sort(key=lambda f:f.path)
+                md5s = [getattr(f, field) for f in files]
+                return ''.join(md5s)
+            
+            md5 = hashlib.md5(get_dir_md5_concat())
+            digest = md5.digest()
+            setattr(self, field, digest)

se/py/tests/fs_test.py

@@ -0,0 +1,48 @@
+# -*- coding: utf-8 -*-
+# Created By: Virgil Dupras
+# Created On: 2009-10-23
+# $Id$
+# Copyright 2009 Hardcoded Software (http://www.hardcoded.net)
+# 
+# This software is licensed under the "HS" License as described in the "LICENSE" file, 
+# which should be included with this package. The terms are also available at 
+# http://www.hardcoded.net/licenses/hs_license
+
+import hashlib
+
+from nose.tools import eq_
+
+from hsutil.testcase import TestCase
+from dupeguru.fs import File
+from dupeguru.tests.directories_test import create_fake_fs
+
+from .. import fs
+
+class TCBundle(TestCase):
+    def test_size_aggregates_subfiles(self):
+        p = create_fake_fs(self.tmppath())
+        b = fs.Bundle(p)
+        eq_(b.size, 12)
+    
+    def test_md5_aggregate_subfiles_sorted(self):
+        #dir.allfiles can return child in any order. Thus, bundle.md5 must aggregate
+        #all files' md5 it contains, but it must make sure that it does so in the 
+        #same order everytime.
+        p = create_fake_fs(self.tmppath())
+        b = fs.Bundle(p)
+        md5s = File(p + ('dir1', 'file1.test')).md5
+        md5s += File(p + ('dir2', 'file2.test')).md5
+        md5s += File(p + ('dir3', 'file3.test')).md5
+        md5s += File(p + 'file1.test').md5
+        md5s += File(p + 'file2.test').md5
+        md5s += File(p + 'file3.test').md5
+        md5 = hashlib.md5(md5s)
+        eq_(b.md5, md5.digest())
+    
+    def test_has_file_attrs(self):
+        #a Bundle must behave like a file, so it must have ctime and mtime attributes
+        b = fs.Bundle(self.tmppath())
+        assert b.mtime > 0
+        assert b.ctime > 0
+        eq_(b.extension, '')
+