decode_list => decode_announce_list

[extfs.d.git] / torrent

diff --git a/torrent b/torrent
index 309aada9421ffa9b9f7605c6e84c1945fba78a2b..769d90c3870e75a362e71fd549dedc96df8e836d 100755 (executable)
--- a/torrent
+++ b/torrent
@@ -65,7 +65,7 @@ def mctorrent_list():
         torrent_error('Info absent')
 
     info = torrent['info']
-    if 'name' not in info or 'name.utf-8' not in info:
+    if 'name' not in info and 'name.utf-8' not in info:
         torrent_error('Unknown name')
 
     codepage = torrent.get('codepage', None)
@@ -80,7 +80,7 @@ def mctorrent_list():
         files = info['files']
         paths = []
         for file in files:
-            if 'path' not in file or 'path.utf-8' 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')
@@ -126,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':
@@ -157,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':
@@ -226,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)