pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[ADD] iot: Improve usage of helpers in IoT Box

Browse Source 
With this commit we move the helpers to a separate file for
easier access from the IoT Box
This commit is contained in:
lejeune quentin
2019-08-23 12:21:02 +02:00
parent dc625b2036
commit 84de7cbcb6
7 changed files with 87 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/hw_drivers/controllers/driver.py
+8 -40
View File
@@ -5,7 +5,6 @@ from threading import Thread, Event, Lock
from usb import core
from gatt import DeviceManager as Gatt_DeviceManager
import subprocess
import netifaces
import json
from re import sub
import urllib3
@@ -23,42 +22,11 @@ import ctypes
from odoo import http, _
from odoo.modules.module import get_resource_path
from odoo.addons.hw_drivers.tools import helpers
_logger = logging.getLogger(__name__)
#----------------------------------------------------------
# Helper
#----------------------------------------------------------
def get_mac_address():
try:
return netifaces.ifaddresses('eth0')[netifaces.AF_LINK][0]['addr']
except:
return netifaces.ifaddresses('wlan0')[netifaces.AF_LINK][0]['addr']
def get_ip():
try:
return netifaces.ifaddresses('eth0')[netifaces.AF_INET][0]['addr']
except:
return netifaces.ifaddresses('wlan0')[netifaces.AF_INET][0]['addr']
def read_file_first_line(filename):
path = Path.home() / filename
if path.exists():
with path.open('r') as f:
return f.readline().strip('\n')
return ''
def get_odoo_server_url():
return read_file_first_line('odoo-remote-server.conf')
def get_token():
return read_file_first_line('token')
def get_version():
return '19_07'
#----------------------------------------------------------
# Controllers
#----------------------------------------------------------
@@ -98,7 +66,7 @@ class StatusController(http.Controller):
1 - url of odoo DB
2 - token. This token will be compared to the token of Odoo. He have 1 hour lifetime
"""
server = get_odoo_server_url()
server = helpers.get_odoo_server_url()
image = get_resource_path('hw_drivers', 'static/img', 'False.jpg')
if server == '':
token = b64decode(token).decode('utf-8')
@@ -268,14 +236,14 @@ class Manager(Thread):
"""
This method send IoT Box and devices informations to Odoo database
"""
server = get_odoo_server_url()
server = helpers.get_odoo_server_url()
if server:
iot_box = {
'name': socket.gethostname(),
'identifier': get_mac_address(),
'ip': get_ip(),
'token': get_token(),
'version': get_version()
'identifier': helpers.get_mac_address(),
'ip': helpers.get_ip(),
'token': helpers.get_token(),
'version': helpers.get_version()
}
devices_list = {}
for device in iot_devices:
@@ -473,7 +441,7 @@ printers = conn.getPrinters()
cups_lock = Lock() # We can only make one call to Cups at a time
mpdm = MPDManager()
terminal_id = read_file_first_line('odoo-six-payment-terminal.conf')
terminal_id = helpers.read_file_first_line('odoo-six-payment-terminal.conf')
if terminal_id:
try:
subprocess.check_output(["pidof", "eftdvs"]) # Check if MPD server is running
addons/hw_drivers/tools/helpers.py
+50
View File
@@ -0,0 +1,50 @@
# -*- coding: utf-8 -*-
# Part of Odoo. See LICENSE file for full copyright and licensing details.
import netifaces
from pathlib import Path
#----------------------------------------------------------
# Helper
#----------------------------------------------------------
def get_ip():
try:
return netifaces.ifaddresses('eth0')[netifaces.AF_INET][0]['addr']
except:
return netifaces.ifaddresses('wlan0')[netifaces.AF_INET][0]['addr']
def get_mac_address():
try:
return netifaces.ifaddresses('eth0')[netifaces.AF_LINK][0]['addr']
except:
return netifaces.ifaddresses('wlan0')[netifaces.AF_LINK][0]['addr']
def get_odoo_server_url():
return read_file_first_line('odoo-remote-server.conf')
def get_token():
return read_file_first_line('token')
def get_version():
return '19_07'
def read_file_first_line(filename):
path = Path.home() / filename
if path.exists():
with path.open('r') as f:
return f.readline().strip('\n')
return ''
def unlink_file(filename):
subprocess.check_call(["sudo", "mount", "-o", "remount,rw", "/"])
path = Path.home() / filename
if path.exists():
path.unlink()
subprocess.check_call(["sudo", "mount", "-o", "remount,ro", "/"])
def write_file(filename, text):
subprocess.check_call(["sudo", "mount", "-o", "remount,rw", "/"])
path = Path.home() / filename
path.write_text(text)
subprocess.check_call(["sudo", "mount", "-o", "remount,ro", "/"])
addons/hw_posbox_homepage/controllers/main.py
+28 -36
View File
@@ -21,7 +21,8 @@ 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
from odoo.addons.hw_drivers.controllers.driver import iot_devices, get_ip, get_odoo_server_url
from odoo.addons.hw_drivers.tools import helpers
from odoo.addons.hw_drivers.controllers.driver import iot_devices
_logger = logging.getLogger(__name__)
@@ -31,7 +32,7 @@ _logger = logging.getLogger(__name__)
#----------------------------------------------------------
def access_point():
return get_ip() == '10.11.12.1'
return helpers.get_ip() == '10.11.12.1'
#----------------------------------------------------------
# Controllers
@@ -74,10 +75,8 @@ class IoTboxHomepage(web.Home):
return statuses
def get_six_terminal(self):
path = Path.home() / 'odoo-six-payment-terminal.conf'
if path.exists():
return path.read_text()
return 'Not Configured'
terminal_id = helpers.read_file_first_line('odoo-six-payment-terminal.conf')
return terminal_id or 'Not Configured'
def get_homepage_data(self):
hostname = str(socket.gethostname())
@@ -116,12 +115,13 @@ class IoTboxHomepage(web.Home):
return {
'hostname': hostname,
'ip': get_ip(),
'ip': helpers.get_ip(),
'mac': ":".join(i + next(h) for i in h),
'iot_device_status': iot_device,
'server_status': get_odoo_server_url() or 'Not Configured',
'server_status': helpers.get_odoo_server_url() or 'Not Configured',
'six_terminal': self.get_six_terminal(),
'network_status': network,
'version': helpers.get_version(),
}
@http.route('/', type='http', auth='none')
@@ -134,7 +134,7 @@ class IoTboxHomepage(web.Home):
'breadcrumb': 'Configure IoT Box',
'loading_message': 'Configuring your IoT Box',
'ssid': self.get_wifi_essid(),
'server': get_odoo_server_url(),
'server': helpers.get_odoo_server_url(),
'hostname': subprocess.check_output('hostname').decode('utf-8'),
})
else:
@@ -150,7 +150,7 @@ class IoTboxHomepage(web.Home):
'title': "Odoo's IoT Box - Drivers list",
'breadcrumb': 'Drivers list',
'drivers_list': drivers_list,
'server': get_odoo_server_url()
'server': helpers.get_odoo_server_url()
})
@http.route('/load_drivers', type='http', auth='none', website=True)
@@ -161,7 +161,7 @@ class IoTboxHomepage(web.Home):
mac = subprocess.check_output("/sbin/ifconfig eth0 |grep -Eo ..\(\:..\){5}", shell=True).decode('utf-8').split('\n')[0]
#response = requests.get(url, auth=(username, db_uuid.split('\n')[0]), stream=True)
server = get_odoo_server_url()
server = helpers.get_odoo_server_url()
if server:
urllib3.disable_warnings()
pm = urllib3.PoolManager(cert_reqs='CERT_NONE')
@@ -181,7 +181,7 @@ class IoTboxHomepage(web.Home):
subprocess.check_call("sudo mount -o remount,ro /", shell=True)
subprocess.check_call("sudo mount -o remount,ro /root_bypass_ramdisks", shell=True)
return "<meta http-equiv='refresh' content='20; url=http://" + get_ip() + ":8069/list_drivers'>"
return "<meta http-equiv='refresh' content='20; url=http://" + helpers.get_ip() + ":8069/list_drivers'>"
def get_wifi_essid(self):
wifi_options = []
@@ -214,7 +214,7 @@ class IoTboxHomepage(web.Home):
persistent = ""
subprocess.check_call([get_resource_path('point_of_sale', 'tools/posbox/configuration/connect_to_wifi.sh'), essid, password, persistent])
server = get_odoo_server_url()
server = helpers.get_odoo_server_url()
res_payload = {
'message': 'Connecting to ' + essid,
}
@@ -228,21 +228,20 @@ class IoTboxHomepage(web.Home):
@http.route('/wifi_clear', type='http', auth='none', cors='*', csrf=False)
def clear_wifi_configuration(self):
os.system(get_resource_path('point_of_sale', 'tools/posbox/configuration/clear_wifi_configuration.sh'))
return "<meta http-equiv='refresh' content='0; url=http://" + get_ip() + ":8069'>"
helpers.unlink_file('wifi_network.txt')
return "<meta http-equiv='refresh' content='0; url=http://" + helpers.get_ip() + ":8069'>"
@http.route('/server_clear', type='http', auth='none', cors='*', csrf=False)
def clear_server_configuration(self):
os.system(get_resource_path('point_of_sale', 'tools/posbox/configuration/clear_server_configuration.sh'))
return "<meta http-equiv='refresh' content='0; url=http://" + get_ip() + ":8069'>"
helpers.unlink_file('odoo-remote-server.conf')
return "<meta http-equiv='refresh' content='0; url=http://" + helpers.get_ip() + ":8069'>"
@http.route('/drivers_clear', type='http', auth='none', cors='*', csrf=False)
def clear_drivers_list(self):
os.system(get_resource_path('point_of_sale', 'tools/posbox/configuration/clear_drivers_list.sh'))
return "<meta http-equiv='refresh' content='0; url=http://" + get_ip() + ":8069/list_drivers'>"
for driver in os.listdir(get_resource_path('hw_drivers', 'drivers')):
if driver != '__pycache__':
helpers.unlink_file(get_resource_path('hw_drivers', 'drivers', driver))
return "<meta http-equiv='refresh' content='0; url=http://" + helpers.get_ip() + ":8069/list_drivers'>"
@http.route('/server_connect', type='http', auth='none', cors='*', csrf=False)
def connect_to_server(self, token, iotname):
@@ -250,7 +249,7 @@ class IoTboxHomepage(web.Home):
token = token.split('|')[1]
reboot = 'reboot'
subprocess.check_call([get_resource_path('point_of_sale', 'tools/posbox/configuration/connect_to_server.sh'), url, iotname, token, reboot])
return 'http://' + get_ip() + ':8069'
return 'http://' + helpers.get_ip() + ':8069'
@http.route('/steps', type='http', auth='none', cors='*', csrf=False)
def step_by_step_configure_page(self):
@@ -259,7 +258,7 @@ class IoTboxHomepage(web.Home):
'breadcrumb': 'Configure IoT Box',
'loading_message': 'Configuring your IoT Box',
'ssid': self.get_wifi_essid(),
'server': get_odoo_server_url(),
'server': helpers.get_odoo_server_url(),
'hostname': subprocess.check_output('hostname').decode('utf-8').strip('\n'),
})
@@ -280,7 +279,7 @@ class IoTboxHomepage(web.Home):
'title': 'IoT -> Odoo server configuration',
'breadcrumb': 'Configure Odoo Server',
'hostname': subprocess.check_output('hostname').decode('utf-8').strip('\n'),
'server_status': get_odoo_server_url() or 'Not configured yet',
'server_status': helpers.get_odoo_server_url() or 'Not configured yet',
'loading_message': 'Configure Domain Server'
})
@@ -316,19 +315,12 @@ class IoTboxHomepage(web.Home):
@http.route('/six_payment_terminal_add', type='http', auth='none', cors='*', csrf=False)
def add_six_payment_terminal(self, terminal_id):
subprocess.check_call(["sudo", "mount", "-o", "remount,rw", "/"])
path = Path.home() / 'odoo-six-payment-terminal.conf'
path.write_text(terminal_id)
helpers.write_file('odoo-six-payment-terminal.conf', terminal_id)
subprocess.check_call(["sudo", "service", "odoo", "restart"])
subprocess.check_call(["sudo", "mount", "-o", "remount,ro", "/"])
return 'http://' + get_ip() + ':8069'
return 'http://' + helpers.get_ip() + ':8069'
@http.route('/six_payment_terminal_clear', type='http', auth='none', cors='*', csrf=False)
def clear_six_payment_terminal(self):
subprocess.check_call(["sudo", "mount", "-o", "remount,rw", "/"])
path = Path.home() / 'odoo-six-payment-terminal.conf'
if path.exists():
path.unlink()
helpers.unlink_file('odoo-six-payment-terminal.conf')
subprocess.check_call(["sudo", "service", "odoo", "restart"])
subprocess.check_call(["sudo", "mount", "-o", "remount,ro", "/"])
return "<meta http-equiv='refresh' content='0; url=http://" + get_ip() + ":8069'>"
return "<meta http-equiv='refresh' content='0; url=http://" + helpers.get_ip() + ":8069'>"
addons/hw_posbox_homepage/views/homepage.html
+1 -1
View File
@@ -92,7 +92,7 @@
</tr>
<tr>
<td class="heading">Version</td>
<td>V19.07 <a class="btn btn-sm float-right" href='/hw_proxy/upgrade/'>update</a></td>
<td> {{ version }} <a class="btn btn-sm float-right" href='/hw_proxy/upgrade/'>update</a></td>
</tr>
<tr>
<td class="heading">IP Address</td>
addons/point_of_sale/tools/posbox/configuration/clear_drivers_list.sh
-6
View File
@@ -1,6 +0,0 @@
#!/usr/bin/env bash
logger -t posbox_clear_server_configuration "Clearing the drivers list"
sudo mount -o remount,rw /
sudo rm -rf /home/pi/odoo/addons/hw_drivers/drivers/*
sudo mount -o remount,ro /
addons/point_of_sale/tools/posbox/configuration/clear_server_configuration.sh
-6
View File
@@ -1,6 +0,0 @@
#!/usr/bin/env bash
logger -t posbox_clear_server_configuration "Clearing the server configuration"
sudo mount -o remount,rw /
sudo rm -f /home/pi/odoo-remote-server.conf
sudo mount -o remount,ro /
addons/point_of_sale/tools/posbox/configuration/clear_wifi_configuration.sh
-6
View File
@@ -1,6 +0,0 @@
#!/usr/bin/env bash
logger -t posbox_clear_wifi_configuration "Clearing the wifi configuration"
sudo mount -o remount,rw /
sudo rm -f /home/pi/wifi_network.txt
sudo mount -o remount,ro /