support multiple tiers of tracker

torrentfile/cli.py

@@ -280,7 +280,10 @@ def execute(args: List[str] = None) -> List[str]:
         metavar="<url>",
         nargs="+",
         default=[],
-        help="one or more space-seperated tracker url(s)",
+        help="""
+        One or more space-seperated tracker url(s), each will be in its own
+        tier, if a url is prefixed by '+', it will be added to previous tier.
+        """,
     )
 
     create_parser.add_argument(
@@ -443,7 +446,10 @@ def execute(args: List[str] = None) -> List[str]:
         dest="announce",
         metavar="<url>",
         nargs="+",
-        help="replace current trackers with one or more urls",
+        help="""
+        Replace current trackers with one or more urls, each will be in its own
+        tier, if a url is prefixed by '+', it will be added to previous tier.
+        """,
     )
 
     edit_parser.add_argument(

torrentfile/edit.py

@@ -95,12 +95,17 @@ def edit_torrent(metafile: str, args: dict) -> dict:
     if "announce" in args:
         val = args.get("announce", None)
         if isinstance(val, str):
-            vallist = val.split()
-            meta["announce"] = vallist[0]
-            meta["announce-list"] = [vallist]
-        elif isinstance(val, list):
+            val = val.split()
+        if isinstance(val, list):
+            if val[0].startswith("+"):
+                val[0] = val[0][1:]
             meta["announce"] = val[0]
-            meta["announce-list"] = [val]
+            meta["announce-list"] = []
+            for i in val:
+                if i.startswith("+"):
+                    meta["announce-list"][-1].append(i[1:])
+                else:
+                    meta["announce-list"].append([i])
 
     if "url-list" in args:
         val = args.get("url-list")

torrentfile/torrent.py

@@ -322,7 +322,14 @@ def __init__(
             self.announce, self.announce_list = announce, [[announce]]
 
         elif isinstance(announce, Sequence):
-            self.announce, self.announce_list = announce[0], [announce]
+            if announce[0].startswith("+"):
+                announce[0] = announce[0][1:]
+            self.announce, self.announce_list = announce[0], []
+            for i in announce:
+                if i.startswith("+"):
+                    self.announce_list[-1].append(i[1:])
+                else:
+                    self.announce_list.append([i])
 
         self.align = align