Skip to content

[WIP][11.0] icon from manifest #23

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
pedrobaeza merged 3 commits into from
Oct 2, 2018
Merged

[WIP][11.0] icon from manifest #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
18a13f0
[REF]Fix field property
StephanRozendaal Oct 1, 2018
fc7c263
[IMP]Get module icon from multiple sources
StephanRozendaal Oct 1, 2018
b551364
[IMP] Bump version number to 11.0.1.0.1
StephanRozendaal Oct 1, 2018
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
2 changes: 1 addition & 1 deletion github_connector_odoo/__manifest__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
{
'name': 'Github Connector - Odoo',
'summary': 'Analyze Odoo modules information from Github repositories',
'version': '11.0.1.0.0',
'version': '11.0.1.0.1',
'category': 'Connector',
'license': 'AGPL-3',
'author': 'Odoo Community Association (OCA), Sylvain LE GAL, GRAP',
Expand Down
28 changes: 20 additions & 8 deletions github_connector_odoo/models/odoo_module_version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ class OdooModuleVersion(models.Model):
string='Odoo Type', selection=_ODOO_TYPE_SELECTION, store=True,
compute='_compute_odoo_type')

image = fields.Binary(string='Icon Image', reaonly=True)
image = fields.Binary(string='Icon Image', readonly=True)

@elicoidal elicoidal Oct 1, 2018

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍


github_url = fields.Char(
string='Github URL', compute='_compute_github_url', store=True,
Expand Down Expand Up @@ -332,19 +332,31 @@ def create_or_update_from_manifest(
info, repository_branch, module_version.module_id)
module_version.write(value)
icon_path = False
for current_icon_path in self._ICON_PATH:
resize = False
if info.get('images'):
full_current_icon_path = os.path.join(
full_module_path, current_icon_path, 'icon.png')
full_module_path, info.get('images')[0])
if os.path.exists(full_current_icon_path):
icon_path = full_current_icon_path
else:
for current_icon_path in self._ICON_PATH:
full_current_icon_path = os.path.join(
full_module_path, current_icon_path, 'icon.png')
if os.path.exists(full_current_icon_path):
icon_path = full_current_icon_path
resize = True
break
if icon_path:
resized_image = False
image_enc = False
try:
with open(icon_path, 'rb') as f:
image = f.read()
resized_image = tools.image_resize_image(
base64.b64encode(image), size=(96, 96),
encoding='base64', filetype='PNG')
if resize:
image_enc = tools.image_resize_image(
base64.b64encode(image), size=(96, 96),
encoding='base64', filetype='PNG')
else:
image_enc = base64.b64encode(image)
except Exception:
_logger.warning("Unable to read or resize %s" % icon_path)
module_version.write({'image': resized_image})
module_version.write({'image': image_enc})