Work in progress

fs/browsewin.py

@@ -5,8 +5,6 @@ import wx.gizmos
 
 import fs
 
-
-
 class BrowseFrame(wx.Frame):
 
     def __init__(self, fs):
@@ -17,10 +15,10 @@ class BrowseFrame(wx.Frame):
         self.SetTitle("FS Browser - "+str(fs))
 
         self.tree = wx.gizmos.TreeListCtrl(self, -1, style=wx.TR_DEFAULT_STYLE | wx.TR_HIDE_ROOT)
-        self.tree.AddColumn("FS", 300)
+        self.tree.AddColumn("FS", 300)        
+        self.tree.AddColumn("Description", 250)
         self.tree.AddColumn("Size", 150)
         self.tree.AddColumn("Created", 250)
-        self.tree.AddColumn("Description", 250)
         self.root_id = self.tree.AddRoot('root', data=wx.TreeItemData( {'path':"/", 'expanded':False} ))
 
         rid = self.tree.GetItemData(self.root_id)
@@ -81,26 +79,26 @@ class BrowseFrame(wx.Frame):
                 self.tree.SetItemImage(new_item, self.fldridx, 0, wx.TreeItemIcon_Normal)
                 self.tree.SetItemImage(new_item, self.fldropenidx, 0, wx.TreeItemIcon_Expanded)
 
-                self.tree.SetItemText(new_item, "", 1)
+                self.tree.SetItemText(new_item, "", 2)
 
                 ct = info.get('created_time', None)
                 if ct is not None:
-                    self.tree.SetItemText(new_item, ct.ctime(), 2)
+                    self.tree.SetItemText(new_item, ct.ctime(), 3)
                 else:
-                    self.tree.SetItemText(new_item, 'unknown', 2)
+                    self.tree.SetItemText(new_item, 'unknown', 3)
 
             else:
                 self.tree.SetItemImage(new_item, self.fileidx, 0, wx.TreeItemIcon_Normal)
 
-                self.tree.SetItemText(new_item, str(info.get('size', '?'))+ " bytes", 1)
+                self.tree.SetItemText(new_item, str(info.get('size', '?'))+ " bytes", 2)
 
                 ct = info.get('created_time', None)
                 if ct is not None:
-                    self.tree.SetItemText(new_item, ct.ctime(), 2)
+                    self.tree.SetItemText(new_item, ct.ctime(), 3)
                 else:
-                    self.tree.SetItemText(new_item, 'unknown', 2)
+                    self.tree.SetItemText(new_item, 'unknown', 3)
                     
-            self.tree.SetItemText(new_item, self.fs.desc(new_path), 3)
+            self.tree.SetItemText(new_item, self.fs.desc(new_path), 1)
 
         item_data['expanded'] = True
         self.tree.Expand(item_id)

fs/fs.py

@@ -218,9 +218,9 @@ class FS(object):
             return "No description available"
         
         if self.isdir(path):
-            return "Dir, maps to %s" % sys_path
+            return "OS dir, maps to %s" % sys_path
         else:
-            return "File, maps to %s" % sys_path
+            return "OS file, maps to %s" % sys_path
 
     def open(self, path, mode="r", buffering=-1, **kwargs):
 

fs/memoryfs.py

@@ -154,7 +154,7 @@ class MemoryFS(FS):
     def __init__(self):
 
         self.dir_entry_factory = MemoryFS.DirEntry
-        self.root = self._make_dir_entry('dir', 'root')
+        self.root = self._make_dir_entry('dir', 'root')        
 
     def __str__(self):
         return "<MemoryFS>"
@@ -178,9 +178,9 @@ class MemoryFS(FS):
     def desc(self, path):
         
         if self.isdir(path):
-            return "Dir in memory"
+            return "Memory dir"
         else:
-            return "File object in memory"
+            return "Memory file object"
 
     def isdir(self, path):
 

fs/multifs.py

@@ -160,8 +160,8 @@ if __name__ == "__main__":
     mem_fs.mkdir('projects/A/B', recursive=True)
 
 
-    mem_fs.open("projects/readme.txt", 'w').write("Hello, World!")
-    mem_fs.open("projects/readme.txt", 'wa').write("\nSecond Line")
+    mem_fs.open("projects/test2/readme.txt", 'w').write("Hello, World!")
+    mem_fs.open("projects/A/readme.txt", 'w').write("\nSecond Line")
     
     multifs = MultiFS()
     multifs.addfs("osfs", osfs)