mirror of
https://github.com/internetarchive/brozzler.git
synced 2025-08-07 05:52:27 -04:00
Merge branch 'predup_type_playlist' into qa
This commit is contained in:
commit
0bf6e5b2a1
1 changed files with 5 additions and 8 deletions
|
@ -76,9 +76,6 @@ class VideoCaptureRecord:
|
||||||
|
|
||||||
|
|
||||||
class VideoDataClient:
|
class VideoDataClient:
|
||||||
import psycopg
|
|
||||||
from psycopg_pool import ConnectionPool, PoolTimeout
|
|
||||||
|
|
||||||
VIDEO_DATA_SOURCE = os.getenv("VIDEO_DATA_SOURCE")
|
VIDEO_DATA_SOURCE = os.getenv("VIDEO_DATA_SOURCE")
|
||||||
|
|
||||||
def __init__(self):
|
def __init__(self):
|
||||||
|
@ -165,9 +162,9 @@ class VideoDataClient:
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
try:
|
try:
|
||||||
results = self._execute_pg_query(
|
results = [
|
||||||
pg_query, row_factory=psycopg.rows.scalar_row, fetchall=True
|
row[0] for row in self._execute_pg_query(pg_query, fetchall=True)
|
||||||
)
|
]
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
logger.warn("postgres query failed: %s", e)
|
logger.warn("postgres query failed: %s", e)
|
||||||
results = []
|
results = []
|
||||||
|
@ -666,8 +663,8 @@ def do_youtube_dl(worker, site, page, ytdlp_proxy_endpoints):
|
||||||
)
|
)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
logger.warning("hit exception processing worker._video_data: %s", e)
|
logger.warning("hit exception processing worker._video_data: %s", e)
|
||||||
if uncaptured_youtube_watch_pages:
|
if uncaptured_watch_pages:
|
||||||
outlinks.update(uncaptured_youtube_watch_pages)
|
outlinks.update(uncaptured_watch_pages)
|
||||||
else:
|
else:
|
||||||
outlinks = {
|
outlinks = {
|
||||||
"https://www.youtube.com/watch?v=%s" % e["id"]
|
"https://www.youtube.com/watch?v=%s" % e["id"]
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue