X-Git-Url: https://git.phdru.name/?p=extfs.d.git;a=blobdiff_plain;f=torrent;h=43bb2b74dc1b4395b5320e1362e34fcbb9d7b5da;hp=521d10254d4d7faa5e9a2890ba8b95dd72200f0b;hb=c1fd444890ddd1bb30699e88037ff9815e9a10ff;hpb=ee7c2ffa69ef831d2a7a2e8efa4fad66286bbf8f

diff --git a/torrent b/torrent
index 521d102..43bb2b7 100755
--- a/torrent
+++ b/torrent
@@ -13,7 +13,8 @@ executable.
 Run this "cd" command in the Midnight Commander (in the "bindings" file the
 command is "%cd"): cd file#torrent, where "file" is the name of your torrent
 metafile. The VFS lists all files and directories from the torrent metafile;
-all files appear empty, of course, but the sizes are shown.
+all files appear empty, of course, but the sizes are shown. Filenames are
+reencoded from the metafile's encoding to the current locale.
 
 Along with the files/directories in the torrent metafile the VFS also presents
 meta information - in the form of files in .META directory. The size and
@@ -22,7 +23,7 @@ metafile. The VFS doesn't check if the torrent contains .META file or directory
 (quite unlikely).
 
 Date/time for all files is set at midnight of the 1st January of the current
-year. The filesystem is read-only, of course.
+year. The filesystem is, naturally, read-only.
 
 """
 
@@ -34,7 +35,6 @@ __copyright__ = "Copyright (C) 2010 PhiloSoft Design"
 __license__ = "GPL"
 
 import locale, sys, os
-from tempfile import _candidate_tempdir_list
 from eff_bdecode import decode
 
 import logging
@@ -56,28 +56,6 @@ For more information read the source!""",
     sys.exit(1)
 
 
-tempdirlist = _candidate_tempdir_list()
-tempdirlist.insert(0, os.path.abspath(os.path.dirname(sys.argv[2])))
-
-found = False
-for tempdir in tempdirlist:
-    try:
-        logfile_name = os.path.join(tempdir, 'torrent-mcextfs.log')
-        logfile = open(logfile_name, 'w')
-    except IOError:
-        pass
-    else:
-        found = True
-        logfile.close()
-        break
-
-if not found:
-    logger.critical("Cannot initialize error log file in directories %s" % str(tempdirlist))
-    sys.exit(1)
-
-logger.removeHandler(log_err_handler)
-logger.addHandler(logging.FileHandler(logfile_name))
-
 locale.setlocale(locale.LC_ALL, '')
 charset = locale.getpreferredencoding()
 
@@ -93,6 +71,8 @@ def mctorrent_list():
         torrent_error('Unknown name')
 
     name = info['name']
+    encoding = torrent.get('encoding', None)
+
     if 'files' in info:
         files = info['files']
         paths = []
@@ -101,13 +81,17 @@ def mctorrent_list():
                 torrent_error('Unknown path')
             if 'length' not in file:
                 torrent_error('Unknown length')
-            path = file['path']
+            path = '/'.join([name] + file['path'])
+            if charset and encoding and (charset != encoding):
+                path = path.decode(encoding, 'replace').encode(charset, 'replace')
             length = file['length']
-            paths.append(('/'.join([name] + path), length))
+            paths.append((path, length))
     else: # One-file torrent
         if 'length' not in info:
             torrent_error('Unknown length')
         length = info['length']
+        if charset and encoding and (charset != encoding):
+            name = name.decode(encoding, 'replace').encode(charset, 'replace')
         paths = [(name, length)]
 
     meta = []
@@ -125,6 +109,9 @@ def mctorrent_list():
     if 'private' in info:
         meta.append(('.META/private', 1))
 
+    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)
 
@@ -150,13 +137,17 @@ def mctorrent_copyout():
                 torrent_error('Unknown ' + name)
             break
 
-    if torrent_filename == '.META/private':
+    if torrent_filename in ('.META/private', '.META/piece length'):
         if 'info' not in torrent:
             torrent_error('Info absent')
         info = torrent['info']
-        if 'private' not in info:
-            torrent_error('Info absent')
-        data = str(info['private'])
+        if torrent_filename == '.META/private':
+            if 'private' not in info:
+                torrent_error('Info absent')
+        if torrent_filename == '.META/piece length':
+            if 'piece length' not in info:
+                torrent_error('Info absent')
+        data = str(info[torrent_filename[len('.META/'):]])
 
     if not torrent_filename.startswith('.META/'):
         data = ''
@@ -171,17 +162,17 @@ def mctorrent_copyout():
 
 def mctorrent_copyin():
     """Put a file to the VFS"""
-    sys.exit("Torrent VFS doesn't support adding files")
+    sys.exit("Torrent VFS doesn't support adding files (read-only filesystem)")
 
 def mctorrent_rm():
     """Remove a file from the VFS"""
-    sys.exit("Torrent VFS doesn't support removing files/directories")
+    sys.exit("Torrent VFS doesn't support removing files/directories (read-only filesystem)")
 
 mctorrent_rmdir = mctorrent_rm
 
 def mctorrent_mkdir():
     """Create a directory in the VFS"""
-    sys.exit("Torrent VFS doesn't support creating directories")
+    sys.exit("Torrent VFS doesn't support creating directories (read-only filesystem)")
 
 
 def torrent_error(error_str):