kunapi 1.1__tar.gz → 1.3__tar.gz

{kunapi-1.1 → kunapi-1.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.2
 Name: kunapi
-Version: 1.1
+Version: 1.3
 Summary: kunapi
 Home-page: https://docs.kwebapp.cn/index/index/2
 Author: 百里-坤坤
@@ -9,5 +9,5 @@ Maintainer: 坤坤
 Maintainer-email: fengkun01@qq.com
 License: MIT License
 Description: kunapi
-Keywords: kunapi1.1
+Keywords: kunapi1.3
 Platform: UNKNOWN

{kunapi-1.1 → kunapi-1.3}/kunapi/__init__.py

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

{kunapi-1.1 → kunapi-1.3}/kunapi/app.py

@@ -99,6 +99,7 @@ class web:
         # self.__port=port
         import sys
         cmd=sys.argv
+        # print('cmd',cmd)
         config.app['cli']=False
         if 'eventlog' in cmd or len(cmd)==1 or (len(cmd)>=2 and cmd[len(cmd)-1]=='server'):
             # config.app['cli']=False
@@ -125,9 +126,9 @@ class web:
                     Events(cmd)
             else:
                 self.__impl(host=host,port=port,filename=filename)
-        elif len(sys.argv)==3 and sys.argv[2]=='--cli':
+        elif len(cmd)==3 and cmd[2]=='--cli':
             try:
-                RAW_URI=sys.argv[1]
+                RAW_URI=cmd[1]
             except:pass
             else:
                 self.cli(RAW_URI)
@@ -161,7 +162,6 @@ class web:
         status,resheader,body=self.__routes(reqheader)
         print(body)
         if(config.app['save_cli_pid']) and pid:
-
             try:
                 os.remove(clipidpath)
             except:pass

{kunapi-1.1 → kunapi-1.3}/kunapi/kunapi.py

@@ -164,35 +164,36 @@ 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:
-        if cmd_par['cli']:#通过命令行执行控制器的方法
-            try:
-                obj=importlib.import_module(cmd_par['appname']+'.common')
-                if obj.config.fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr!=fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr1:
-                    print("该项目只能使用"+obj.config.fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr+"开头的命令!")
-                    exit()
-            except Exception as e:
-                print('项目不合法',traceback.format_exc())
-                exit()
-            config.fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr=fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr1
-            from kunapi import web
-            try:
-                import app as application
-            except Exception as e:
-                if "No module named 'app'" in str(e):
-                    print("请在"+fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr1+"项目下运行")
-                else:
-                    print(traceback.format_exc())
-                exit()
-            else:
-                app=web(__name__,application)
-                try:
-                    RAW_URI=sys.argv[1]
-                except:pass
-                else:
-                    if RAW_URI=='--cli':
-                        RAW_URI=''
-                    app.cli(RAW_URI)
-        elif cmd_par['update']:#更新kunapi包:
+        # if cmd_par['cli']:#通过命令行执行控制器的方法
+        #     try:
+        #         obj=importlib.import_module(cmd_par['appname']+'.common')
+        #         if obj.config.fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr!=fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr1:
+        #             print("该项目只能使用"+obj.config.fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr+"开头的命令!")
+        #             exit()
+        #     except Exception as e:
+        #         print('项目不合法',traceback.format_exc())
+        #         exit()
+        #     config.fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr=fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr1
+        #     from kunapi import web
+        #     try:
+        #         import app as application
+        #     except Exception as e:
+        #         if "No module named 'app'" in str(e):
+        #             print("请在"+fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr1+"项目下运行")
+        #         else:
+        #             print(traceback.format_exc())
+        #         exit()
+        #     else:
+        #         app=web(__name__,application)
+        #         try:
+        #             RAW_URI=sys.argv[1]
+        #         except:pass
+        #         else:
+        #             if RAW_URI=='--cli':
+        #                 RAW_URI=''
+        #             app.cli(RAW_URI)
+        
+        if cmd_par['update']:#更新kunapi包:
             # print(fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr1)
             # exit()
             serall=['kunapi','kwebs','kwebsp']
@@ -319,7 +320,7 @@ def cllfunction():
                         else:
                             save_route_cli_pid('pid/'+str(sys.argv[tar-1])+fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr1+'_server_pid')
                             app.run(host=cmd_par['host'],port=int(cmd_par['port']))
-        else:
+        elif cmd_par['install'] or cmd_par['pack'] or cmd_par['upload'] or cmd_par['uninstall']:
             if cmd_par['install']:#插入 应用、模块、插件
                 if cmd_par['appname'] and cmd_par['modular']:
                     if os.path.exists(cmd_par['appname']):
@@ -420,6 +421,34 @@ def cllfunction():
                 else:
                     print("\033[1;31;40m卸载时 必须指定应该app和modular，参考命令： "+fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr1+" --app app --modular api")
                     exit()
+        else:
+            try:
+                obj=importlib.import_module(cmd_par['appname']+'.common')
+                if obj.config.fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr!=fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr1:
+                    print("该项目只能使用"+obj.config.fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr+"开头的命令!")
+                    exit()
+            except Exception as e:
+                print('项目不合法',traceback.format_exc())
+                exit()
+            config.fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr=fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr1
+            from kunapi import web
+            try:
+                import app as application
+            except Exception as e:
+                if "No module named 'app'" in str(e):
+                    print("请在"+fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr1+"项目下运行")
+                else:
+                    print(traceback.format_exc())
+                exit()
+            else:
+                app=web(__name__,application)
+                try:
+                    RAW_URI=sys.argv[1]
+                except:pass
+                else:
+                    if RAW_URI=='--cli':
+                        RAW_URI=''
+                    app.cli(RAW_URI)
 def cill_start(fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr='kunapi'):
     "脚本入口"
     global fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr1

{kunapi-1.1 → kunapi-1.3}/kunapi.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.2
 Name: kunapi
-Version: 1.1
+Version: 1.3
 Summary: kunapi
 Home-page: https://docs.kwebapp.cn/index/index/2
 Author: 百里-坤坤
@@ -9,5 +9,5 @@ Maintainer: 坤坤
 Maintainer-email: fengkun01@qq.com
 License: MIT License
 Description: kunapi
-Keywords: kunapi1.1
+Keywords: kunapi1.3
 Platform: UNKNOWN