Use comment.utf-8 if available

git-svn-id: file:///home/phd/archive/SVN/mc-extfs/trunk@62 1a6e6372-1aea-0310-bd00-dc960550e1df

diff --git a/torrent b/torrent
index 769d90c3870e75a362e71fd549dedc96df8e836d..cfc1caa4ad0b6e6d7c3f94abe598501023ea6e89 100755 (executable)
--- a/torrent
+++ b/torrent
@@ -124,7 +124,10 @@ def mctorrent_list():
     meta = []
     for name in 'announce', 'announce-list', 'codepage', 'comment', \
                 'created by', 'creation date', 'encoding':
-        if name in torrent:
+        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':
@@ -154,7 +157,10 @@ def mctorrent_copyout():
 
     for name in 'announce', 'announce-list', 'codepage', 'comment', \
                 'created by', 'creation date', 'encoding':
-        if torrent_filename == '.META/' + name:
+        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 == 'announce-list':
                     data = decode_announce_list(torrent[name])