Skip to content

refactor image converter URL into function #6

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
merged 3 commits into from
Mar 1, 2019
Merged

refactor image converter URL into function #6

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ddfaf04
refactor image converter URL into function
martymcguire Mar 1, 2019
2dd50af
pylint errors
martymcguire Mar 1, 2019
e3a2d69
pylint fixing
martymcguire Mar 1, 2019
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
28 changes: 19 additions & 9 deletions adafruit_pyportal.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -583,6 +583,22 @@ def _connect_esp(self):
print("Cound not connect to internet", error)
print("Retrying in 3 seconds...")
time.sleep(3)

@staticmethod
def image_converter_url(image_url, width, height, color_depth=16):
"""Generate a converted image url from the url passed in,
with the given width and height. aio_username and aio_key must be
set in secrets."""
try:
aio_username = secrets['aio_username']
aio_key = secrets['aio_key']
except KeyError:
raise KeyError("\n\nOur image converter service require a login/password to rate-limit. Please register for a freeadafruit.io account and place the user/key in your secrets file under 'aio_username' and 'aio_key'")# pylint: disable=line-too-long

return IMAGE_CONVERTER_SERVICE % (aio_username, aio_key,
width, height,
color_depth, image_url)

def fetch(self):
"""Fetch data from the url we initialized with, perfom any parsing,
and display text or graphics. This function does pretty much everything"""
Expand Down Expand Up @@ -654,17 +670,11 @@ def fetch(self):
gc.collect()

if image_url:
try:
aio_username = secrets['aio_username']
aio_key = secrets['aio_key']
except KeyError:
raise KeyError("\n\nOur image converter service require a login/password to rate-limit. Please register for a freeadafruit.io account and place the user/key in your secrets file under 'aio_username' and 'aio_key'")# pylint: disable=line-too-long
try:
print("original URL:", image_url)
image_url = IMAGE_CONVERTER_SERVICE % (aio_username, aio_key,
self._image_resize[0],
self._image_resize[1],
16, image_url)
image_url = self.image_converter_url(image_url,
self._image_resize[0],
self._image_resize[1])
print("convert URL:", image_url)
# convert image to bitmap and cache
#print("**not actually wgetting**")
Expand Down