From ee519c222f0d1aec3f1b4082bbd76d13dedd07b2 Mon Sep 17 00:00:00 2001 From: lejeune quentin Date: Thu, 27 Feb 2020 10:35:59 +0000 Subject: [PATCH] [REF] hw_posbox_homepage: Use helpers to get mac address in homepage We use a library to get mac address of IoT in homepage. however we already have a function that does this in the helper in hw_drivers closes odoo/odoo#46631 X-original-commit: ae78e9cdde777ffac6f08a35dd00a540c92130bb Signed-off-by: Quentin Lejeune (qle) --- addons/hw_drivers/drivers/PrinterDriver.py | 7 +------ addons/hw_escpos/controllers/main.py | 2 -- addons/hw_posbox_homepage/controllers/main.py | 5 +---- 3 files changed, 2 insertions(+), 12 deletions(-) diff --git a/addons/hw_drivers/drivers/PrinterDriver.py b/addons/hw_drivers/drivers/PrinterDriver.py index e47df2b61a2..68fbdd29316 100644 --- a/addons/hw_drivers/drivers/PrinterDriver.py +++ b/addons/hw_drivers/drivers/PrinterDriver.py @@ -12,7 +12,6 @@ import base64 import re import subprocess import tempfile -from uuid import getnode as get_mac from PIL import Image, ImageOps from odoo import http, _ @@ -251,14 +250,10 @@ class PrinterDriver(Driver): else: ip = '\nIP Addresses:\n%s\n' % '\n'.join(ips) - mac_addr = get_mac() - h = iter(hex(mac_addr)[2:].zfill(12)) - mac_addr = ":".join(i + next(h) for i in h) - if len(ips) >= 1: ips_filtered = [i for i in ips if i != '127.0.0.1'] main_ips = ips_filtered and ips_filtered[0] or '127.0.0.1' - mac = '\nMAC Address:\n%s\n' % mac_addr + mac = '\nMAC Address:\n%s\n' % helpers.get_mac_address() homepage = '\nHomepage:\nhttp://%s:8069\n\n' % main_ips center = b'\x1b\x61\x01' diff --git a/addons/hw_escpos/controllers/main.py b/addons/hw_escpos/controllers/main.py index 65b7d2d0fd1..2b68ce1b53f 100644 --- a/addons/hw_escpos/controllers/main.py +++ b/addons/hw_escpos/controllers/main.py @@ -32,8 +32,6 @@ except ImportError: from odoo import http, _ from odoo.addons.hw_proxy.controllers import main as hw_proxy -from uuid import getnode as get_mac - _logger = logging.getLogger(__name__) # workaround https://bugs.launchpad.net/openobject-server/+bug/947231 diff --git a/addons/hw_posbox_homepage/controllers/main.py b/addons/hw_posbox_homepage/controllers/main.py index 37030cabac5..501a6f5aa91 100644 --- a/addons/hw_posbox_homepage/controllers/main.py +++ b/addons/hw_posbox_homepage/controllers/main.py @@ -15,7 +15,6 @@ from odoo.tools import misc from pathlib import Path import threading -from uuid import getnode as get_mac from odoo.addons.hw_proxy.controllers import main as hw_proxy from odoo.addons.web.controllers import main as web from odoo.modules.module import get_resource_path @@ -59,8 +58,6 @@ class IoTboxHomepage(web.Home): def get_homepage_data(self): hostname = str(socket.gethostname()) - mac = get_mac() - h = iter(hex(mac)[2:].zfill(12)) ssid = helpers.get_ssid() wired = subprocess.check_output(['cat', '/sys/class/net/eth0/operstate']).decode('utf-8').strip('\n') if wired == 'up': @@ -84,7 +81,7 @@ class IoTboxHomepage(web.Home): return { 'hostname': hostname, 'ip': helpers.get_ip(), - 'mac': ":".join(i + next(h) for i in h), + 'mac': helpers.get_mac_address(), 'iot_device_status': iot_device, 'server_status': helpers.get_odoo_server_url() or 'Not Configured', 'network_status': network,