aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordirkf <fieldhouse@gmx.net>2023-04-05 18:29:24 +0100
committerdirkf <fieldhouse@gmx.net>2023-04-05 18:55:41 +0100
commit557dbac173c30a51acd284b46f2d5460e539f51a (patch)
tree9be507f7e19046d4fcffd612759e543262bbf5ef
parentcdf40b6aa651d949ce01e9bec1a11f792e8af899 (diff)
[FragmentFD] Fix iteration with infinite limit
* fixes ytdl-org/youtube-dl/baa6c5e * resolves #31885
-rw-r--r--youtube_dl/downloader/dash.py22
1 files changed, 11 insertions, 11 deletions
diff --git a/youtube_dl/downloader/dash.py b/youtube_dl/downloader/dash.py
index cc30485f8..67a8e173f 100644
--- a/youtube_dl/downloader/dash.py
+++ b/youtube_dl/downloader/dash.py
@@ -1,5 +1,7 @@
from __future__ import unicode_literals
+import itertools
+
from .fragment import FragmentFD
from ..compat import compat_urllib_error
from ..utils import (
@@ -30,15 +32,13 @@ class DashSegmentsFD(FragmentFD):
fragment_retries = self.params.get('fragment_retries', 0)
skip_unavailable_fragments = self.params.get('skip_unavailable_fragments', True)
- frag_index = 0
- for i, fragment in enumerate(fragments):
- frag_index += 1
+ for frag_index, fragment in enumerate(fragments, 1):
if frag_index <= ctx['fragment_index']:
continue
# In DASH, the first segment contains necessary headers to
# generate a valid MP4 file, so always abort for the first segment
- fatal = i == 0 or not skip_unavailable_fragments
- for count in range(fragment_retries + 1):
+ fatal = frag_index == 1 or not skip_unavailable_fragments
+ for count in itertools.count():
try:
fragment_url = fragment.get('url')
if not fragment_url:
@@ -48,7 +48,6 @@ class DashSegmentsFD(FragmentFD):
if not success:
return False
self._append_fragment(ctx, frag_content)
- break
except compat_urllib_error.HTTPError as err:
# YouTube may often return 404 HTTP error for a fragment causing the
# whole download to fail. However if the same fragment is immediately
@@ -58,13 +57,14 @@ class DashSegmentsFD(FragmentFD):
# HTTP error.
if count < fragment_retries:
self.report_retry_fragment(err, frag_index, count + 1, fragment_retries)
+ continue
except DownloadError:
# Don't retry fragment if error occurred during HTTP downloading
- # itself since it has own retry settings
- if not fatal:
- self.report_skip_fragment(frag_index)
- break
- raise
+ # itself since it has its own retry settings
+ if fatal:
+ raise
+ self.report_skip_fragment(frag_index)
+ break
if count >= fragment_retries:
if not fatal: