kcwebs 3.21__tar.gz → 3.23__tar.gz

{kcwebs-3.21 → kcwebs-3.23}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.2
 Name: kcwebs
-Version: 3.21
+Version: 3.23
 Summary: kcwebs作为web开发而设计的高性能框架
 Home-page: https://docs.kwebapp.cn/index/index/2
 Author: 百里-坤坤
@@ -9,5 +9,5 @@ Maintainer: 坤坤
 Maintainer-email: fk1402936534@qq.com
 License: MIT License
 Description: kcwebs作为web开发而设计的高性能框架，采用全新的架构思想，注重易用性。遵循MIT开源许可协议发布，意味着个人和企业可以免费使用kcwebs，甚至允许把你基于kcwebs开发的应用开源或商业产品发布或销售。完整文档请访问：https://docs.kwebapp.cn/index/index/2
-Keywords: kcwebs3.21
+Keywords: kcwebs3.23
 Platform: UNKNOWN

{kcwebs-3.21 → kcwebs-3.23}/kcwebs/__init__.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-__version__ = '3.21'
+__version__ = '3.23'
 
 kcwebsinfo={}
 kcwebsinfo['name']='kcwebs'                             #项目的名称

{kcwebs-3.21 → kcwebs-3.23}/kcwebs/utill/queues.py

@@ -1,6 +1,5 @@
 from queue import Queue
 from .db import model
-# from .db import sqlite as kcwssqlite
 import threading,time,os,hashlib,random,traceback,multiprocessing,kcwsqlite
 queuesdbpath=os.path.split(os.path.realpath(__file__))[0]+"/Queues"
 class model_kcwebs_task(model.model):
@@ -39,6 +38,53 @@ class Queues():
             Queues.__globalqueue=Queue()
             t=threading.Thread(target=Queues.__messagequeue,daemon=True)
             t.start()
+    __scripttask=None
+    __scripttasklist=[]
+    def __script():
+        if not Queues.__scripttask:
+            if not os.path.isfile(queuesdbpath):
+                model_kcwebs_tasks=model_kcwebs_task()
+                model_kcwebs_tasks.create_table()
+            try:
+                kcwsqlite.sqlite.connect(queuesdbpath,th_lock=True).table("model_kcwebs_queues").find()
+            except:
+                model_kcwebs_tasks=model_kcwebs_task()
+                model_kcwebs_tasks.create_table()
+            Queues.__scripttask=Queue()
+            t=threading.Thread(target=Queues.__taskmessagequeue,daemon=True)
+            t.start()
+            t=threading.Thread(target=Queues.__taskmessagequeue_zx,daemon=True)
+            t.start()
+    
+    def __taskmessagequeue_zx():
+        time.sleep(10)
+        while True:
+            for value in Queues.__scripttasklist:
+                kcwsqlite.sqlite.connect(queuesdbpath,th_lock=True).table("model_kcwebs_queues").where("taskid = '"+value['task']['taskid']+"' and code!=4").update({"code":3,"error":""})
+                if value['args']:
+                    try:
+                        value['target'](*value['args'])
+                    except:
+                        kcwsqlite.sqlite.connect(queuesdbpath,th_lock=True).table("model_kcwebs_queues").where("taskid = '"+value['task']['taskid']+"' and code!=4").update({"code":1,'endtime':int(time.time()),'updtime':int(time.time()),"error":str(traceback.format_exc())})
+                    else:
+                        kcwsqlite.sqlite.connect(queuesdbpath,th_lock=True).table("model_kcwebs_queues").where("taskid = '"+value['task']['taskid']+"' and code!=4").update({"code":4,"start":100,'endtime':int(time.time()),'updtime':int(time.time())})
+                else:
+                    try:
+                        value['target']()
+                    except:
+                        kcwsqlite.sqlite.connect(queuesdbpath,th_lock=True).table("model_kcwebs_queues").where("taskid = '"+value['task']['taskid']+"' and code!=4").update({"code":1,'endtime':int(time.time()),'updtime':int(time.time()),"error":str(traceback.format_exc())})
+                    else:
+                        kcwsqlite.sqlite.connect(queuesdbpath,th_lock=True).table("model_kcwebs_queues").where("taskid = '"+value['task']['taskid']+"' and code!=4").update({"code":4,"start":100,'endtime':int(time.time()),'updtime':int(time.time())})
+            time.sleep(1)
+    def __taskmessagequeue():
+        kcwsqlite.sqlite.connect(queuesdbpath,th_lock=True).table("model_kcwebs_queues").where("code=2 and updtime<"+str(int(time.time())-86400*7)).delete()
+        kcwsqlite.sqlite.connect(queuesdbpath,th_lock=True).table("model_kcwebs_queues").where("code=3 and updtime<"+str(int(time.time())-1200)).delete()
+        while True:
+            if not Queues.__scripttask.empty():
+                value=Queues.__scripttask.get()
+                Queues.__scripttasklist.append(value)
+            else:
+                time.sleep(0.01)
     def __startprocess():
         if not Queues.__processglobalqueue:
             if not os.path.isfile(queuesdbpath):
@@ -50,8 +96,8 @@ class Queues():
                 model_kcwebs_tasks=model_kcwebs_task()
                 model_kcwebs_tasks.create_table()
             Queues.__processglobalqueue=multiprocessing.Queue()
-            t=multiprocessing.Process(target=Queues._messagequeueprocess,args=(Queues.__processglobalqueue,))
-            t.daemon=True
+            t=multiprocessing.Process(target=Queues._messagequeueprocess,args=(Queues.__processglobalqueue,),daemon=True)
+            # t.daemon=True
             t.start()
     def _messagequeueprocess(processglobalqueue):
         """不支持外部调用"""
@@ -175,21 +221,69 @@ class Queues():
         else:
             Queues.__start()
         ttt=int(time.time())
+        
+        end=100
+        if not updtime:
+            updtime=ttt
         if not taskid:
             m = hashlib.md5()
             m.update((str(ttt)+str(random.randint(100000,999999))).encode(encoding='utf-8'))
             taskid=m.hexdigest()
-        end=100
-        if not updtime:
-            updtime=ttt
+        else:
+            arr=kcwsqlite.sqlite.connect(queuesdbpath,th_lock=True).table("model_kcwebs_queues").where("taskid",taskid).find()
+            if arr:
+                if arr['code'] in [2,3]:
+                    return taskid
+                else:
+                    kcwsqlite.sqlite.connect(queuesdbpath,th_lock=True).table("model_kcwebs_queues").where("taskid",taskid).delete()
         task={"taskid":taskid,"title":title,"describes":describes,"code":2,"msg":msg,"error":"","start":start,"end":end,"addtime":ttt,'starts':0,'endtime':0,'updtime':updtime}
-        key={"target":target,"args":args,"task":task}
         kcwsqlite.sqlite.connect(queuesdbpath,th_lock=True).table("model_kcwebs_queues").insert(task)
+        key={"target":target,"args":args,"task":task}
         if types=='process':
             Queues.__processglobalqueue.put(key)
         else:
             Queues.__globalqueue.put(key)
         return taskid
+    def inserttask(target,args=None,title="默认任务",describes='',msg='',taskid=None,start=0,updtime=0): #add_queue
+        """添加后台任务
+        
+        target 方法名  必须
+
+        args 方法参数 非必须  如 (参数1,参数2)
+
+        title 任务名称
+
+        describes 任务描述
+
+        msg 状态描述
+
+        taskid 任务id
+
+        start 进度条开始位置 （建议1到50）
+
+        updtime 进度条更新时间
+
+        return taskid
+        """
+        Queues.__script()
+        ttt=int(time.time())
+        
+        end=100
+        if not updtime:
+            updtime=ttt
+        if not taskid:
+            m = hashlib.md5()
+            m.update((str(ttt)+str(random.randint(100000,999999))).encode(encoding='utf-8'))
+            taskid=m.hexdigest()
+        else:
+            arr=kcwsqlite.sqlite.connect(queuesdbpath,th_lock=True).table("model_kcwebs_queues").where("taskid",taskid).find()
+            if arr:
+                return taskid
+        task={"taskid":taskid,"title":title,"describes":describes,"code":2,"msg":msg,"error":"","start":start,"end":end,"addtime":ttt,'starts':0,'endtime':0,'updtime':updtime}
+        kcwsqlite.sqlite.connect(queuesdbpath,th_lock=True).table("model_kcwebs_queues").insert(task)
+        key={"target":target,"args":args,"task":task}
+        Queues.__scripttask.put(key)
+        return taskid
     def getall(pagenow=1,pagesize=20,where=None):
         """获取全部队列
 

{kcwebs-3.21 → kcwebs-3.23}/kcwebs.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.2
 Name: kcwebs
-Version: 3.21
+Version: 3.23
 Summary: kcwebs作为web开发而设计的高性能框架
 Home-page: https://docs.kwebapp.cn/index/index/2
 Author: 百里-坤坤
@@ -9,5 +9,5 @@ Maintainer: 坤坤
 Maintainer-email: fk1402936534@qq.com
 License: MIT License
 Description: kcwebs作为web开发而设计的高性能框架，采用全新的架构思想，注重易用性。遵循MIT开源许可协议发布，意味着个人和企业可以免费使用kcwebs，甚至允许把你基于kcwebs开发的应用开源或商业产品发布或销售。完整文档请访问：https://docs.kwebapp.cn/index/index/2
-Keywords: kcwebs3.21
+Keywords: kcwebs3.23
 Platform: UNKNOWN

{kcwebs-3.21 → kcwebs-3.23}/kcwebs.egg-info/requires.txt

@@ -1,7 +1,7 @@
-kcws>=3.21
-kcwmysql>=3.21
-kcwsqlite>=3.21
-kcwhttp>=3.21
+kcws>=3.23
+kcwmysql>=3.23
+kcwsqlite>=3.23
+kcwhttp>=3.23
 python-dateutil==2.9.0
 pymongo==3.10.0
 Mako==1.3.6