stream.hls: remove --hls-segment-ignore-names command

back-to · back-to · commit 3b8e6ef76d16 · 2020-12-13T11:24:03.000+01:00
It has some downsides such as `--hls-timeout`, Plugin specified FilteredHLSStream should be used instead. streamlink#3187 --- Afreeca Plugin as an Example streamlink#3408 --- Revert streamlink#1432
diff --git a/src/streamlink/stream/hls.py b/src/streamlink/stream/hls.py
@@ -1,5 +1,4 @@
 import logging
-import re
 import struct
 from collections import OrderedDict, defaultdict, namedtuple
 from urllib.parse import urlparse
@@ -40,7 +39,6 @@ def __init__(self, reader, *args, **kwargs):
         kwargs["retries"] = options.get("hls-segment-attempts")
         kwargs["threads"] = options.get("hls-segment-threads")
         kwargs["timeout"] = options.get("hls-segment-timeout")
-        kwargs["ignore_names"] = options.get("hls-segment-ignore-names")
         SegmentedStreamWriter.__init__(self, reader, *args, **kwargs)
 
         self.byterange_offsets = defaultdict(int)
@@ -49,14 +47,6 @@ def __init__(self, reader, *args, **kwargs):
         self.key_uri_override = options.get("hls-segment-key-uri")
         self.stream_data = options.get("hls-segment-stream-data")
 
-        if self.ignore_names:
-            # creates a regex from a list of segment names,
-            # this will be used to ignore segments.
-            self.ignore_names = list(set(self.ignore_names))
-            self.ignore_names = "|".join(list(map(re.escape, self.ignore_names)))
-            self.ignore_names_re = re.compile(r"(?:{blacklist})\.ts".format(
-                blacklist=self.ignore_names), re.IGNORECASE)
-
     def create_decryptor(self, key, sequence):
         if key.method != "AES-128":
             raise StreamError("Unable to decrypt cipher {0}", key.method)
@@ -116,11 +106,6 @@ def fetch(self, sequence, retries=None):
 
         try:
             request_params = self.create_request_params(sequence)
-            # skip ignored segment names
-            if self.ignore_names and self.ignore_names_re.search(sequence.segment.uri):
-                log.debug("Skipping segment {0}".format(sequence.num))
-                return
-
             return self.session.http.get(sequence.segment.uri,
                                          stream=(self.stream_data
                                                  and not sequence.segment.key),
diff --git a/src/streamlink/stream/segmented.py b/src/streamlink/stream/segmented.py
@@ -98,7 +98,7 @@ class SegmentedStreamWriter(Thread):
     and finally writing the data to the buffer.
     """
 
-    def __init__(self, reader, size=20, retries=None, threads=None, timeout=None, ignore_names=None):
+    def __init__(self, reader, size=20, retries=None, threads=None, timeout=None):
         self.closed = False
         self.reader = reader
         self.stream = reader.stream
@@ -115,7 +115,6 @@ def __init__(self, reader, size=20, retries=None, threads=None, timeout=None, ig
 
         self.retries = retries
         self.timeout = timeout
-        self.ignore_names = ignore_names
         self.executor = CompatThreadPoolExecutor(max_workers=threads)
         self.futures = queue.Queue(size)
 
diff --git a/src/streamlink_cli/argparser.py b/src/streamlink_cli/argparser.py
@@ -829,23 +829,6 @@ def build_parser():
 
         Default is 10.0.
         """)
-    transport.add_argument(
-        "--hls-segment-ignore-names",
-        metavar="NAMES",
-        type=comma_list,
-        help="""
-        A comma-delimited list of segment names that will not be fetched.
-
-        Example: --hls-segment-ignore-names 000,001,002
-
-        This will ignore every segment that ends with 000.ts, 001.ts and 002.ts
-
-        Default is None.
-
-        Note: The --hls-timeout must be increased, to a time that is longer than
-        the ignored break.
-        """
-    )
     transport.add_argument(
         "--hls-segment-key-uri",
         metavar="URI",
diff --git a/src/streamlink_cli/main.py b/src/streamlink_cli/main.py
@@ -772,9 +772,6 @@ def setup_options():
     if args.hls_segment_timeout:
         streamlink.set_option("hls-segment-timeout", args.hls_segment_timeout)
 
-    if args.hls_segment_ignore_names:
-        streamlink.set_option("hls-segment-ignore-names", args.hls_segment_ignore_names)
-
     if args.hls_segment_key_uri:
         streamlink.set_option("hls-segment-key-uri", args.hls_segment_key_uri)
 
