kunapi 1.18__tar.gz → 1.20__tar.gz

kunapi-1.20/PKG-INFO

@@ -0,0 +1,13 @@
+Metadata-Version: 2.1
+Name: kunapi
+Version: 1.20
+Summary: kunapi
+Home-page: https://docs.kwebapp.cn/index/index/2
+Author: 百里-坤坤
+Author-email: fengkun01@qq.com
+Maintainer: 坤坤
+Maintainer-email: fengkun01@qq.com
+License: MIT License
+Keywords: kunapi1.20
+
+kunapi

{kunapi-1.18 → kunapi-1.20}/kunapi/__init__.py

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

{kunapi-1.18 → kunapi-1.20}/kunapi/app.py

@@ -793,8 +793,13 @@ class web:
             print('\033[37m* 调试器：开启')
         else:
             print('\033[37m* 调试器：已关闭')
-        from waitress import serve
-        serve(self.__application, host=host, port=port,threads=1,channel_timeout=3600) #框架不支持多线程 所以 threads设为1
+        try:
+            from waitress import serve
+            serve(self.__application, host=host, port=port,threads=1,_quiet=False,channel_timeout=3600) #框架不支持多线程 所以 threads设为1
+        except:
+            from wsgiref.simple_server import make_server
+            self.__httpd = make_server(host, int(port), self.__application)
+            self.__httpd.serve_forever()
     def __http_wsgi(self,host,port,filename):
         "http——wsgi测试服务 windows建议使用Waitress‌"
         from wsgiref.simple_server import make_server

{kunapi-1.18 → kunapi-1.20}/kunapi/config/__init__.py

@@ -12,6 +12,9 @@ app['cli']=False
 app['save_cli_pid']=False #是否开启cli运行时保存pid
 app['temp_folder']='app/runtime/temp' #是否开启cli运行时保存pid
 
+app['run_cmd']={ #运行命令 b不可修改该出手
+    'server':False
+}
 
 #路由配置
 route={}

{kunapi-1.18 → kunapi-1.20}/kunapi/kunapi.py

@@ -9,10 +9,6 @@ def get_cmd_par(fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr=''):
     global fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr1
     if fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr:
         fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr1=fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr
-    # python_version=platform.python_version()
-    # if python_version[0:3]!='3.8':
-    #     print("\033[1;31;40m "+fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr1+"依赖python3.8，与你现在的python"+python_version+"不兼容")
-    #     exit()
     if os.name == 'posix' or os.name == 'nt':pass
     else:
         print("\033[1;31;40m "+fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr1+"不支持当前操作系统 在linux或windows系统下运行")
@@ -129,6 +125,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 +136,34 @@ 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:
+                    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())
-            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':
-                            if cmd_par['daemonyun']:
-                                with daemon.DaemonContext():
-                                    os.system(cmds)
-                            else:
-                                os.system(cmds)
-                        else:
-                            os.system(cmds)
             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=[]):
@@ -238,68 +224,10 @@ def cllfunction():
             print("\033[32m"+fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr1+" --modular api --uninstall                  卸载app/api模块")
             print("\033[32m"+fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr1+" --modular api --plug plug1 --uninstall     卸载app/api/plug1插件\n")
     else:
-        import requests,shutil,importlib,traceback
-        from .common import create,kcwszip,config,kill_route_cli,save_route_cli_pid,get_pid_by_port,kill_pid
-        if cmd_par['update']:#更新kunapi包:
-            # print(fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr1)
-            # exit()
-            serall=['kunapi','kwebs','kwebsp']
-            if fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr1 not in serall:
-                print('不支持该命令')
-                exit()
-            for bs in serall:
-                if 'kunapi'==bs:
-                    response=requests.get("https://gitee.com/open_source_official_website/pypi/raw/master/kunapi.zip")
-                elif 'kwebs'==bs:
-                    response=requests.get("https://gitee.com/open_source_official_website/pypi/raw/master/kwebs.zip")
-                elif 'kwebsp'==bs:
-                    response=requests.get("https://gitee.com/open_source_official_website/pypi/raw/master/kwebsp.zip")
-                f=open(bs+'.zip',"wb")
-                f.write(response.content)
-                f.close()
-                kcwszip.unzip_file(bs+'.zip','')
-                os.remove(bs+'.zip')
-                if os.name == 'nt': #windows
-                    os.system("pip uninstall "+bs+" -y")
-                    os.system("python setup.py sdist install")
-                    try:
-                        shutil.rmtree('__pycache__')
-                    except:pass
-                    shutil.rmtree('build')
-                    shutil.rmtree('dist')
-                    shutil.rmtree(bs)
-                    shutil.rmtree(bs+'.egg-info')
-                    os.remove('setup.py')
-                elif os.name == 'posix': #linux
-                    os.system("pip3.8 uninstall "+bs+" -y")
-                    os.system("python3.8 setup.py sdist install")
-                    try:
-                        shutil.rmtree('__pycache__')
-                    except:pass
-                    shutil.rmtree('build')
-                    shutil.rmtree('dist')
-                    shutil.rmtree(bs)
-                    shutil.rmtree(bs+'.egg-info')
-                    os.remove('setup.py')
-                    # os.system("pip3 uninstall "+bs+" -y")
-                    # sys.argv=['setup.py', 'sdist', 'install']
-                    # import setup
-                    # importlib.reload(setup)
-                    # setup.start()
-
-                    # try:
-                    #     shutil.rmtree('__pycache__')
-                    # except:pass
-                    # shutil.rmtree('build')
-                    # shutil.rmtree('dist')
-                    # shutil.rmtree(bs)
-                    # shutil.rmtree(bs+'.egg-info')
-                    # os.remove('setup.py')
-                else:
-                    print("该操作系统不支持更新"+bs)
-                if bs==fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr1:
-                    break
-        elif cmd_par['server']:#启动web服务
+        import shutil,importlib,traceback #requests
+        from .common import create,config,kill_route_cli,save_route_cli_pid,get_pid_by_port,kill_pid #kcwszip
+        config.app['run_cmd']=cmd_par
+        if cmd_par['server']:#启动web服务
             
             try:
                 
@@ -363,11 +291,13 @@ def cllfunction():
                         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']:
@@ -507,11 +437,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:
@@ -546,6 +478,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.20/kunapi.egg-info/PKG-INFO

@@ -0,0 +1,13 @@
+Metadata-Version: 2.1
+Name: kunapi
+Version: 1.20
+Summary: kunapi
+Home-page: https://docs.kwebapp.cn/index/index/2
+Author: 百里-坤坤
+Author-email: fengkun01@qq.com
+Maintainer: 坤坤
+Maintainer-email: fengkun01@qq.com
+License: MIT License
+Keywords: kunapi1.20
+
+kunapi

kunapi-1.18/PKG-INFO

@@ -1,30 +0,0 @@
-Metadata-Version: 2.4
-Name: kunapi
-Version: 1.18
-Summary: kunapi
-Home-page: https://docs.kwebapp.cn/index/index/2
-Author: 百里-坤坤
-Author-email: fengkun01@qq.com
-Maintainer: 坤坤
-Maintainer-email: fengkun01@qq.com
-License: MIT License
-Keywords: kunapi1.18
-Requires-Dist: gunicorn==20.0.4
-Requires-Dist: waitress==3.0.0
-Requires-Dist: watchdog==4.0.0
-Requires-Dist: filetype==1.2.0
-Requires-Dist: psutil==5.9.4
-Requires-Dist: requests==2.32.4
-Requires-Dist: python-daemon==3.1.2
-Dynamic: author
-Dynamic: author-email
-Dynamic: description
-Dynamic: home-page
-Dynamic: keywords
-Dynamic: license
-Dynamic: maintainer
-Dynamic: maintainer-email
-Dynamic: requires-dist
-Dynamic: summary
-
-kunapi

kunapi-1.18/kunapi.egg-info/PKG-INFO

@@ -1,30 +0,0 @@
-Metadata-Version: 2.4
-Name: kunapi
-Version: 1.18
-Summary: kunapi
-Home-page: https://docs.kwebapp.cn/index/index/2
-Author: 百里-坤坤
-Author-email: fengkun01@qq.com
-Maintainer: 坤坤
-Maintainer-email: fengkun01@qq.com
-License: MIT License
-Keywords: kunapi1.18
-Requires-Dist: gunicorn==20.0.4
-Requires-Dist: waitress==3.0.0
-Requires-Dist: watchdog==4.0.0
-Requires-Dist: filetype==1.2.0
-Requires-Dist: psutil==5.9.4
-Requires-Dist: requests==2.32.4
-Requires-Dist: python-daemon==3.1.2
-Dynamic: author
-Dynamic: author-email
-Dynamic: description
-Dynamic: home-page
-Dynamic: keywords
-Dynamic: license
-Dynamic: maintainer
-Dynamic: maintainer-email
-Dynamic: requires-dist
-Dynamic: summary
-
-kunapi