X Tutup
Skip to content

Commit 70445dc

Browse files
jh0kerjh0ker
committed
Merge pull request python-telegram-bot#151 from python-telegram-bot/urls
enable sending by URL for all sendX methods
2 parents a539a0c + 332667c commit 70445dc

File tree

8 files changed

+309
-19
lines changed

8 files changed

+309
-19
lines changed

‎README.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -275,11 +275,11 @@ To post an Emoji (special thanks to `Tim Whitlock <http://apps.timwhitlock.info/
275275

276276
>>> bot.sendMessage(chat_id=chat_id, text=telegram.Emoji.PILE_OF_POO)
277277

278-
To post an image file via URL (right now only sendPhoto supports this)::
278+
To post an image file via URL::
279279

280280
>>> bot.sendPhoto(chat_id=chat_id, photo='https://telegram.org/img/t_logo.png')
281281

282-
To post a voice file::
282+
To post a voice file from disk::
283283

284284
>>> bot.sendVoice(chat_id=chat_id, voice=open('tests/telegram.ogg', 'rb'))
285285

‎telegram/inputfile.py‎

Lines changed: 23 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
except ImportError:
2828
from mimetools import choose_boundary
2929
from urllib2 import urlopen
30+
3031
import mimetypes
3132
import os
3233
import sys
@@ -69,19 +70,30 @@ def __init__(self,
6970
self.input_name = 'certificate'
7071
self.input_file = data.pop('certificate')
7172

72-
if isinstance(self.input_file, file):
73+
if str(self.input_file).startswith('http'):
74+
from_url = True
75+
self.input_file = urlopen(self.input_file)
76+
else:
77+
from_url = False
78+
79+
if isinstance(self.input_file, file) or from_url:
80+
self.filename = None
7381
self.input_file_content = self.input_file.read()
7482
if 'filename' in data:
7583
self.filename = self.data.pop('filename')
76-
else:
84+
elif isinstance(self.input_file, file):
7785
self.filename = os.path.basename(self.input_file.name)
78-
self.mimetype = mimetypes.guess_type(self.filename)[0] or \
79-
DEFAULT_MIME_TYPE
80-
81-
if 'http' in self.input_file:
82-
self.input_file_content = urlopen(self.input_file).read()
83-
self.mimetype = InputFile.is_image(self.input_file_content)
84-
self.filename = self.mimetype.replace('/', '.')
86+
elif from_url:
87+
self.filename = os.path.basename(self.input_file.url)\
88+
.split('?')[0].split('&')[0]
89+
90+
try:
91+
self.mimetype = InputFile.is_image(self.input_file_content)
92+
if not self.filename or '.' not in self.filename:
93+
self.filename = self.mimetype.replace('/', '.')
94+
except TelegramError:
95+
self.mimetype = mimetypes.guess_type(self.filename)[0] or \
96+
DEFAULT_MIME_TYPE
8597

8698
@property
8799
def headers(self):
@@ -185,10 +197,7 @@ def is_inputfile(data):
185197
if file_type:
186198
file_content = data[file_type[0]]
187199

188-
if file_type[0] == 'photo' or file_type[0] == 'document':
189-
return isinstance(file_content, file) or \
190-
str(file_content).startswith('http')
191-
192-
return isinstance(file_content, file)
200+
return isinstance(file_content, file) or \
201+
str(file_content).startswith('http')
193202

194203
return False

‎telegram/photosize.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ def __init__(self,
4747
height,
4848
**kwargs):
4949
# Required
50-
self.file_id = file_id
50+
self.file_id = str(file_id)
5151
self.width = int(width)
5252
self.height = int(height)
5353
# Optionals

‎tests/test_audio.py‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ class AudioTest(BaseTest, unittest.TestCase):
3434
def setUp(self):
3535
self.audio_file = open('tests/data/telegram.mp3', 'rb')
3636
self.audio_file_id = 'BQADAQADDwADHyP1B6PSPq2HjX8kAg'
37+
self.audio_file_url = 'https://raw.githubusercontent.com/python-telegram-bot/python-telegram-bot/master/tests/data/telegram.mp3'
3738
self.duration = 4
3839
self.performer = 'Leandro Toledo'
3940
self.title = 'Teste'
@@ -129,6 +130,26 @@ def test_send_audio_mp3_file_custom_filename(self):
129130
self.assertEqual(audio.mime_type, self.mime_type)
130131
self.assertEqual(audio.file_size, self.file_size)
131132

133+
def test_send_audio_mp3_url_file(self):
134+
"""Test telegram.Bot sendAudio method"""
135+
print('Testing bot.sendAudio - MP3 File by URL')
136+
137+
message = self._bot.sendAudio(chat_id=self._chat_id,
138+
audio=self.audio_file_url,
139+
duration=self.duration,
140+
performer=self.performer,
141+
title=self.title)
142+
143+
audio = message.audio
144+
145+
self.assertTrue(isinstance(audio.file_id, str))
146+
self.assertNotEqual(audio.file_id, '')
147+
self.assertEqual(audio.duration, self.duration)
148+
self.assertEqual(audio.performer, self.performer)
149+
self.assertEqual(audio.title, self.title)
150+
self.assertEqual(audio.mime_type, self.mime_type)
151+
self.assertEqual(audio.file_size, self.file_size)
152+
132153
def test_send_audio_resend(self):
133154
"""Test telegram.Bot sendAudio method"""
134155
print('Testing bot.sendAudio - Resend by file_id')

‎tests/test_document.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ class DocumentTest(BaseTest, unittest.TestCase):
3434
def setUp(self):
3535
self.document_file = open('tests/data/telegram.png', 'rb')
3636
self.document_file_id = 'BQADAQADpAADHyP1B04ipZxJTe2BAg'
37-
self.document_file_url = 'http://dummyimage.com/600x400/000/fff.gif&text=telegram'
37+
self.document_file_url = 'https://raw.githubusercontent.com/python-telegram-bot/python-telegram-bot/master/tests/data/telegram.gif'
3838
self.thumb = {'width': 90,
3939
'height': 90,
4040
'file_id': 'BQADAQADoQADHyP1B0mzJMVyzcB0Ag',
@@ -96,7 +96,7 @@ def test_send_document_url_gif_file(self):
9696
self.assertTrue(isinstance(document.file_id, str))
9797
self.assertNotEqual(document.file_id, '')
9898
self.assertTrue(isinstance(document.thumb, telegram.PhotoSize))
99-
self.assertEqual(document.file_name, 'image.gif')
99+
self.assertEqual(document.file_name, 'telegram.gif')
100100
self.assertEqual(document.mime_type, 'image/gif')
101101
self.assertEqual(document.file_size, 3878)
102102

‎tests/test_photo.py‎

Lines changed: 220 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,220 @@
1+
#!/usr/bin/env python
2+
#
3+
# A library that provides a Python interface to the Telegram Bot API
4+
# Copyright (C) 2015-2016
5+
# Leandro Toledo de Souza <devs@python-telegram-bot.org>
6+
#
7+
# This program is free software: you can redistribute it and/or modify
8+
# it under the terms of the GNU General Public License as published by
9+
# the Free Software Foundation, either version 3 of the License, or
10+
# (at your option) any later version.
11+
#
12+
# This program is distributed in the hope that it will be useful,
13+
# but WITHOUT ANY WARRANTY; without even the implied warranty of
14+
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15+
# GNU General Public License for more details.
16+
#
17+
# You should have received a copy of the GNU General Public License
18+
# along with this program. If not, see [http://www.gnu.org/licenses/].
19+
20+
"""This module contains a object that represents Tests for Telegram Photo"""
21+
22+
import os
23+
import unittest
24+
import sys
25+
sys.path.append('.')
26+
27+
import telegram
28+
from tests.base import BaseTest
29+
30+
31+
class PhotoTest(BaseTest, unittest.TestCase):
32+
"""This object represents Tests for Telegram Photo."""
33+
34+
def setUp(self):
35+
self.photo_file = open('tests/data/telegram.jpg', 'rb')
36+
self.photo_file_id = 'AgADAQADvb8xGx8j9QcpZDKxYoFK3bfX1i8ABFX_dgMWoKDuQugAAgI'
37+
self.photo_file_url = 'https://raw.githubusercontent.com/python-telegram-bot/python-telegram-bot/master/tests/data/telegram.jpg'
38+
self.width = 300
39+
self.height = 300
40+
self.thumb = {'width': 90,
41+
'height': 90,
42+
'file_id': 'AgADAQADvb8xGx8j9QcpZDKxYoFK3bfX1i8ABBxRLXFhLnhIQ-gAAgI',
43+
'file_size': 1478}
44+
self.file_size = 10209
45+
46+
# caption is part of sendPhoto method but not Photo object
47+
self.caption = u'PhotoTest - Caption'
48+
49+
self.json_dict = {
50+
'file_id': self.photo_file_id,
51+
'width': self.width,
52+
'height': self.height,
53+
'file_size': self.file_size
54+
}
55+
56+
def test_sendphotoo_all_args(self):
57+
"""Test telegram.Bot sendAudio method"""
58+
print('Testing bot.sendPhoto - With all arguments')
59+
60+
message = self._bot.sendPhoto(self._chat_id,
61+
self.photo_file,
62+
caption=self.caption)
63+
64+
thumb, photo = message.photo
65+
66+
self.assertTrue(isinstance(thumb.file_id, str))
67+
self.assertNotEqual(thumb.file_id, '')
68+
self.assertTrue(isinstance(thumb, telegram.PhotoSize))
69+
self.assertEqual(thumb.width, self.thumb['width'])
70+
self.assertEqual(thumb.height, self.thumb['height'])
71+
self.assertEqual(thumb.file_size, self.thumb['file_size'])
72+
73+
self.assertTrue(isinstance(photo.file_id, str))
74+
self.assertNotEqual(photo.file_id, '')
75+
self.assertTrue(isinstance(photo, telegram.PhotoSize))
76+
self.assertEqual(photo.width, self.width)
77+
self.assertEqual(photo.height, self.height)
78+
self.assertEqual(photo.file_size, self.file_size)
79+
80+
self.assertEqual(message.caption, self.caption)
81+
82+
def test_send_photo_jpg_file(self):
83+
"""Test telegram.Bot sendPhoto method"""
84+
print('Testing bot.sendPhoto - JPG File')
85+
86+
message = self._bot.sendPhoto(self._chat_id,
87+
self.photo_file)
88+
89+
thumb, photo = message.photo
90+
91+
self.assertTrue(isinstance(thumb.file_id, str))
92+
self.assertNotEqual(thumb.file_id, '')
93+
self.assertTrue(isinstance(thumb, telegram.PhotoSize))
94+
self.assertEqual(thumb.width, self.thumb['width'])
95+
self.assertEqual(thumb.height, self.thumb['height'])
96+
self.assertEqual(thumb.file_size, self.thumb['file_size'])
97+
98+
self.assertTrue(isinstance(photo.file_id, str))
99+
self.assertNotEqual(photo.file_id, '')
100+
self.assertTrue(isinstance(photo, telegram.PhotoSize))
101+
self.assertEqual(photo.width, self.width)
102+
self.assertEqual(photo.height, self.height)
103+
self.assertEqual(photo.file_size, self.file_size)
104+
105+
def test_send_photo_url_jpg_file(self):
106+
"""Test telegram.Bot sendPhoto method"""
107+
print('Testing bot.sendPhoto - JPG File by URL')
108+
109+
message = self._bot.sendPhoto(self._chat_id,
110+
self.photo_file_url)
111+
112+
thumb, photo = message.photo
113+
114+
self.assertTrue(isinstance(thumb.file_id, str))
115+
self.assertNotEqual(thumb.file_id, '')
116+
self.assertTrue(isinstance(thumb, telegram.PhotoSize))
117+
self.assertEqual(thumb.width, self.thumb['width'])
118+
self.assertEqual(thumb.height, self.thumb['height'])
119+
self.assertEqual(thumb.file_size, self.thumb['file_size'])
120+
121+
self.assertTrue(isinstance(photo.file_id, str))
122+
self.assertNotEqual(photo.file_id, '')
123+
self.assertTrue(isinstance(photo, telegram.PhotoSize))
124+
self.assertEqual(photo.width, self.width)
125+
self.assertEqual(photo.height, self.height)
126+
self.assertEqual(photo.file_size, self.file_size)
127+
128+
def test_send_photo_resend(self):
129+
"""Test telegram.Bot sendPhoto method"""
130+
print('Testing bot.sendPhoto - Resend by file_id')
131+
132+
message = self._bot.sendPhoto(chat_id=self._chat_id,
133+
photo=self.photo_file_id)
134+
135+
thumb, photo = message.photo
136+
137+
self.assertEqual(thumb.file_id, self.thumb['file_id'])
138+
self.assertTrue(isinstance(thumb, telegram.PhotoSize))
139+
self.assertEqual(thumb.width, self.thumb['width'])
140+
self.assertEqual(thumb.height, self.thumb['height'])
141+
self.assertEqual(thumb.file_size, self.thumb['file_size'])
142+
143+
self.assertEqual(photo.file_id, self.photo_file_id)
144+
self.assertTrue(isinstance(photo, telegram.PhotoSize))
145+
self.assertEqual(photo.width, self.width)
146+
self.assertEqual(photo.height, self.height)
147+
self.assertEqual(photo.file_size, self.file_size)
148+
149+
def test_photo_de_json(self):
150+
"""Test Photo.de_json() method"""
151+
print('Testing Photo.de_json()')
152+
153+
photo = telegram.PhotoSize.de_json(self.json_dict)
154+
155+
self.assertEqual(photo.file_id, self.photo_file_id)
156+
self.assertTrue(isinstance(photo, telegram.PhotoSize))
157+
self.assertEqual(photo.width, self.width)
158+
self.assertEqual(photo.height, self.height)
159+
self.assertEqual(photo.file_size, self.file_size)
160+
161+
def test_photo_to_json(self):
162+
"""Test Photo.to_json() method"""
163+
print('Testing Photo.to_json()')
164+
165+
photo = telegram.PhotoSize.de_json(self.json_dict)
166+
167+
self.assertTrue(self.is_json(photo.to_json()))
168+
169+
def test_photo_to_dict(self):
170+
"""Test Photo.to_dict() method"""
171+
print('Testing Photo.to_dict()')
172+
173+
photo = telegram.PhotoSize.de_json(self.json_dict)
174+
175+
self.assertTrue(self.is_dict(photo.to_dict()))
176+
self.assertEqual(photo['file_id'], self.photo_file_id)
177+
self.assertTrue(isinstance(photo, telegram.PhotoSize))
178+
self.assertEqual(photo['width'], self.width)
179+
self.assertEqual(photo['height'], self.height)
180+
self.assertEqual(photo['file_size'], self.file_size)
181+
182+
def test_error_send_photo_empty_file(self):
183+
print('Testing bot.sendPhoto - Null file')
184+
185+
json_dict = self.json_dict
186+
187+
del(json_dict['file_id'])
188+
json_dict['photo'] = open(os.devnull, 'rb')
189+
190+
self.assertRaises(telegram.TelegramError,
191+
lambda: self._bot.sendPhoto(chat_id=self._chat_id,
192+
**json_dict))
193+
194+
def test_error_send_photo_empty_file_id(self):
195+
print('Testing bot.sendPhoto - Empty file_id')
196+
197+
json_dict = self.json_dict
198+
199+
del(json_dict['file_id'])
200+
json_dict['photo'] = ''
201+
202+
self.assertRaises(telegram.TelegramError,
203+
lambda: self._bot.sendPhoto(chat_id=self._chat_id,
204+
**json_dict))
205+
206+
def test_error_photo_without_required_args(self):
207+
print('Testing bot.sendPhoto - Without required arguments')
208+
209+
json_dict = self.json_dict
210+
211+
del(json_dict['file_id'])
212+
del(json_dict['width'])
213+
del(json_dict['height'])
214+
215+
self.assertRaises(TypeError,
216+
lambda: self._bot.sendPhoto(chat_id=self._chat_id,
217+
**json_dict))
218+
219+
if __name__ == '__main__':
220+
unittest.main()

‎tests/test_video.py‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ class VideoTest(BaseTest, unittest.TestCase):
3434
def setUp(self):
3535
self.video_file = open('tests/data/telegram.mp4', 'rb')
3636
self.video_file_id = 'BAADAQADXwADHyP1BwJFTcmY2RYCAg'
37+
self.video_file_url = 'https://raw.githubusercontent.com/python-telegram-bot/python-telegram-bot/master/tests/data/telegram.mp4'
3738
self.width = 360
3839
self.height = 640
3940
self.duration = 4
@@ -139,6 +140,28 @@ def test_send_video_mp4_file_with_custom_filename(self):
139140

140141
self.assertEqual(message.caption, self.caption)
141142

143+
def test_send_video_mp4_file_url(self):
144+
"""Test telegram.Bot sendVideo method"""
145+
print('Testing bot.sendVideo - MP4 File by URL')
146+
147+
message = self._bot.sendVideo(chat_id=self._chat_id,
148+
video=self.video_file_url,
149+
duration=self.duration,
150+
caption=self.caption)
151+
152+
video = message.video
153+
154+
self.assertTrue(isinstance(video.file_id, str))
155+
self.assertNotEqual(video.file_id, '')
156+
self.assertEqual(video.width, 0)
157+
self.assertEqual(video.height, 0)
158+
self.assertEqual(video.duration, self.duration)
159+
self.assertEqual(video.thumb, None)
160+
self.assertEqual(video.mime_type, '')
161+
self.assertEqual(video.file_size, self.file_size)
162+
163+
self.assertEqual(message.caption, self.caption)
164+
142165
def test_send_video_resend(self):
143166
"""Test telegram.Bot sendVideo method"""
144167
print('Testing bot.sendVideo - Resend by file_id')

0 commit comments

Comments
 (0)
X Tutup