X-Git-Url: https://git.phdru.name/?p=extfs.d.git;a=blobdiff_plain;f=torrent;h=7a45d160741a9cf8087366b88dad116aade81edb;hp=ed622a3c4283110d9a14e80af2b2a97425b00435;hb=18cbb33a2e75181a374652f50a43387fb61bab22;hpb=b2b07db4559a9fb29a498bc9f5817812727d435d

diff --git a/torrent b/torrent
index ed622a3..7a45d16 100755
--- a/torrent
+++ b/torrent
@@ -15,7 +15,7 @@ file the command is "%cd"): cd file/torrent://; In older versions it is
 cd file#torrent, where "file" is the name of your torrent metafile.
 
 See detailed installation instructions at
-http://phdru.name/Software/mc/INSTALL.html.
+http://phdru.name/Software/mc/torrent_INSTALL.html.
 
 The VFS lists all files and directories from the torrent metafile; all files
 appear empty, of course, but the sizes are shown. Filenames are reencoded from
@@ -32,13 +32,15 @@ year. The filesystem is, naturally, read-only.
 
 """
 
-__version__ = "1.2.1"
+__version__ = "1.2.3"
 __author__ = "Oleg Broytman <phd@phdru.name>"
-__copyright__ = "Copyright (C) 2010-2013 PhiloSoft Design"
+__copyright__ = "Copyright (C) 2010-2015 PhiloSoft Design"
 __license__ = "GPL"
 
 
+from os.path import dirname, getmtime
 import sys
+from time import localtime, asctime
 from eff_bdecode import decode
 
 try:
@@ -105,6 +107,7 @@ def mctorrent_list():
     name = info['name']
     name_utf8 = info.get('name.utf-8', None)
 
+    dt = None
     if 'files' in info:
         files = info['files']
         paths = []
@@ -163,7 +166,9 @@ def mctorrent_list():
             elif name == 'codepage':
                 data = str(torrent[name])
             elif name == 'creation date':
-                data = decode_datetime(torrent[name])
+                dt = torrent[name]
+                data = decode_datetime_asc(dt)
+                dt = decode_datetime(dt)
             elif name == 'nodes':
                 data = ['%s:%s' % (host, port) for host, port in torrent[name]]
                 data = '\n'.join(data)
@@ -177,8 +182,20 @@ def mctorrent_list():
     if 'piece length' in info:
         meta.append(('.META/piece length', len(str(info['piece length']))))
 
-    for name, size in paths + meta:
-        print "-r--r--r-- 1 user group %d Jan 1 00:00 %s" % (size, name)
+    paths += meta
+    dirs = set()
+    for name, size in paths:
+        if '/' in name:
+            dirs.add(dirname(name))
+
+    if not dt:
+        dt = decode_datetime(getmtime(sys.argv[2]))
+
+    for name in sorted(dirs):
+        print "dr-xr-xr-x 1 user group 0 %s %s" % (dt, name)
+
+    for name, size in sorted(paths):
+        print "-r--r--r-- 1 user group %d %s %s" % (size, dt, name)
 
 
 def mctorrent_copyout():
@@ -200,7 +217,7 @@ def mctorrent_copyout():
                 elif name == 'codepage':
                     data = str(torrent[name])
                 elif name == 'creation date':
-                    data = decode_datetime(torrent[name])
+                    data = decode_datetime_asc(torrent[name])
                 elif name == 'nodes':
                     data = ['%s:%s' % (host, port) for host, port in torrent[name]]
                     data = '\n'.join(data)
@@ -262,11 +279,12 @@ def decode_torrent():
         torrent_error(error_str)
 
 
+def decode_datetime_asc(dt):
+    return asctime(localtime(float(dt)))
+
 def decode_datetime(dt):
-    from time import localtime, asctime
-    the_time = float(dt)
-    l_now = localtime(the_time)
-    return asctime(l_now)
+    Y, m, d, H, M = localtime(float(dt))[0:5]
+    return "%02d-%02d-%d %02d:%02d" % (m, d, Y, H, M)
 
 def decode_announce_list(announce):
     return '\n'.join(l[0] for l in announce)