XML VFS: version 1.1.5

[extfs.d.git] / xml

diff --git a/xml b/xml
index de468c654682d53272ee7d4b5ce033b9391ada6e..f7dc718b71f1e08f08a7c66c08012e3c09018066 100755 (executable)
--- a/xml
+++ b/xml
@@ -14,16 +14,17 @@ file the command is "%cd"): cd file/xml://; in older versions it is
 cd file#xml, where "file" is the name of your XML file.
 
 See detailed installation instructions at
-http://phdru.name/Software/mc/INSTALL.html.
+http://phdru.name/Software/mc/xml_INSTALL.html.
 
 The VFS represents tags as directories; the directories are numbered to
 distinguish tags with the same name; numbering also helps to sort tags by their
-order in XML instead of sorting them by name. Attributes, text nodes and
-comments are represented as text files; attributes are shown in a file named
-"attributes", attributes are listed in the file as name=value lines (I
-deliberately ignore a small chance of newline characters in values); names and
-values are reencoded to the console encoding. Text nodes and comments are
-collected in a file named "text", stripped and reencoded. The filesystem is
+order in XML instead of sorting them by name and prevents name clash when tag
+names coincide with the names of special files used by XML VFS. Attributes,
+text nodes and comments are represented as text files; attributes are shown in
+a file named "attributes", attributes are listed in the file as name=value
+lines (I deliberately ignore a small chance of newline characters in values);
+names and values are reencoded to the console encoding. Text nodes and comments
+are collected in a file named "text", stripped and reencoded. The filesystem is
 read-only.
 
 Implementation based on minidom doesn't understand namespaces, it just shows
@@ -40,9 +41,9 @@ The VFS was inspired by a FUSE xmlfs: https://github.com/halhen/xmlfs
 
 """
 
-__version__ = "1.1.1"
+__version__ = "1.1.5"
 __author__ = "Oleg Broytman <phd@phdru.name>"
-__copyright__ = "Copyright (C) 2013, 2014 PhiloSoft Design"
+__copyright__ = "Copyright (C) 2013-2015 PhiloSoft Design"
 __license__ = "GPL"
 
 force_implementation = None  # Can be None for default choice,
@@ -53,7 +54,9 @@ use_elementtree = False
 use_lxml = False
 
 import math
+from os.path import getmtime
 import sys
+from time import localtime
 import xml.dom.minidom
 
 try:
@@ -123,12 +126,18 @@ class XmlVfs(object):
     supports_namespaces = False
 
     def __init__(self):
+        self.xml_file = sys.argv[2]
         self.parse()
 
     def list(self):
+        Y, m, d, H, M = localtime(getmtime(self.xml_file))[0:5]
+        self.xml_file_dt = "%02d-%02d-%d %02d:%02d" % (m, d, Y, H, M)
+
         root_comments = self.get_root_comments()
         if root_comments:
-            print "-r--r--r-- 1 user group %d Jan 1 00:00 text" % (len(root_comments))
+            print "-r--r--r-- 1 user group %d %s text" % (
+                len(root_comments), self.xml_file_dt)
+
         self._list(self.getroot())
 
     def _list(self, node, path=''):
@@ -149,19 +158,20 @@ class XmlVfs(object):
             else:
                 subpath = '%s %s' % (template % n, tag)
             subpath_encoded = subpath.encode(default_encoding, "replace")
-            print "dr-xr-xr-x 1 user group 0 Jan 1 00:00 %s" % subpath_encoded
+            print "dr-xr-xr-x 1 user group 0 %s %s" % (
+                self.xml_file_dt, subpath_encoded)
             if self.getattrs(element):
                 attr_text = self.attrs2text(element)
-                print "-r--r--r-- 1 user group %d Jan 1 00:00 %s/attributes" % (
-                    len(attr_text), subpath_encoded)
+                print "-r--r--r-- 1 user group %d %s %s/attributes" % (
+                    len(attr_text), self.xml_file_dt, subpath_encoded)
             if self.supports_namespaces and self.has_ns(element):
                 ns_text = self.ns2text(element)
-                print "-r--r--r-- 1 user group %d Jan 1 00:00 %s/namespaces" % (
-                    len(ns_text), subpath_encoded)
+                print "-r--r--r-- 1 user group %d %s %s/namespaces" % (
+                    len(ns_text), self.xml_file_dt, subpath_encoded)
             text = self.collect_text(element)
             if text:
-                print "-r--r--r-- 1 user group %d Jan 1 00:00 %s/text" % (
-                    len(text), subpath_encoded)
+                print "-r--r--r-- 1 user group %d %s %s/text" % (
+                    len(text), self.xml_file_dt, subpath_encoded)
             self._list(element, subpath)
 
     def get_tag_node(self, node, i):
@@ -187,7 +197,7 @@ class XmlVfs(object):
 
 class MiniDOMXmlVfs(XmlVfs):
     def parse(self):
-        self.document = xml.dom.minidom.parse(sys.argv[2])
+        self.document = xml.dom.minidom.parse(self.xml_file)
 
     def getattrs(self, node):
         attrs = node.attributes
@@ -284,7 +294,7 @@ if use_elementtree:
                     self._target.data(target + " " + data)
                     self._target.end(ET.PI)
 
-            self.document = ET.parse(sys.argv[2], PIParser())
+            self.document = ET.parse(self.xml_file, PIParser())
 
         def getroot(self):
             return self.document.getroot()
@@ -308,7 +318,7 @@ if use_lxml:
         supports_namespaces = True
 
         def parse(self):
-            self.document = etree.parse(sys.argv[2])
+            self.document = etree.parse(self.xml_file)
 
         def getroot(self):
             return [self.document.getroot()]
@@ -339,8 +349,10 @@ if use_lxml:
         def ns2text(self, node):
             ns_accumulator = []
             for name, value in self._get_local_ns(node).items():
-                if name is None: name = ''
-                name = name.encode(default_encoding, "replace")
+                if name:
+                    name = name.encode(default_encoding, "replace")
+                else:
+                    name = 'xmlns'
                 value = value.encode(default_encoding, "replace")
                 ns_accumulator.append("%s=%s" % (name, value))
             return '\n'.join(ns_accumulator)