X-Git-Url: https://git.phdru.name/?p=extfs.d.git;a=blobdiff_plain;f=torrent;h=547236eecb6415a8a7b9aff70695174cb81f4497;hp=712a653be9948ecf56d81c9797f70dbd7dc611c7;hb=c5c4da7de52a81e0a4a58ad2753d379d6bb0c4c5;hpb=8a9eba16c0a20cdab62252b8c0d3408969f97768

diff --git a/torrent b/torrent
index 712a653..547236e 100755
--- a/torrent
+++ b/torrent
@@ -1,14 +1,14 @@
 #! /usr/bin/env python
-
 """Torrent Virtual FileSystem for Midnight Commander
 
 The script requires Midnight Commander 3.1+
 (http://www.midnight-commander.org/), Python 2.4+ (http://www.python.org/),
 module eff_bdecode.py (http://effbot.org/zone/bencode.htm).
 
-Put the script in the /usr/[local/][lib|share]/mc/extfs/, and add a line
-"torrent" to the /usr/[local/][lib|share]/mc/extfs/extfs.ini. Make the script
-executable.
+For mc 4.7+ put the script in $HOME/.mc/extfs.d.
+For older versions put it in /usr/[local/][lib|share]/mc/extfs
+and add a line "torrent" 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#torrent, where "file" is the name of your torrent
@@ -19,19 +19,17 @@ 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
 contents of these files are taken from the corresponding fields in the torrent
-metafile. The VFS doesn't check if the torrent contains .META file or directory
-(quite unlikely).
+metafile. The script doesn't check if the torrent consists of a .META file or
+directory (quite unlikely).
 
-Date/time for all files is set at midnight of the 1st January of the current
+Date/time for all files is set to midnight of the 1st January of the current
 year. The filesystem is, naturally, read-only.
 
 """
 
-__version__ = "1.0.0"
-__revision__ = "$Id$"
-__date__ = "$Date$"
-__author__ = "Oleg Broytman <phd@phd.pp.ru>"
-__copyright__ = "Copyright (C) 2010 PhiloSoft Design"
+__version__ = "1.0.1"
+__author__ = "Oleg Broytman <phd@phdru.name>"
+__copyright__ = "Copyright (C) 2010-2012 PhiloSoft Design"
 __license__ = "GPL"
 
 import locale, sys, os
@@ -71,10 +69,11 @@ def mctorrent_list():
         torrent_error('Unknown name')
 
     name = info['name']
+    encoding = torrent.get('encoding', None)
+
     if 'files' in info:
         files = info['files']
         paths = []
-        encoding = torrent.get('encoding', None)
         for file in files:
             if 'path' not in file:
                 torrent_error('Unknown path')
@@ -89,6 +88,8 @@ def mctorrent_list():
         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 = []
@@ -159,17 +160,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):