diff options
| author | Nicolas Martinelli <nim@odoo.com> | 2017-01-31 17:06:58 +0100 |
|---|---|---|
| committer | Nicolas Martinelli <nim@odoo.com> | 2017-02-03 08:15:12 +0100 |
| commit | 01ac5949ef4ec89dc766674ab5c3fa6056010e68 (patch) | |
| tree | 9f3fa1dddf5c49f08317c2a6d9fb6e38160e9adc /addons | |
| parent | 61784887c451a0a0423ef64f4881c9916763b740 (diff) | |
[FIX] website_slides: get export links
The export links also require the access token.
Complement of commit c196b55d618d99
opw-703750
Diffstat (limited to 'addons')
| -rw-r--r-- | addons/website_slides/models/slides.py | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/addons/website_slides/models/slides.py b/addons/website_slides/models/slides.py index fe5376ea016..db3706a0a75 100644 --- a/addons/website_slides/models/slides.py +++ b/addons/website_slides/models/slides.py @@ -494,11 +494,12 @@ class Slide(models.Model): # -------------------------------------------------- @api.model - def _fetch_data(self, base_url, data, content_type=False): + def _fetch_data(self, base_url, data, content_type=False, extra_params=False): result = {'values': dict()} try: if data: - base_url = base_url + '?%s' % urlencode(data) + sep = '?' if not extra_params else '&' + base_url = base_url + '%s%s' % (sep, urlencode(data)) req = urllib2.Request(base_url) content = urllib2.urlopen(req).read() if content_type == 'json': @@ -610,12 +611,14 @@ class Slide(models.Model): values['datas'] = values['image'] values['slide_type'] = 'infographic' elif google_values['mimeType'].startswith('application/vnd.google-apps'): - values['datas'] = self._fetch_data(google_values['exportLinks']['application/pdf'], {}, 'pdf')['values'] values['slide_type'] = get_slide_type(values) - if google_values['exportLinks'].get('text/plain'): - values['index_content'] = self._fetch_data(google_values['exportLinks']['text/plain'], {})['values'] - if google_values['exportLinks'].get('text/csv'): - values['index_content'] = self._fetch_data(google_values['exportLinks']['text/csv'], {})['values'] + if 'exportLinks' in google_values: + values['datas'] = self._fetch_data(google_values['exportLinks']['application/pdf'], params, 'pdf', extra_params=True)['values'] + # Content indexing + if google_values['exportLinks'].get('text/plain'): + values['index_content'] = self._fetch_data(google_values['exportLinks']['text/plain'], params, extra_params=True)['values'] + elif google_values['exportLinks'].get('text/csv'): + values['index_content'] = self._fetch_data(google_values['exportLinks']['text/csv'], params, extra_params=True)['values'] elif google_values['mimeType'] == 'application/pdf': # TODO: Google Drive PDF document doesn't provide plain text transcript values['datas'] = self._fetch_data(google_values['webContentLink'], {}, 'pdf')['values'] |