8000 fix: fix a boolean instead of file name & prevent from closing BytesIO object by alissonlauffer · Pull Request #4 · hydrogram/hydrogram · GitHub
[go: up one dir, main page]
Skip to content

fix: fix a boolean instead of file name & prevent from closing BytesIO object #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alissonlauffer merged 2 commits into from
Dec 4, 2023
Merged

fix: fix a boolean instead of file name & prevent from closing BytesIO object #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1e38c8f
fix(send-audio): fix a boolean instead of file name
alissonlauffer Dec 4, 2023
a6c5630
fix(handle-download): prevent from closing BytesIO object
alissonlauffer Dec 4, 2023
File filter 8000

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 24 additions & 24 deletions hydrogram/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -855,31 +855,31 @@ async def handle_download(self, packet):
None if in_memory else Path(directory).mkdir(parents=True, exist_ok=True)
file_path = Path(directory).resolve() / file_name
temp_file_path = file_path.with_suffix(".temp")
with BytesIO() if in_memory else Path(temp_file_path).open("wb") as file:
try:
async for chunk in self.get_file(
file_id, file_size, 0, 0, progress, progress_args
):
file.write(chunk)
except BaseException as e:
if not in_memory:
file.close()
Path(temp_file_path).unlink()

if isinstance(e, asyncio.CancelledError):
raise e

if isinstance(e, hydrogram.errors.FloodWait):
raise E9AF e

return None
else:
if in_memory:
file.name = file_name
return file

file = BytesIO() if in_memory else Path(temp_file_path).open("wb") # noqa: SIM115 file is closed manually

try:
async for chunk in self.get_file(file_id, file_size, 0, 0, progress, progress_args):
file.write(chunk)
except BaseException as e:
if not in_memory:
file.close()
shutil.move(temp_file_path, file_path)
return file_path
Path(temp_file_path).unlink()

if isinstance(e, asyncio.CancelledError):
raise e

if isinstance(e, hydrogram.errors.FloodWait):
raise e

return None
else:
if in_memory:
file.name = file_name
return file
file.close()
shutil.move(temp_file_path, file_path)
return file_path

async def get_file(
self,
Expand Down
2 changes: 1 addition & 1 deletion hydrogram/methods/messages/send_audio.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ async def progress(current, total):
duration=duration, performer=performer, title=title
),
raw.types.DocumentAttributeFilename(
file_name=file_name or Path(audio).is_file()
file_name=file_name or Path(audio).name
),
],
)
Expand Down
0