mirror of
https://github.com/internetarchive/brozzler.git
synced 2025-02-24 16:49:56 -05:00
fix merge errors
This commit is contained in:
parent
5b3a1f668e
commit
cd071ed907
@ -252,7 +252,7 @@ class BrozzlerWorker:
|
||||
except brozzler.PageInterstitialShown:
|
||||
self.logger.info("page interstitial shown (http auth): %s", page)
|
||||
|
||||
if enable_youtube_dl and ydl.should_ytdlp(page):
|
||||
if enable_youtube_dl and ydl.should_ytdlp(page, site):
|
||||
try:
|
||||
ydl_outlinks = ydl.do_youtube_dl(self, site, page)
|
||||
except brozzler.ReachedLimit as e:
|
||||
|
@ -47,16 +47,6 @@ def is_html_maybe(url):
|
||||
return True
|
||||
|
||||
|
||||
def should_ytdlp(page):
|
||||
ytdlp_url = page.redirect_url if page.redirect_url else page.url
|
||||
|
||||
if not is_html_maybe(ytdlp_url):
|
||||
logging.warning("skipping yt-dlp for %s due to unsupported extension", ytdlp_url)
|
||||
return False
|
||||
|
||||
return True
|
||||
|
||||
|
||||
def _timestamp4datetime(timestamp):
|
||||
"""split `timestamp` into a tuple of 6 integers.
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user