diff --git a/FSStorage.py b/FSStorage.py index 0cece5e..ad86a62 100644 --- a/FSStorage.py +++ b/FSStorage.py @@ -121,7 +121,7 @@ def dofileadd(cd, parent, path, name): if klass is None: return - log.msg('matched:', os.path.join(path, name), `i`, `klass`) + #log.msg('matched:', os.path.join(path, name), `i`, `klass`) return cd.addItem(parent, klass, name, **kwargs) class FSDirectory(FSObject, StorageFolder): diff --git a/ZipStorage.py b/ZipStorage.py index 4fdaf92..c68a6a0 100644 --- a/ZipStorage.py +++ b/ZipStorage.py @@ -152,7 +152,6 @@ class ZipItem(Item): return self.zo.checkUpdate() def doUpdate(self): - log.msg('doUpdate:', `self`, self.name) self.res = Resource(self.url, 'http-get:*:%s:*' % self.mimetype) self.res.size = self.zi.file_size Item.doUpdate(self) @@ -202,10 +201,12 @@ class ZipObject(FSObject, StorageFolder): klass, i, zf = self.zip, zo = self, name = i, mimetype = mt) + # sort our children + self.sort(lambda x, y: cmp(x.title, y.title)) + def detectzipfile(path, fobj): try: z = zipfile.ZipFile(fobj) - log.msg(`z`) except: return None, None