diff --git a/core/controller.py b/core/controller.py index d474fed..d800f17 100644 --- a/core/controller.py +++ b/core/controller.py @@ -334,6 +334,12 @@ def _oncomplete(self, a_task): db.update('Task', where="id = %d" % a_task.id, date_completed = "%d" % time.time(),completed_size = "%d" % a_task.completed_size, total_size = "%d" % a_task.total_size, filename=a_task.filename) log("complete: "+a_task.url) self._close_db(db) + # rename filename + self.filename_lock.acquire() + try: + os.rename(a_task.partfilename, os.path.join(self.settings.download_path, a_task.filename)) + finally: + self.filename_lock.release() self.update_event.set() def _get_filename_by_url(self, url): diff --git a/webui/app.py b/webui/app.py index dde7880..0063d29 100644 --- a/webui/app.py +++ b/webui/app.py @@ -46,8 +46,8 @@ def POST(self): web.header('Content-Type', 'application/json') try: data = json.loads(web.data()) - #TODO: 支持多个URL - controller.add_tasks(data['urls'].splitlines(), data['cookie'], data['referer']) + # remove empty lines, add tasks + controller.add_tasks(filter(None, data['urls'].splitlines()), data['cookie'], data['referer']) return '"OK"' except Exception, e: return json.dumps(unicode(e))