BF: Update btreannounce to correctly set announce-list

effigies · Aug 6, 2016 · d4e42fb · d4e42fb
1 parent 969c3a3
commit d4e42fb
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 12 deletions.
diff --git a/BitTornado/Application/reannounce.py b/BitTornado/Application/reannounce.py
@@ -15,14 +15,13 @@ def reannounce(fname, announce, announce_list=None, verbose=False):
 
     metainfo['announce'] = announce
 
-    if 'announce-list' in metainfo:
-        if verbose:
-            print('old announce-list for {}: {}'.format(
-                fname, '|'.join(','.join(tier)
-                                for tier in metainfo['announce-list'])))
-        if announce_list is not None:
-            metainfo['announce-list'] = announce_list
-        else:
-            metainfo.pop('announce-list', None)
+    if 'announce-list' in metainfo and verbose:
+        print('old announce-list for {}: {}'.format(
+              fname, '|'.join(','.join(tier)
+                              for tier in metainfo['announce-list'])))
+    if announce_list is not None:
+        metainfo['announce-list'] = announce_list
+    else:
+        metainfo.pop('announce-list', None)
 
     metainfo.write(fname)
diff --git a/btreannounce.py b/btreannounce.py
@@ -25,8 +25,8 @@ def main(argv):
                         for l in announcelist_details.split('\n')[:-2])))
 
     try:
-        opts, args = getopt.getopt(argv[1:], "hav",
-                                   ("help", "announce_list", "verbose"))
+        opts, args = getopt.getopt(argv[1:], "ha:v",
+                                   ("help", "announce_list=", "verbose"))
     except getopt.error as msg:
         print(msg)
         return 1
@@ -44,7 +44,7 @@ def main(argv):
             print(helpmsg)
             return 0
         elif opt in ('-a', '--announce_list'):
-            announce_list = [tier.split(',') for tier in arg.split('|')]
+            announce_list = arg
         elif opt in ('-v', '--verbose'):
             verbose = True