X-Git-Url: https://git.phdru.name/?p=extfs.d.git;a=blobdiff_plain;f=torrent;h=b0d1e00908e1636c97a605ef28dc6f6810231bfe;hp=347df41463fd784796cb2a74edbaa05247ec5d22;hb=00a366effbc6bdf9784b5db07b1c693b622836e5;hpb=1e7bf9bd5f2200b74650067361b6fd9cea6097d9 diff --git a/torrent b/torrent index 347df41..b0d1e00 100755 --- a/torrent +++ b/torrent @@ -5,16 +5,17 @@ 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). -For mc 4.7+ put the script in $HOME/.mc/extfs.d. +For mc 4.7+ just put the script in $HOME/[.local/share/].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/codepage to the current locale. +For mc 4.7+ run this "cd" command in the Midnight Commander (in the "bindings" +file the command is "%cd"): cd file/torrent://; In older versions it is +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/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 @@ -27,14 +28,40 @@ year. The filesystem is, naturally, read-only. """ -__version__ = "1.1.0" +__version__ = "1.2.1" __author__ = "Oleg Broytman " __copyright__ = "Copyright (C) 2010-2013 PhiloSoft Design" __license__ = "GPL" -import locale, sys, os + +import sys from eff_bdecode import decode +try: + import locale + use_locale = True +except ImportError: + use_locale = False + +if use_locale: + # Get the default charset. + try: + lcAll = locale.getdefaultlocale() + except locale.Error, err: + print >>sys.stderr, "WARNING:", err + lcAll = [] + + if len(lcAll) == 2: + default_encoding = lcAll[1] + else: + try: + default_encoding = locale.getpreferredencoding() + except locale.Error, err: + print >>sys.stderr, "WARNING:", err + default_encoding = sys.getdefaultencoding() +else: + default_encoding = sys.getdefaultencoding() + import logging logger = logging.getLogger('torrent-mcextfs') log_err_handler = logging.StreamHandler(sys.stderr) @@ -47,15 +74,13 @@ 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/[.local/share/].mc/extfs.d or +/usr/[local/][lib|share]/mc/extfs. For more information read the source!""", __version__, __author__, __copyright__ ) sys.exit(1) - locale.setlocale(locale.LC_ALL, '') -charset = locale.getpreferredencoding() def mctorrent_list(): @@ -87,38 +112,38 @@ def mctorrent_list(): 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') + if default_encoding != 'utf-8': + path = path.decode('utf-8', 'replace').encode(default_encoding, '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') + if default_encoding != 'utf-8': + path = path.decode('utf-8', 'replace').encode(default_encoding, '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') + if default_encoding != 'utf-8': + path = path.decode('utf-8', 'replace').encode(default_encoding, 'replace') else: path = '/'.join([name] + file['path']) - if charset and encoding and (charset != encoding): - path = path.decode(encoding, 'replace').encode(charset, 'replace') + if encoding and (default_encoding != encoding): + path = path.decode(encoding, 'replace').encode(default_encoding, 'replace') length = file['length'] paths.append((path, length)) - else: # One-file torrent + else: # One-file torrent if 'length' not in info: torrent_error('Unknown length') length = info['length'] 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') + if default_encoding != 'utf-8': + name = name_utf8.decode('utf-8', 'replace').encode(default_encoding, 'replace') + elif encoding and (default_encoding != encoding): + name = name.decode(encoding, 'replace').encode(default_encoding, 'replace') paths = [(name, length)] meta = [] @@ -126,7 +151,7 @@ def mctorrent_list(): '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') + data = torrent['comment.utf-8'].decode('utf-8').encode(default_encoding, 'replace') meta.append(('.META/' + name, len(data))) elif name in torrent: if name == 'announce-list': @@ -163,8 +188,7 @@ def mctorrent_copyout(): '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))) + data = torrent['comment.utf-8'].decode('utf-8').encode(default_encoding, 'replace') elif torrent_filename == '.META/' + name: if name in torrent: if name == 'announce-list':