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

diff --git a/torrent b/torrent
index 08a051e..769d90c 100755
--- a/torrent
+++ b/torrent
@@ -65,7 +65,7 @@ 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')
 
     codepage = torrent.get('codepage', None)
@@ -74,25 +74,50 @@ def mctorrent_list():
         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)]
 
@@ -101,7 +126,7 @@ def mctorrent_list():
                 'created by', 'creation date', 'encoding':
         if name in torrent:
             if name == 'announce-list':
-                data = decode_list(torrent[name])
+                data = decode_announce_list(torrent[name])
             elif name == 'codepage':
                 data = str(torrent[name])
             elif name == 'creation date':
@@ -132,7 +157,7 @@ def mctorrent_copyout():
         if torrent_filename == '.META/' + name:
             if name in torrent:
                 if name == 'announce-list':
-                    data = decode_list(torrent[name])
+                    data = decode_announce_list(torrent[name])
                 elif name == 'codepage':
                     data = str(torrent[name])
                 elif name == 'creation date':
@@ -201,7 +226,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)