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
"""
-__version__ = "1.0.1"
+__version__ = "1.1.0"
__author__ = "Oleg Broytman <phd@phdru.name>"
-__copyright__ = "Copyright (C) 2010-2012 PhiloSoft Design"
+__copyright__ = "Copyright (C) 2010-2013 PhiloSoft Design"
__license__ = "GPL"
import locale, sys, os
torrent_error('Info absent')
info = torrent['info']
- if 'name' not in info:
+ if 'name' not in info and 'name.utf-8' 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']
+ name_utf8 = info.get('name.utf-8', None)
if 'files' in info:
files = info['files']
paths = []
for file in files:
- if 'path' not in file:
+ if 'path' not in file and 'path.utf-8' not in file:
torrent_error('Unknown path')
if 'length' not in file:
torrent_error('Unknown length')
- path = '/'.join([name] + file['path'])
- if charset and encoding and (charset != encoding):
- path = path.decode(encoding, 'replace').encode(charset, 'replace')
+ if 'path.utf-8' in file:
+ if name_utf8:
+ path = '/'.join([name_utf8] + file['path.utf-8'])
+ if charset and (charset != 'utf-8'):
+ path = path.decode('utf-8', 'replace').encode(charset, 'replace')
+ else:
+ _name_utf8 = name
+ if encoding and (encoding != 'utf-8'):
+ _name_utf8 = _name_utf8.decode(encoding, 'replace').encode('utf-8', 'replace')
+ path = '/'.join([_name_utf8] + file['path.utf-8'])
+ if charset and (charset != 'utf-8'):
+ path = path.decode('utf-8', 'replace').encode(charset, 'replace')
+ else:
+ if name_utf8:
+ path = file['path']
+ if encoding and (encoding != 'utf-8'):
+ path = path.decode(encoding, 'replace').encode('utf-8', 'replace')
+ path = '/'.join([name_utf8] + path)
+ if charset and (charset != 'utf-8'):
+ path = path.decode('utf-8', 'replace').encode(charset, 'replace')
+ else:
+ 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((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):
+ if name_utf8:
+ if charset and (charset != 'utf-8'):
+ name = name_utf8.decode('utf-8', 'replace').encode(charset, 'replace')
+ elif charset and encoding and (charset != encoding):
name = name.decode(encoding, 'replace').encode(charset, 'replace')
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)))
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: