Skip to content

Commit

Permalink
Merge 940d0ba into 13ba028
Browse files Browse the repository at this point in the history
  • Loading branch information
bkwi committed May 30, 2019
2 parents 13ba028 + 940d0ba commit 7161dc2
Show file tree
Hide file tree
Showing 4 changed files with 31 additions and 5 deletions.
2 changes: 1 addition & 1 deletion examples/overwite_and_download.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@
# get filelink's metadata
response = filelink.get_metadata()
if response.ok:
metadata = response.json()
metadata = response.json()
2 changes: 1 addition & 1 deletion examples/tags.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@
tags = filelink.tags()
sfw = filelink.sfw()
print(tags)
print(sfw)
print(sfw)
14 changes: 11 additions & 3 deletions filestack/mixins/filestack_imagetransform_mixin.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

class ImageTransformationMixin(object):
"""
All transformations and related/dependent tasks live here. They can
All transformations and related/dependent tasks live here. They can
be directly called by Transform or Filelink objects.
"""
def resize(self, width=None, height=None, fit=None, align=None):
Expand Down Expand Up @@ -134,6 +134,15 @@ def zip(self, store=False, store_params=None):

return utils.make_call(CDN_URL, 'get', transform_url=new_transform.url)

def fallback(self, handle=None, cache=None):
return self.add_transform_task('fallback', locals())

def pdf_info(self, colorinfo=None):
return self.add_transform_task('pdfinfo', locals())

def pdf_convert(self, pageorientation=None, pageformat=None, pages=None):
return self.add_transform_task('pdfconvert', locals())

def av_convert(self, preset=None, force=None, title=None, extname=None, filename=None,
width=None, height=None, upscale=None, aspect_mode=None, two_pass=None,
video_bitrate=None, fps=None, keyframe_interval=None, location=None,
Expand Down Expand Up @@ -171,12 +180,11 @@ def av_convert(self, preset=None, force=None, title=None, extname=None, filename

uuid = response.json()['uuid']
timestamp = response.json()['timestamp']

return filestack.models.AudioVisual(
transform_url, uuid, timestamp, apikey=new_transform.apikey, security=new_transform.security
)


def add_transform_task(self, transformation, params):
"""
Adds a transform task to the current instance and returns it
Expand Down
18 changes: 18 additions & 0 deletions tests/transform_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -259,6 +259,24 @@ def zip(url, request):
assert zip_transform.handle == HANDLE


def test_fallback(transform):
target_url = '{}/{}/fallback=cache:12,handle:fallbackHandle/{}'.format(CDN_URL, APIKEY, EXTERNAL_URL)
result = transform.fallback(handle='fallbackHandle', cache=12)
assert result.url == target_url


def test_pdf_info(transform):
target_url = '{}/{}/pdfinfo=colorinfo:true/{}'.format(CDN_URL, APIKEY, EXTERNAL_URL)
result = transform.pdf_info(colorinfo=True)
assert result.url == target_url


def test_pdf_convert(transform):
target_url = '{}/{}/pdfconvert=pageorientation:landscape/{}'.format(CDN_URL, APIKEY, EXTERNAL_URL)
result = transform.pdf_convert(pageorientation='landscape')
assert result.url == target_url


def quality(transform):
target_url = '{}/{}/quality=value:75/{}'.format(CDN_URL, APIKEY, EXTERNAL_URL)
quality = transform.quality(75)
Expand Down

0 comments on commit 7161dc2

Please sign in to comment.