Git-Mirrors/brozzler
1
0
Fork 0
mirror of https://github.com/internetarchive/brozzler.git synced 2025-08-05 21:14:13 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

query_tuple, check result for None

Browse source
This commit is contained in:
Barbara Miller 2025-07-28 18:31:01 -07:00
parent e8dc41ca30
commit 0bd13a627e
1 changed files with 12 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

21
brozzler/ydl.py
View file

@ -87,16 +87,14 @@ class VideoDataClient:
self.pool = pool self.pool = pool
def _execute_pg_query( def _execute_pg_query(
self, query: str, row_factory=None, fetchone=False, fetchall=False self, query_tuple, row_factory=None, fetchall=False
) -> Optional[Any]: ) -> Optional[Any]:
query_str, params = query_tuple
try: try:
with self.pool.connection() as conn: with self.pool.connection() as conn:
with conn.cursor(row_factory=row_factory) as cur: with conn.cursor(row_factory=row_factory) as cur:
cur.execute(query) cur.execute(query_str, params)
if fetchone: return cur.fetchall() if fetchall else cur.fetchone()
return cur.fetchone()
if fetchall:
return cur.fetchall()
except PoolTimeout as e: except PoolTimeout as e:
logger.warn("hit PoolTimeout: %s", e) logger.warn("hit PoolTimeout: %s", e)
self.pool.check() self.pool.check()
@ -162,9 +160,14 @@ class VideoDataClient:
), ),
) )
try: try:
results = [ result = self._execute_pg_query(pg_query, fetchall=True)
row[0] for row in self._execute_pg_query(pg_query, fetchall=True) if result:
] results = [
row[0]
for row in self._execute_pg_query(pg_query, fetchall=True)
]
else:
results = None
except Exception as e: except Exception as e:
logger.warn("postgres query failed: %s", e) logger.warn("postgres query failed: %s", e)
results = [] results = []