Git-Mirrors/brozzler
1
0
Fork 0
mirror of https://github.com/internetarchive/brozzler.git synced 2025-02-25 00:59:52 -05:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

fix merge errors

Browse Source
This commit is contained in:
Barbara Miller 2024-04-04 16:31:14 -07:00
parent 5b3a1f668e
commit cd071ed907
2 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
brozzler/worker.py
View File

@ -252,7 +252,7 @@ class BrozzlerWorker:
except brozzler.PageInterstitialShown: except brozzler.PageInterstitialShown:
self.logger.info("page interstitial shown (http auth): %s", page) 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: try:
ydl_outlinks = ydl.do_youtube_dl(self, site, page) ydl_outlinks = ydl.do_youtube_dl(self, site, page)
except brozzler.ReachedLimit as e: except brozzler.ReachedLimit as e:

10
brozzler/ydl.py
View File

@ -47,16 +47,6 @@ def is_html_maybe(url):
return True 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): def _timestamp4datetime(timestamp):
"""split `timestamp` into a tuple of 6 integers. """split `timestamp` into a tuple of 6 integers.