Skip to content

Close uploaded files before deleting #289

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

Draft
Mirochill wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Close uploaded files before deleting #289

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

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
1 change: 1 addition & 0 deletions telegram_upload/client/telegram_upload_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@ def send_files(self, entity, files: Iterable[File], delete_on_success=False, pri
pack_bot_file_id(message.media)))
if message and delete_on_success:
click.echo('Deleting "{}"'.format(file))
file.close()
os.remove(file.path)
if message:
self.forward_to(message, forward)
Expand Down
11 changes: 9 additions & 2 deletions tests/test_client/test_telegram_upload_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,13 +134,20 @@ def test_send_files(self):
mock_os.remove.assert_called_once_with("thumb.jpg")
with self.subTest("Test send files with delete mode"), patch('os.remove') as mock_remove:
file = File(MagicMock(max_caption_length=200), self.upload_file_path)
self.client.send_files(entity, [file], delete_on_success=True)
calls = Mock()
with patch.object(file, 'close') as mock_close:
calls.attach_mock(mock_close, 'close')
calls.attach_mock(mock_remove, 'remove')
self.client.send_files(entity, [file], delete_on_success=True)
self.client.send_file.assert_called_with(
entity, file, thumb=None, file_size=file.file_size,
caption=os.path.basename(self.upload_file_path).split('.')[0], force_document=False,
progress_callback=AnyArg(), attributes=[],
)
mock_remove.assert_called_once_with(self.upload_file_path)
calls.assert_has_calls([
call.close(),
call.remove(self.upload_file_path),
])

def test_send_files_data_loss(self):
mock_client = MagicMock(max_caption_length=200)
Expand Down