X-Git-Url: https://git.phdru.name/?p=extfs.d.git;a=blobdiff_plain;f=torrent;h=ebaa7bf295dbaf3fc7950c331283697e7d81e60d;hp=511a85d891ee67969cdf57929be7e774e5943ce9;hb=f988468cf61fa5f048b4fe281602521271b3293b;hpb=920e521363a2f5b533da7f5639d1fc0928387683 diff --git a/torrent b/torrent index 511a85d..ebaa7bf 100755 --- a/torrent +++ b/torrent @@ -1,5 +1,4 @@ #! /usr/bin/env python - """Torrent Virtual FileSystem for Midnight Commander The script requires Midnight Commander 3.1+ @@ -15,7 +14,7 @@ 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 @@ -28,11 +27,9 @@ year. The filesystem is, naturally, read-only. """ -__version__ = "1.0.0" -__revision__ = "$Id$" -__date__ = "$Date$" +__version__ = "1.1.1" __author__ = "Oleg Broytman " -__copyright__ = "Copyright (C) 2010, 2011 PhiloSoft Design" +__copyright__ = "Copyright (C) 2010-2013 PhiloSoft Design" __license__ = "GPL" import locale, sys, os @@ -50,8 +47,8 @@ Torrent Virtual FileSystem for Midnight Commander version %s Author: %s %s -This is not a program. Put the script in /usr/[local/][lib|share]/mc/extfs. -For more information read the source!""", +This is not a program. Put the script in $HOME/.mc/extfs.d or +/usr/[local/][lib|share]/mc/extfs. For more information read the source!""", __version__, __author__, __copyright__ ) sys.exit(1) @@ -68,41 +65,79 @@ def mctorrent_list(): 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': - if name in torrent: - if name == 'creation date': + for name in 'announce', 'announce-list', 'codepage', 'comment', \ + 'created by', 'creation date', 'encoding', \ + 'nodes', 'publisher', 'publisher-url': + if name == 'comment' and 'comment.utf-8' in torrent: + data = torrent['comment.utf-8'].decode('utf-8').encode(charset, 'replace') + meta.append(('.META/' + name, len(data))) + elif name in torrent: + if name == 'announce-list': + data = decode_announce_list(torrent[name]) + elif name == 'codepage': + data = str(torrent[name]) + elif name == 'creation date': data = decode_datetime(torrent[name]) - elif name == 'announce-list': - data = decode_list(torrent[name]) + elif name == 'nodes': + data = ['%s:%s' % (host, port) for host, port in torrent[name]] + data = '\n'.join(data) else: data = torrent[name] meta.append(('.META/' + name, len(data))) @@ -124,14 +159,23 @@ def mctorrent_copyout(): real_filename = sys.argv[4] data = None - for name in 'comment', 'encoding', 'creation date', 'announce-list', \ - 'created by', 'announce': - if torrent_filename == '.META/' + name: + for name in 'announce', 'announce-list', 'codepage', 'comment', \ + 'created by', 'creation date', 'encoding', \ + 'nodes', 'publisher', 'publisher-url': + if name == 'comment' and 'comment.utf-8' in torrent: + data = torrent['comment.utf-8'].decode('utf-8').encode(charset, 'replace') + meta.append(('.META/' + name, len(data))) + elif torrent_filename == '.META/' + name: if name in torrent: - if name == 'creation date': + if name == 'announce-list': + data = decode_announce_list(torrent[name]) + elif name == 'codepage': + data = str(torrent[name]) + elif name == 'creation date': data = decode_datetime(torrent[name]) - elif name == 'announce-list': - data = decode_list(torrent[name]) + elif name == 'nodes': + data = ['%s:%s' % (host, port) for host, port in torrent[name]] + data = '\n'.join(data) else: data = str(torrent[name]) else: @@ -196,7 +240,7 @@ def decode_datetime(dt): l_now = localtime(the_time) return asctime(l_now) -def decode_list(announce): +def decode_announce_list(announce): return '\n'.join(l[0] for l in announce)