diff --git a/app/admin/views.py b/app/admin/views.py index 6711ca3..a2def59 100644 --- a/app/admin/views.py +++ b/app/admin/views.py @@ -492,7 +492,7 @@ def off_download(): user=request.form.get('user') for url in urls: if url.strip()!='': - cmd=u'python {} download_and_upload "{}" "{}" {}'.format(os.path.join(config_dir,'function.py'),url,grand_path,user) + cmd=u'nohup python {} download_and_upload "{}" "{}" {} &'.format(os.path.join(config_dir,'function.py'),url,grand_path,user) subprocess.Popen(cmd,shell=True) return jsonify({'status':True,'msg':'ok'}) path=request.args.get('path') diff --git a/app/utils/offdownload.py b/app/utils/offdownload.py index 921115e..250aafc 100644 --- a/app/utils/offdownload.py +++ b/app/utils/offdownload.py @@ -35,7 +35,7 @@ def download_and_upload(url,remote_dir,user,gid=None): mon_db.down_db.insert_one(item) return cur_order=mon_db.down_db.count() - option={"dir":down_path,"split":"16","max-connection-per-server":"8","seed-ratio":"0.1","bt-save-metadata":"false","bt-max-peers":"200","header":["User-Agent:Transmission/2.77"]} + option={"dir":down_path,"split":"16","max-connection-per-server":"8","seed-ratio":"0.1",'force-save':'true',"bt-save-metadata":"false","bt-max-peers":"200","header":["User-Agent:Transmission/2.77"]} item={} r=p.addUri(url,option) gid=json.loads(r)[0]["result"] diff --git a/function.py b/function.py index e979015..8fddc20 100755 --- a/function.py +++ b/function.py @@ -5,7 +5,12 @@ from app.utils import * if __name__=='__main__': func=sys.argv[1] if len(sys.argv)>2: - args=sys.argv[2:] - eval(func+str(tuple(args))) + if sys.argv[-1]=='&': + if len(sys.argv)>3: + args=sys.argv[2:-1] + eval(func+str(tuple(args))) + else: + args=sys.argv[2:] + eval(func+str(tuple(args))) else: eval(func+'()') diff --git a/update.sh b/update.sh index 602a6db..e5ca67f 100755 --- a/update.sh +++ b/update.sh @@ -120,6 +120,8 @@ echo "2019.02.16更新版本:优化PyOne4.0安装流程!" echo "2019.02.19更新版本:优化细节" echo "2019.02.20更新版本:1. 填坑!2. 后台可配置mongo和redis信息;3. 优化离线下载体验;4. 输出日志" echo "2019.02.21更新版本:修复自定义代码bug" +echo "2019.02.22更新版本:优化离线下载功能(重启网站后任务不中断)" + upgrade_to4 upgrade restart