X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;ds=inline;f=xml;h=9fee4d765ed7867b7906b8161b1793ce55a21168;hb=b00d26d30668a759beb743101c30e8d3963470af;hp=1c98c86fbc6a97ed0bd7a1d5ecd074736757d85f;hpb=2782d4a3a8ed6f10f461935136e0ba7f2d998064;p=extfs.d.git

diff --git a/xml b/xml
index 1c98c86..9fee4d7 100755
--- a/xml
+++ b/xml
@@ -4,28 +4,35 @@
 The script requires Midnight Commander 3.1+
 (http://www.midnight-commander.org/), Python 2.4+ (http://www.python.org/).
 
-For mc 4.7+ put the script in $HOME/.mc/extfs.d.
+For mc 4.7+ put the script in $HOME/[.local/share/].mc/extfs.d.
 For older versions put it in /usr/[local/][lib|share]/mc/extfs
 and add a line "xml" to the /usr/[local/][lib|share]/mc/extfs/extfs.ini.
 Make the script executable.
 
-Run this "cd" command in the Midnight Commander (in the "bindings" file the
-command is "%cd"): cd file.xml#xml, where "file.xml" is the name of your xml
-file.
+For mc 4.7+ run this "cd" command in the Midnight Commander (in the "bindings"
+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.
 
 The VFS represents tags as directories; the directories are numbered to
 distinguish tags with the same name; also numbering 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 there is a newline character in values). The
-filesystem is read-only.
+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.
+
+It is useful to have a top-down view on an XML structure but it's especially
+convenient to extract text values from tags. One can get, for example, a
+base64-encoded image - just walk down the VFS to the tag's directory and copy
+its text file to a real file.
 
 The VFS was inspired by a FUSE xmlfs: https://github.com/halhen/xmlfs
 
 """
 
-__version__ = "0.2.0"
+__version__ = "0.3.0"
 __author__ = "Oleg Broytman <phd@phdru.name>"
 __copyright__ = "Copyright (C) 2013 PhiloSoft Design"
 __license__ = "GPL"
@@ -71,7 +78,7 @@ XML Virtual FileSystem for Midnight Commander version %s
 Author: %s
 %s
 
-This is not a program. Put the script in $HOME/.mc/extfs.d or
+This is not a program. Put the script in $HOME/[.local/share/].mc/extfs.d or
 /usr/[local/][lib|share]/mc/extfs. For more information read the source!""",
    __version__, __author__, __copyright__
 )
@@ -87,6 +94,20 @@ def _attrs2text(attrs):
         a.value.encode(default_encoding, "replace"))
         for a in attrs])
 
+def _collect_text(node):
+    text_accumulator = []
+    for element in node.childNodes:
+        if element.localName:
+            continue
+        elif element.nodeType == element.COMMENT_NODE:
+            text = u"<!--%s-->" % element.nodeValue
+        elif element.nodeType == element.TEXT_NODE:
+            text = element.nodeValue.strip()
+        else:
+            xml_error("Unknown node type %d" % element.nodeType)
+        if text: text_accumulator.append(text)
+    return '\n'.join(text_accumulator).encode(default_encoding, "replace")
+
 def _list(node, path=''):
     childNodes = node.childNodes
     n = 0
@@ -114,6 +135,11 @@ def _list(node, path=''):
                 print "-r--r--r-- 1 user group %d Jan 1 00:00 %s/attributes" % (
                     len(attr_text), subpath_encoded)
             _list(element, subpath)
+    if path:
+        text = _collect_text(node)
+        if text:
+            print "-r--r--r-- 1 user group %d Jan 1 00:00 %s/text" % (
+                len(text), path.encode(default_encoding, "replace"))
 
 def mcxml_list():
     """List the entire VFS"""
@@ -142,7 +168,7 @@ def mcxml_copyout():
         if ' ' in path_comp:
             i = int(path_comp.split(' ', 1)[0])
             node = _get_child_node(node, i)
-        elif path_comp == 'attributes':
+        elif path_comp in ('attributes', 'text'):
             break
         else:
             xml_error('Unknown file')
@@ -154,6 +180,9 @@ def mcxml_copyout():
         else:
             xml_error('There are no attributes')
 
+    if path_comp == 'text':
+        text = _collect_text(node)
+
     outfile = open(real_filename, 'w')
     outfile.write(text)
     outfile.close()