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

diff --git a/torrent b/torrent
index 43bb2b7..08a051e 100755
--- a/torrent
+++ b/torrent
@@ -1,37 +1,35 @@
 #! /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
 metafile. 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 the metafile's encoding to the current locale.
+reencoded from the metafile's encoding/codepage 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.1.0"
+__author__ = "Oleg Broytman <phd@phdru.name>"
+__copyright__ = "Copyright (C) 2010-2013 PhiloSoft Design"
 __license__ = "GPL"
 
 import locale, sys, os
@@ -70,8 +68,12 @@ def mctorrent_list():
     if 'name' not in info:
         torrent_error('Unknown name')
 
-    name = info['name']
+    codepage = torrent.get('codepage', None)
     encoding = torrent.get('encoding', None)
+    if not encoding and codepage:
+        encoding = str(codepage)
+
+    name = info['name']
 
     if 'files' in info:
         files = info['files']
@@ -95,13 +97,15 @@ def mctorrent_list():
         paths = [(name, length)]
 
     meta = []
-    for name in 'comment', 'encoding', 'creation date', 'announce-list', \
-            'created by', 'announce':
+    for name in 'announce', 'announce-list', 'codepage', 'comment', \
+                'created by', 'creation date', 'encoding':
         if name in torrent:
-            if name == 'creation date':
-                data = decode_datetime(torrent[name])
-            elif name == 'announce-list':
+            if name == 'announce-list':
                 data = decode_list(torrent[name])
+            elif name == 'codepage':
+                data = str(torrent[name])
+            elif name == 'creation date':
+                data = decode_datetime(torrent[name])
             else:
                 data = torrent[name]
             meta.append(('.META/' + name, len(data)))
@@ -123,14 +127,16 @@ def mctorrent_copyout():
     real_filename = sys.argv[4]
     data = None
 
-    for name in 'comment', 'encoding', 'creation date', 'announce-list', \
-            'created by', 'announce':
+    for name in 'announce', 'announce-list', 'codepage', 'comment', \
+                'created by', 'creation date', 'encoding':
         if torrent_filename == '.META/' + name:
             if name in torrent:
-                if name == 'creation date':
-                    data = decode_datetime(torrent[name])
-                elif name == 'announce-list':
+                if name == 'announce-list':
                     data = decode_list(torrent[name])
+                elif name == 'codepage':
+                    data = str(torrent[name])
+                elif name == 'creation date':
+                    data = decode_datetime(torrent[name])
                 else:
                     data = str(torrent[name])
             else: