import md5
import openerp.addons.hw_proxy.controllers.main as hw_proxy
import subprocess
-from threading import Thread
+from threading import Thread, Lock
from Queue import Queue, Empty
try:
def __init__(self):
Thread.__init__(self)
self.queue = Queue()
+ self.lock = Lock()
self.status = {'status':'connecting', 'messages':[]}
def connected_usb_devices(self):
if usb.core.find(idVendor=device['vendor'], idProduct=device['product']) != None:
connected.append(device)
return connected
+
+ def lockedstart(self):
+ self.lock.acquire()
+ if not self.isAlive():
+ self.start()
+ self.lock.release()
def get_escpos_printer(self):
try:
_logger.error(e);
def push_task(self,task, data = None):
- if not self.isAlive():
- self.start()
+ self.lockedstart()
self.queue.put((time.time(),task,data))
def print_receipt_body(self,eprint,receipt):
# Receipt Header
if receipt['company']['logo']:
+ eprint.set(align='center')
eprint.print_base64_image(receipt['company']['logo'])
eprint.text('\n')
else:
import time
from os import listdir
from os.path import join
-from threading import Thread
+from threading import Thread, Lock
from select import select
from Queue import Queue, Empty
class Scanner(Thread):
def __init__(self):
Thread.__init__(self)
+ self.lock = Lock()
self.status = {'status':'connecting', 'messages':[]}
self.input_dir = '/dev/input/by-id/'
self.barcodes = Queue()
57:(" "," "),
}
+ def lockedstart(self):
+ self.lock.acquire()
+ if not self.isAlive():
+ self.start()
+ self.lock.release()
+
def set_status(self, status, message = None):
if status == self.status['status']:
if message != None and message != self.status['messages'][-1]:
elif status == 'disconnected' and message:
_logger.warning('Disconnected Barcode Scanner: '+message)
-
-
def get_device(self):
try:
if not evdev:
busy reading another barcode
"""
+ self.lockedstart()
+
while True:
try:
timestamp, barcode = self.barcodes.get(True, 5)
return ''
def get_status(self):
- if not s.isAlive():
- s.start()
+ self.lockedstart()
return self.status
def run(self):
class ScannerDriver(hw_proxy.Proxy):
@http.route('/hw_proxy/scanner', type='json', auth='none', cors='*')
def scanner(self):
- if not s.isAlive():
- s.start()
return s.get_barcode()
+
},
// find a proxy and connects to it. for options see find_proxy
+ // - force_ip : only try to connect to the specified ip.
+ // - port: what port to listen to (default 8069)
+ // - progress(fac) : callback for search progress ( fac in [0,1] )
autoconnect: function(options){
var self = this;
this.set_connection_status('connecting',{});
+ var found_url = new $.Deferred();
var success = new $.Deferred();
- this.find_proxy(options)
- .then(function(proxies){
- if(proxies.length > 0){
- self.connect(proxies[0])
- .then(function(){
- success.resolve();
- },function(){
- self.set_connection_status('disconnected');
- success.reject();
- });
- }else{
- self.set_connection_status('disconnected');
- success.reject();
- }
+
+ if ( options.force_ip ){
+ // if the ip is forced by server config, bailout on fail
+ found_url = this.try_hard_to_connect(options.force_ip, options)
+ }else if( localStorage['hw_proxy_url'] ){
+ // try harder when we remember a good proxy url
+ found_url = this.try_hard_to_connect(localStorage['hw_proxy_url'], options)
+ .then(null,function(){
+ return self.find_proxy(options);
+ });
+ }else{
+ // just find something quick
+ found_url = this.find_proxy(options);
+ }
+
+ success = found_url.then(function(url){
+ return self.connect(url);
});
+
+ success.fail(function(){
+ self.set_connection_status('disconnected');
+ });
+
return success;
},
}
},
- // returns as a deferred a list of valid hosts urls that can be used as proxy.
+ // try several time to connect to a known proxy url
+ try_hard_to_connect: function(url,options){
+ options = options || {};
+ var port = ':' + (options.port || '8069');
+
+ this.set_connection_status('connecting');
+
+ if(url.indexOf('//') < 0){
+ url = 'http://'+url;
+ }
+
+ if(url.indexOf(':',5) < 0){
+ url = url+port;
+ }
+
+ // try real hard to connect to url, with a 1sec timeout and up to 'retries' retries
+ function try_real_hard_to_connect(url, retries, done){
+
+ done = done || new $.Deferred();
+
+ var c = $.ajax({
+ url: url + '/hw_proxy/hello',
+ method: 'GET',
+ timeout: 1000,
+ })
+ .done(function(){
+ done.resolve(url);
+ })
+ .fail(function(){
+ if(retries > 0){
+ try_real_hard_to_connect(url,retries-1,done);
+ }else{
+ done.reject();
+ }
+ });
+ return done;
+ }
+
+ return try_real_hard_to_connect(url,3);
+ },
+
+ // returns as a deferred a valid host url that can be used as proxy.
// options:
// - port: what port to listen to (default 8069)
- // - force_ip : limit the search to the specified ip
// - progress(fac) : callback for search progress ( fac in [0,1] )
find_proxy: function(options){
options = options || {};
var port = ':' + (options.port || '8069');
var urls = [];
var found = false;
- var proxies = [];
- var done = new $.Deferred();
var parallel = 8;
+ var done = new $.Deferred(); // will be resolved with the proxies valid urls
var threads = [];
var progress = 0;
- this.set_connection_status('connecting');
- if(options.force_ip){
- var url = options.force_ip;
- if(url.indexOf('//') < 0){
- url = 'http://'+url;
- }
- if(url.indexOf(':',5) < 0){
- url = url+port;
- }
- urls.push(url);
- }else{
- if(localStorage['hw_proxy_url']){
- urls.push(localStorage['hw_proxy_url']);
- }
-
- urls.push('http://localhost'+port);
-
- for(var i = 0; i < 256; i++){
- urls.push('http://192.168.0.'+i+port);
- urls.push('http://192.168.1.'+i+port);
- urls.push('http://192.168.2.'+i+port);
- urls.push('http://10.0.0.'+i+port);
- }
+ urls.push('http://localhost'+port);
+ for(var i = 0; i < 256; i++){
+ urls.push('http://192.168.0.'+i+port);
+ urls.push('http://192.168.1.'+i+port);
+ urls.push('http://10.0.0.'+i+port);
}
var prog_inc = 1/urls.length;
}
}
- function thread(url,done){
- if(!url){
+ function thread(done){
+ var url = urls.shift();
+
+ done = done || new $.Deferred();
+
+ if( !url || found || !self.searching_for_proxy ){
done.resolve();
+ return done;
}
+
var c = $.ajax({
url: url + '/hw_proxy/hello',
method: 'GET',
- timeout: 300,
+ timeout: 400,
}).done(function(){
found = true;
update_progress();
- proxies.push(url);
done.resolve(url);
})
.fail(function(){
update_progress();
- var next_url = urls.shift();
- if(found ||! self.searching_for_proxy || !next_url){
- done.resolve();
- }else{
- thread(next_url,done);
- }
+ thread(done);
});
+
return done;
}
this.searching_for_proxy = true;
- for(var i = 0; i < Math.min(parallel,urls.length); i++){
- threads.push(thread(urls.shift(),new $.Deferred()));
+ for(var i = 0, len = Math.min(parallel,urls.length); i < len; i++){
+ threads.push(thread());
}
- var done = new $.Deferred();
-
$.when.apply($,threads).then(function(){
var urls = [];
for(var i = 0; i < arguments.length; i++){
urls.push(arguments[i]);
}
}
- done.resolve(urls);
+ done.resolve(urls[0]);
});
return done;
##############################################################################
import collections
import copy
-import fnmatch
import logging
from lxml import etree
from operator import itemgetter
import os
-import simplejson
-import werkzeug
import HTMLParser
import openerp
from openerp import tools
-from openerp.http import request
from openerp.osv import fields, osv, orm
from openerp.tools import graph, SKIPPED_ELEMENT_TYPES
from openerp.tools.safe_eval import safe_eval as eval
MOVABLE_BRANDING = ['data-oe-model', 'data-oe-id', 'data-oe-field', 'data-oe-xpath']
-def keep_query(*args, **kw):
- if not args and not kw:
- args = ('*',)
- params = kw.copy()
- query_params = frozenset(werkzeug.url_decode(request.httprequest.query_string).keys())
- for keep_param in args:
- for param in fnmatch.filter(query_params, keep_param):
- if param not in params and param in request.params:
- params[param] = request.params[param]
- return werkzeug.urls.url_encode(params)
-
class view_custom(osv.osv):
_name = 'ir.ui.view.custom'
_order = 'create_date desc' # search(limit=1) should return the last customization
if not context:
context = {}
- if values is None:
- values = dict()
- qcontext = dict(
- keep_query=keep_query,
- request=request,
- json=simplejson,
- quote_plus=werkzeug.url_quote_plus,
- )
- qcontext.update(values)
-
def loader(name):
return self.read_template(cr, uid, name, context=context)
- return self.pool[engine].render(cr, uid, tname, qcontext, loader=loader, context=context)
+ return self.pool[engine].render(cr, uid, tname, values, loader=loader, context=context)
#------------------------------------------------------
# Misc
projects / odoo / odoo.git / commitdiff