Commit 87d78acf authored by Glandos's avatar Glandos
Browse files

try to remove nul byte in name

parent 35d24426
...@@ -211,15 +211,22 @@ class Merger: ...@@ -211,15 +211,22 @@ class Merger:
self, torrents: List[dict] self, torrents: List[dict]
) -> Dict[Union["inserted", "failed"], int]: ) -> Dict[Union["inserted", "failed"], int]:
if self.main_type == "pg": if self.main_type == "pg":
result = psycopg2.extras.execute_values( try:
self.main_cursor, result = psycopg2.extras.execute_values(
self.insert_torrents_statement, self.main_cursor,
[ self.insert_torrents_statement,
(*[torrent[column] for column in self.torrent_columns],) [
for torrent in torrents (*[torrent[column] for column in self.torrent_columns],)
], for torrent in torrents
fetch=True, ],
) fetch=True,
)
except ValueError as e:
if '0x00' in str(e):
for torrent in torrents:
torrent['name'] = torrent['name'].replace('\x00', '')
# Retry
return self.merge_entries(torrents)
self.merge_files_m( self.merge_files_m(
{ {
torrent["id"]: one_result[0] torrent["id"]: one_result[0]
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment