浏览代码

FIX unicode handling on new recording

boyska 4 年之前
父节点
当前提交
58ba05012a
共有 1 个文件被更改,包括 5 次插入3 次删除
  1. 5 3
      server/server.py

+ 5 - 3
server/server.py

@@ -2,12 +2,13 @@ import os
 import sys
 import sys
 from datetime import datetime
 from datetime import datetime
 import logging
 import logging
-logger = logging.getLogger('server')
 from functools import partial
 from functools import partial
+import unicodedata
 
 
 from bottle import Bottle, request, static_file, redirect, abort, response
 from bottle import Bottle, request, static_file, redirect, abort, response
 import bottle
 import bottle
 
 
+logger = logging.getLogger('server')
 botlog = logging.getLogger('bottle')
 botlog = logging.getLogger('bottle')
 botlog.setLevel(logging.INFO)
 botlog.setLevel(logging.INFO)
 botlog.addHandler(logging.StreamHandler(sys.stdout))
 botlog.addHandler(logging.StreamHandler(sys.stdout))
@@ -130,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"]
+            newrec["name"] = req['name'].decode('utf8')
 
 
         try:
         try:
             logger.info("prima di update")
             logger.info("prima di update")
@@ -162,7 +163,8 @@ class RecAPI(Bottle):
                             }
                             }
         rec.filename = get_config()['AUDIO_OUTPUT_FORMAT'] % {
         rec.filename = get_config()['AUDIO_OUTPUT_FORMAT'] % {
             'time': rec.starttime.strftime('%y%m%d_%H%M'),
             'time': rec.starttime.strftime('%y%m%d_%H%M'),
-            'name': filter(lambda c: c.isalpha(), rec.name)
+            'name': filter(lambda c: c.isalpha(),
+                           unicodedata.normalize('NFKD', rec.name).encode('ascii', 'ignore'))
         }
         }
         self.db.get_session(rec).commit()
         self.db.get_session(rec).commit()
         job_id = self._app.pq.submit(
         job_id = self._app.pq.submit(