techbloc/techrec
1
0
Fork 0
Code Issues 10 Pull requests Releases Activity

py3 support: better unicode decode

Browse source
This commit is contained in:
boyska 2019-11-15 22:15:55 +01:00
parent d5726fbc32
commit 089264e071
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
server/server.py
View file

@ -89,13 +89,13 @@ class RecAPI(Bottle):
self.get('/jobs/<job_id:int>', callback=self.check_job) self.get('/jobs/<job_id:int>', callback=self.check_job)
def create(self): def create(self):
req = dict(request.POST.allitems()) req = dict(request.POST.decode().allitems())
ret = {} ret = {}
logger.debug("Create request %s " % req) logger.debug("Create request %s " % req)
now = datetime.now() now = datetime.now()
start = date_read(req['starttime']) if 'starttime' in req else now start = date_read(req['starttime']) if 'starttime' in req else now
name = req['name'].decode('utf8') if 'name' in req else u"" name = req['name'] if 'name' in req else u""
end = date_read(req['endtime']) if 'endtime' in req else now end = date_read(req['endtime']) if 'endtime' in req else now
rec = Rec(name=name, rec = Rec(name=name,
@ -107,7 +107,7 @@ class RecAPI(Bottle):
rec=rec_sanitize(rec)) rec=rec_sanitize(rec))
def delete(self): def delete(self):
req = dict(request.POST.allitems()) req = dict(request.POST.decode().allitems())
logging.info("Server: request delete %s " % (req)) logging.info("Server: request delete %s " % (req))
if 'id' not in req: if 'id' not in req:
return self.rec_err("No valid ID") return self.rec_err("No valid ID")
@ -118,7 +118,7 @@ class RecAPI(Bottle):
return self.rec_err("DELETE error: %s" % (self.db.get_err())) return self.rec_err("DELETE error: %s" % (self.db.get_err()))
def update(self, recid): def update(self, recid):
req = dict(request.POST.allitems()) req = dict(request.POST.decode().allitems())
newrec = {} newrec = {}
now = datetime.now() now = datetime.now()
@ -131,7 +131,7 @@ class RecAPI(Bottle):
else: else:
newrec['endtime'] = date_read(req['endtime']) newrec['endtime'] = date_read(req['endtime'])
if 'name' in req: if 'name' in req:
newrec["name"] = req['name'].decode('utf8') newrec["name"] = req['name']
try: try:
logger.info("prima di update") logger.info("prima di update")
@ -144,7 +144,7 @@ class RecAPI(Bottle):
def generate(self): def generate(self):
# prendiamo la rec in causa # prendiamo la rec in causa
recid = dict(request.POST.allitems())['id'] recid = dict(request.POST.decode().allitems())['id']
rec = self.db._search(_id=recid)[0] rec = self.db._search(_id=recid)[0]
if rec.filename is not None and os.path.exists(rec.filename): if rec.filename is not None and os.path.exists(rec.filename):
return {'status': 'ready', return {'status': 'ready',
@ -166,8 +166,8 @@ class RecAPI(Bottle):
'endtime': rec.endtime.strftime('%H%M'), 'endtime': rec.endtime.strftime('%H%M'),
'startdt': rec.starttime.strftime('%y%m%d_%H%M'), 'startdt': rec.starttime.strftime('%y%m%d_%H%M'),
'enddt': rec.endtime.strftime('%y%m%d_%H%M'), 'enddt': rec.endtime.strftime('%y%m%d_%H%M'),
'name': filter(lambda c: c.isalpha(), 'name': ''.join(filter(lambda c: c.isalpha(),
unicodedata.normalize('NFKD', rec.name).encode('ascii', 'ignore')), unicodedata.normalize('NFKD', rec.name).encode('ascii', 'ignore').decode('ascii'))),
} }
self.db.get_session(rec).commit() self.db.get_session(rec).commit()
job_id = self._app.pq.submit( job_id = self._app.pq.submit(