kunapi 1.17__tar.gz → 1.19__tar.gz

{kunapi-1.17 → kunapi-1.19}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kunapi
-Version: 1.17
+Version: 1.19
 Summary: kunapi
 Home-page: https://docs.kwebapp.cn/index/index/2
 Author: 百里-坤坤
@@ -8,7 +8,7 @@ Author-email: fengkun01@qq.com
 Maintainer: 坤坤
 Maintainer-email: fengkun01@qq.com
 License: MIT License
-Keywords: kunapi1.17
+Keywords: kunapi1.19
 Requires-Dist: gunicorn==20.0.4
 Requires-Dist: waitress==3.0.0
 Requires-Dist: watchdog==4.0.0

{kunapi-1.17 → kunapi-1.19}/kunapi/__init__.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-__version__ = '1.17'
+__version__ = '1.19'
 try:
     from .app import web
 except:pass

{kunapi-1.17 → kunapi-1.19}/kunapi/kunapi.py

@@ -129,6 +129,8 @@ def get_cmd_par(fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr=''):
             print("\033[1;31;40m有关"+fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr1+"命令的详细信息，请键入 "+fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr1+" help",e)
         return False
     else:
+        if not path:
+            path=os.getcwd()
         cmd_par={
             'server':server,
             'update':update,
@@ -138,46 +140,45 @@ def get_cmd_par(fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr=''):
         }
         if cmd_par['cmd']:
             if '&&' in cmd_par['cmd']:
-                for cmds in cmd_par['cmd'].split('&&'):
-                    print('执行命令',cmds.strip())
-                    if cmds[0:3] == 'cd ':
-                        # os.system(cmds)
-                        print('已切换工作目录',cmds[3:])
-                        os.chdir(cmds[3:].strip())
-                    else:
-                        if os.name == 'posix':
-                            if cmd_par['daemonyun']:
-                                with daemon.DaemonContext():
-                                    os.system(cmds.strip())
+                if os.name == 'posix' and cmd_par['daemonyun']:
+                    with daemon.DaemonContext():
+                        os.chdir(cmd_par['path'])
+                        for cmds in cmd_par['cmd'].split('&&'):
+                            print('执行命令',cmds.strip())
+                            if cmds[0:3] == 'cd ':
+                                print('已切换工作目录',cmds[3:])
+                                os.chdir(cmds[3:].strip())
                             else:
                                 os.system(cmds.strip())
-                        else:
-                            os.system(cmds.strip())
-            elif '||' in cmd_par['cmd']:
-                for cmds in cmd_par['cmd'].split('||'):
-                    print('执行命令',cmds)
-                    if cmds[0:3] == 'cd ':
-                        print('已切换工作目录',cmds[3:])
-                        os.chdir(cmds[3:])
+                else:
+                    if os.name == 'posix' and cmd_par['daemonyun']:
+                        with daemon.DaemonContext():
+                            os.chdir(cmd_par['path'])
+                            for cmds in cmd_par['cmd'].split('&&'):
+                                print('执行命令',cmds.strip())
+                                if cmds[0:3] == 'cd ':
+                                    print('已切换工作目录',cmds[3:])
+                                    os.chdir(cmds[3:].strip())
+                                else:
+                                    os.system(cmds.strip())
                     else:
-                        if os.name == 'posix':
-                            if cmd_par['daemonyun']:
-                                with daemon.DaemonContext():
-                                    os.system(cmds)
+                        for cmds in cmd_par['cmd'].split('&&'):
+                            print('执行命令',cmds.strip())
+                            if cmds[0:3] == 'cd ':
+                                print('已切换工作目录',cmds[3:])
+                                os.chdir(cmds[3:].strip())
                             else:
-                                os.system(cmds)
-                        else:
-                            os.system(cmds)
+                                os.system(cmds.strip())
             else:
-                print('执行命令',cmd_par['cmd'].strip())
-                if os.name == 'posix':
-                    if cmd_par['daemonyun']:
-                        with daemon.DaemonContext():
-                            os.system(cmd_par['cmd'].strip())
-                    else:
+                if os.name == 'posix' and cmd_par['daemonyun']:
+                    with daemon.DaemonContext():
+                        os.chdir(cmd_par['path'])
+                        print('执行命令',cmd_par['cmd'].strip())
                         os.system(cmd_par['cmd'].strip())
                 else:
+                    print('执行命令',cmd_par['cmd'].strip())
                     os.system(cmd_par['cmd'].strip())
+
             
         return cmd_par
 def temp_get_file(folder='./',lists=[]):
@@ -358,15 +359,18 @@ def cllfunction():
                     else:
                         save_route_cli_pid('pid/'+fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr1+'_server_pid')
                         from gunicorn.app.wsgiapp import run
+                        import re
                         sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$','',sys.argv[0])
                         sys.argv=[sys.argv[0], '-w', str(cmd_par['processcount']), '-b', cmd_par['host']+':'+str(cmd_par['port']),'-t',cmd_par['timeout'], 'server:'+cmd_par['appname']]
                         if cmd_par['daemonyun']:
                             with daemon.DaemonContext():
+                                os.chdir(cmd_par['path'])
                                 sys.exit(run())
                                 exit()
                         else:
                             sys.exit(run())
                             exit()
+
             else:
                 raise Exception('不支持该操作系统')
         elif cmd_par['install'] or cmd_par['pack'] or cmd_par['upload'] or cmd_par['uninstall']:
@@ -506,11 +510,13 @@ def cllfunction():
                     if os.name == 'posix':
                         if cmd_par['daemonyun']:
                             with daemon.DaemonContext():
+                                os.chdir(cmd_par['path'])
                                 app.cli(RAW_URI)
                         else:
                             app.cli(RAW_URI)
                     else:
                         app.cli(RAW_URI)
+
         else:#通过命令行执行控制器的方法
             config.app['cli']=True
             try:
@@ -545,6 +551,7 @@ def cllfunction():
                     if os.name == 'posix':
                         if cmd_par['daemonyun']:
                             with daemon.DaemonContext():
+                                os.chdir(cmd_par['path'])
                                 app.cli(RAW_URI)
                         else:
                             app.cli(RAW_URI)

{kunapi-1.17 → kunapi-1.19}/kunapi.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kunapi
-Version: 1.17
+Version: 1.19
 Summary: kunapi
 Home-page: https://docs.kwebapp.cn/index/index/2
 Author: 百里-坤坤
@@ -8,7 +8,7 @@ Author-email: fengkun01@qq.com
 Maintainer: 坤坤
 Maintainer-email: fengkun01@qq.com
 License: MIT License
-Keywords: kunapi1.17
+Keywords: kunapi1.19
 Requires-Dist: gunicorn==20.0.4
 Requires-Dist: waitress==3.0.0
 Requires-Dist: watchdog==4.0.0