kcwebs 1.7__tar.gz → 1.8__tar.gz

{kcwebs-1.7 → kcwebs-1.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.2
 Name: kcwebs
-Version: 1.7
+Version: 1.8
 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: kcwebs1.7
+Keywords: kcwebs1.8
 Platform: UNKNOWN

{kcwebs-1.7 → kcwebs-1.8}/kcwebs/__init__.py

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

{kcwebs-1.7 → kcwebs-1.8}/kcwebs/common/autoload.py

@@ -1,25 +1,24 @@
 from kcws.common import *
 from .. import config
 import random,urllib,asyncio,websockets,smtplib,datetime,chardet,copy,multiprocessing,warnings,xlrd,threading
-from kcwebs.utill.redis import redis as kcwsredis
+# from kcwebs.utill.redis import redis as kcwsredis
+import kcwredis,kcwcache,kcwmysql
 from email.mime.text import MIMEText
 from email.utils import formataddr
 from mako.template import Template as kcwsTemplate
 from mako.lookup import TemplateLookup
-from kcwebs.utill.db import mysql as kcwsmysql
 from kcwebs.utill.db import sqlite as kcwssqlite
-from kcwebs.utill.cache import cache as kcwscache
 from kcwebs.utill.db import mongodb as kcwsmongodb
 from dateutil.relativedelta import relativedelta
 from kcwebs.utill.http import Http
 from kcwebs.utill.queues import Queues
 from kcwebs.utill.db import model
+
 from PIL import Image
 import openpyxl
 import pdf2docx
 from pyquery import PyQuery as kcwebspq
-
-redisobj=kcwsredis()
+redisobj=kcwredis.redis
 python_version=platform.python_version()
 if python_version[0:3]!='3.8':
     print("\033[1;31;40m "+config.kcwebs['name']+"-"+config.kcwebs['version']+"依赖python3.8，与你现在的python"+python_version+"不兼容,推荐安装python3.8")
@@ -775,19 +774,24 @@ def rggestrsgrhklhtrdhbithjtiorjhiothposzfsgrgtsre(docfile,imgpath=False,imgmins
         file_set_content(outfiles,html)
     else:
         return html
-def fesgrsgtrgtdrhbtdgrrgrgsgtsegr(pdfname,outname,stop_event=None):
+thread_exception = None
+def fesgrsgtrgtdrhbtdgrrgrgsgtsegr(pdfname,outname):
     """pdf转docx
     
     pdfname pdf文件
 
     outname 转换后保存文件
     """
-    folder_path=os.path.dirname(outname)
-    if folder_path and not os.path.exists(folder_path):
-        os.makedirs(folder_path, exist_ok=True)
-    cv = pdf2docx.Converter(pdfname)
-    cv.convert(outname, start=0, end=None)
-    cv.close()
+    global thread_exception
+    try:
+        folder_path=os.path.dirname(outname)
+        if folder_path and not os.path.exists(folder_path):
+            os.makedirs(folder_path, exist_ok=True)
+        cv = pdf2docx.Converter(pdfname)
+        cv.convert(outname, start=0, end=None)
+        cv.close()
+    except Exception as e:
+        thread_exception = e
     return True
 def tran_pdf_to_docx(pdfname,outname,timeout=None):
     """pdf转docx
@@ -799,15 +803,32 @@ def tran_pdf_to_docx(pdfname,outname,timeout=None):
     timeout 转换超时 单位秒
     """
     if not timeout:
-        return fesgrsgtrgtdrhbtdgrrgrgsgtsegr(pdfname,outname)
+        folder_path=os.path.dirname(outname)
+        if folder_path and not os.path.exists(folder_path):
+            os.makedirs(folder_path, exist_ok=True)
+        cv = pdf2docx.Converter(pdfname)
+        cv.convert(outname, start=0, end=None)
+        cv.close()
+        return True
     else:
+        global thread_exception
+        thread_exception=None
+        if not os.path.exists(pdfname):
+            raise Exception("no such file: '"+pdfname+"'")
         thread = threading.Thread(target=fesgrsgtrgtdrhbtdgrrgrgsgtsegr,args=(pdfname,outname),daemon=True)
         thread.start()
-        thread.join(timeout=timeout)
-        if thread.is_alive():
-            raise Exception('tran_pdf_to_docx timeout out')
-        else:
-            return True
+        try:
+            thread.join(timeout=timeout)
+            if thread.is_alive():
+                thread.join()
+                raise Exception('tran_pdf_to_docx timeout out')
+            else:
+                if thread_exception:
+                    raise Exception(thread_exception)
+                return True
+        except KeyboardInterrupt:
+            thread.join()
+            
 def tran_pdf_to_xlsx_process(pdfname,outname,process=True):
     """pdf 转 xlsx
     
@@ -1053,24 +1074,7 @@ def getfunction(strs,reload=False):
     if reload:
         importlib.reload(obj)
     return obj
-def M(table=None,confi=None):
-    """数据库操作实例
-    
-    参数 table：表名
-
-    参数 confi 数据库配置  可以传数据库名字符串
-    """
-    if confi:
-        if confi['type']=='sqlite':
-            return sqlite(table,confi)
-        else:
-            return mysql(table,confi)
-    else:
-        if config.database['type']=='sqlite':
-            return sqlite(table)
-        else:
-            return mysql(table)
-mysqldbobj=kcwsmysql.mysql()
+mysqldbobj=kcwmysql.mysql
 def mysql(table=None,configss=None):
     """mysql数据库操作实例
     
@@ -1115,6 +1119,23 @@ def mongo(table=None,configss=None):
         return mObj.connect(configss).table(table)
     else:
         return mObj.connect(config.mongo).table(table)
+def M(table=None,confi=None):
+    """数据库操作实例
+    
+    参数 table：表名
+
+    参数 confi 数据库配置  可以传数据库名字符串
+    """
+    if confi:
+        if confi['type']=='sqlite':
+            return sqlite(table,confi)
+        else:
+            return mysql(table,confi)
+    else:
+        if config.database['type']=='sqlite':
+            return sqlite(table)
+        else:
+            return mysql(table)
 def set_cache(name,values,expire="no"):
     """设置缓存
 
@@ -1126,7 +1147,7 @@ def set_cache(name,values,expire="no"):
     
     return Boolean类型
     """
-    return kcwscache.cache().set_cache(name,values,expire)
+    return kcwcache.cache.set_cache(name,values,expire)
 def get_cache(name):
     """获取缓存
 
@@ -1134,7 +1155,7 @@ def get_cache(name):
 
     return 或者的值
     """
-    return kcwscache.cache().get_cache(name)
+    return kcwcache.cache.get_cache(name)
 def del_cache(name):
     """删除缓存
 
@@ -1142,7 +1163,7 @@ def del_cache(name):
 
     return Boolean类型
     """
-    return kcwscache.cache().del_cache(name)
+    return kcwcache.cache.del_cache(name)
 def dateoperator(date,years=0,formats='%Y%m%d%H%M%S',months=0, days=0, hours=0, minutes=0,seconds=0,
                  leapdays=0, weeks=0, microseconds=0,
                  year=None, month=None, day=None, weekday=None,

{kcwebs-1.7 → kcwebs-1.8}/kcwebs/common/session.py

@@ -1,8 +1,7 @@
 # -*- coding: utf-8 -*-
 from kcwebs.config import session as kcwssession
 from . import globals as kcwsglobals
-import time,random,hashlib
-from kcwebs.utill.cache import cache as kcwscache
+import time,random,hashlib,kcwcache
 from datetime import datetime
 def __md5(strs):
     m = hashlib.md5()
@@ -27,7 +26,7 @@ def set(name,value,expire=None):
         strs="kcws"+str(time.time())+str(random.randint(0,9))
         token=__md5(strs)
     kcwsglobals.set_cookie=SESSIONID+"="+token+";expires="+datetime.utcnow().strftime('%a, %d %b %Y %H:%M:%S GMT')+"; Max-Age=%d;Path=/" % (int(expire)*10)
-    return kcwscache.cache().set_config(kcwssession).set_cache(token,value,expire)
+    return kcwcache.cache.set_config(kcwssession).set_cache(token,value,expire)
 def get(name):
     "获取session"
     HTTP_COOKIE=kcwsglobals.HEADER.HTTP_COOKIE
@@ -40,7 +39,7 @@ def get(name):
     for k in HTTP_COOKIE:
         if SESSIONID in k:
             token=k.split("=")[1]
-    v=kcwscache.cache().set_config(kcwssession).get_cache(token)
+    v=kcwcache.cache.set_config(kcwssession).get_cache(token)
     return v
 def rm(name):
     "删除session"
@@ -54,7 +53,7 @@ def rm(name):
     for k in HTTP_COOKIE:
         if SESSIONID in k:
             token=k.split("=")[1]
-    kcwscache.cache().set_config(kcwssession).del_cache(token)
+    kcwcache.cache.set_config(kcwssession).del_cache(token)
     kcwsglobals.set_cookie=SESSIONID+"="+token+";expires="+datetime.utcnow().strftime('%a, %d %b %Y %H:%M:%S GMT')+"; Max-Age=2"
     return True
 

{kcwebs-1.7 → kcwebs-1.8}/kcwebs/utill/db/model.py

@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from .mysql import mysql
-from .sqlite import sqlite
 from kcwebs import config
 from kcwebs import common
 class model:

{kcwebs-1.7 → kcwebs-1.8}/kcwebs/utill/http.py

@@ -111,6 +111,7 @@ class Http:
                         tt=self.__get_pyquery_rules_obj(wait_pq1,doc)
                         if tt and tt.length:
                             if wait_pq_type=='text':
+                                # print('tt.text()',wait_pq1)
                                 if len(tt.text().replace(' ','').replace('\n','').replace('\r','').replace('\t',''))>0:
                                     sfdsf=True
                                     break
@@ -345,14 +346,11 @@ class Http:
             #     self.set_cookies=self.get_cookies
             if closedriver:
                 self.ChromeObj.quit()
-                self.ChromeObj.close()
                 self.ChromeObj=None
     def close_webdriver(self):
         if self.ChromeObj:
             self.ChromeObj.quit()
-            self.ChromeObj.close()
             self.ChromeObj=None
-            
         if self.PhantomJsObj:
             self.PhantomJsObj.quit()
             self.PhantomJsObj=None

{kcwebs-1.7 → kcwebs-1.8}/kcwebs.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.2
 Name: kcwebs
-Version: 1.7
+Version: 1.8
 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: kcwebs1.7
+Keywords: kcwebs1.8
 Platform: UNKNOWN

{kcwebs-1.7 → kcwebs-1.8}/kcwebs.egg-info/SOURCES.txt

@@ -37,12 +37,8 @@ kcwebs/tempfile/kcwebs/app/config/other.py
 kcwebs/tempfile/kcwebs/app/config/redis.py
 kcwebs/utill/http.py
 kcwebs/utill/queues.py
-kcwebs/utill/redis.py
-kcwebs/utill/cache/cache.py
 kcwebs/utill/db/model.py
 kcwebs/utill/db/mongodb.py
-kcwebs/utill/db/mysql copy.py
-kcwebs/utill/db/mysql.py
 kcwebs/utill/db/sqlite.py
 kcwebs/utill/selenium3/__init__.py
 kcwebs/utill/selenium3/common/__init__.py
@@ -144,12 +140,8 @@ kcwebs/tempfile/kcwebs/app/config/other.py
 kcwebs/tempfile/kcwebs/app/config/redis.py
 kcwebs/utill/http.py
 kcwebs/utill/queues.py
-kcwebs/utill/redis.py
-kcwebs/utill/cache/cache.py
 kcwebs/utill/db/model.py
 kcwebs/utill/db/mongodb.py
-kcwebs/utill/db/mysql copy.py
-kcwebs/utill/db/mysql.py
 kcwebs/utill/db/sqlite.py
 kcwebs/utill/selenium3/__init__.py
 kcwebs/utill/selenium3/common/__init__.py

{kcwebs-1.7 → kcwebs-1.8}/kcwebs.egg-info/requires.txt

@@ -1,6 +1,5 @@
 kcws>=1.7
-PyMySQL==0.9.3
-redis==3.3.8
+kcwmysql>=1
 python-dateutil==2.9.0
 pymongo==3.10.0
 Mako==1.3.6

{kcwebs-1.7 → kcwebs-1.8}/kcwebs.egg-info/top_level.txt

@@ -19,7 +19,6 @@ kcwebs/tempfile/kcwebs/app/common/html
 kcwebs/tempfile/kcwebs/app/common/html/include
 kcwebs/tempfile/kcwebs/app/config
 kcwebs/utill
-kcwebs/utill/cache
 kcwebs/utill/db
 kcwebs/utill/db/sqlitedata
 kcwebs/utill/selenium3

{kcwebs-1.7 → kcwebs-1.8}/setup.py

@@ -50,7 +50,7 @@ def start():
         packages =  b,
 
         
-        install_requires = ['kcws>=1.7','PyMySQL==0.9.3','redis==3.3.8','python-dateutil==2.9.0',
+        install_requires = ['kcws>=1.7','kcwmysql>=1','python-dateutil==2.9.0',
                             'pymongo==3.10.0','Mako==1.3.6','six>=1.12.0','pillow>=10.0.0',
                             # 'websockets==10.4',
                             'curl_cffi==0.9.0',
@@ -58,7 +58,7 @@ def start():
                             'cssselect<=1.2.0',
                             'pyquery==2.0.1',
                             'xlrd==1.2.0',
-                            'pdf2docx==0.5.8',
+                            'pdf2docx==0.5.8', #CentOS是依赖 sudo yum -y install mesa-libGL
                             'openpyxl>=3.0.9','Spire.Pdf==10.12.1','Spire.XLS==14.9.3','spire.Doc==12.6.0'], #第三方包
         package_data = {
             '': ['*.html', '*.js','*.css','*.jpg','*.png','*.gif'],

kcwebs-1.7/kcwebs/utill/cache/cache.py

@@ -1,312 +0,0 @@
-# -*- coding: utf-8 -*-
-import os,sys,time,hashlib,json
-from kcwebs import config
-import redis as red
-# from kcwebs.utill.db.mysql import mysql
-from kcwebs.utill.redis import redis as kcwsredis
-import time,hashlib
-def md5(strs):
-    """md5加密"""
-    if not strs:
-        return strs
-    m = hashlib.md5()
-    b = strs.encode(encoding='utf-8')
-    m.update(b)
-    return m.hexdigest()
-def times():
-    """时间戳 精确到秒"""
-    return int(time.time())
-def json_decode(jsonstr):
-    """json字符串转python类型"""
-    try:
-        return eval(jsonstr)
-    except Exception:
-        return {}
-def is_index(params,index):
-    """判断列表或字典里的索引是否存在
-
-    params  列表或字典
-
-    index   索引值
-
-    return Boolean类型
-    """
-    try:
-        params[index]
-    except KeyError:
-        return False
-    except IndexError:
-        return False
-    else:
-        return True
-class cache:
-    "开发完善中..."
-    __name=None
-    __values=None
-    __cachepath='' #os.path.split(os.path.realpath(__file__))[0]+'/../../../'
-    __config=config.cache
-    __redisobj=None
-    __mysqlobj=None
-    # def __setmysqlonj(self):
-    #     conf=config.database
-    #     if 'host' in self.__config and self.__config['host']:
-    #         conf['host']=[self.__config['host']]
-    #     if 'port' in self.__config and self.__config['port']:
-    #         conf['port']=[self.__config['port']]
-    #     if 'user' in self.__config and self.__config['user']:
-    #         conf['user']=[self.__config['user']]
-    #     if 'password' in self.__config and self.__config['password']:
-    #         conf['password']=[self.__config['password']]
-    #     if 'db' in self.__config and self.__config['db']:
-    #         conf['db']=[self.__config['db']]
-    #     db=mysql()
-    #     self.__mysqlobj=db.connect(conf)
-    def __setredisobj(self):
-        "设置redis链接实例"
-        conf=config.redis
-        if 'host' in self.__config and self.__config['host']:
-            conf['host']=self.__config['host']
-        if 'port' in self.__config and self.__config['port']:
-            conf['port']=self.__config['port']
-        if 'password' in self.__config and self.__config['password']:
-            conf['password']=self.__config['password']
-        if 'db' in self.__config and self.__config['db']:
-            conf['db']=self.__config['db']
-        if not self.__redisobj:
-            self.__redisobj=kcwsredis()
-        self.__redisobj.connect(conf)
-    def set_cache(self,name,values,expire = 'no'):
-        """设置缓存
-
-        参数 name：缓存名
-
-        参数 values：缓存值
-
-        参数 expire：缓存有效期 0表示永久  单位 秒
-        
-        return Boolean类型
-        """
-        # print(name)
-        # exit()
-        self.__name=name
-        self.__values=values
-        if expire != 'no':
-            self.__config['expire']=int(expire)
-        return self.__seltype('set')
-    def get_cache(self,name):
-        """获取缓存
-
-        return 或者的值
-        """
-        self.__name=name
-        return self.__seltype('get')
-    def del_cache(self,name):
-        """删除缓存
-
-        return Boolean类型
-        """
-        self.__name=name
-        return self.__seltype('del')
-    def set_config(self,congig):
-        """设置缓存配置
-        """
-        self.__config=congig
-        return self
-
-    
-    def __seltype(self,types):
-        """选择缓存"""
-        # m = hashlib.md5()
-        # b = self.__name.encode(encoding='utf-8')
-        # m.update(b)
-        self.__name=md5(self.__name)
-        if self.__config['type'] == 'File':
-            if types == 'set':
-                return self.__setfilecache()
-            elif types=='get':
-                return self.__getfilecache()
-            elif types=='del':
-                return self.__delfilecache()
-        elif self.__config['type'] == 'Redis':
-            self.__setredisobj()
-            if types == 'set':
-                return self.__setrediscache()
-            elif types=='get':
-                return self.__getrediscache()
-            elif types=='del':
-                return self.__delrediscache()
-        # elif self.__config['type'] == 'MySql':
-        #     self.__setmysqlonj()
-        #     if types == 'set':
-        #         return self.__setmysqlcache()
-        #     elif types == 'get':
-        #         return self.__getmysqlcache()
-        #     elif types == 'del':
-        #         return self.__delmysqlcache()
-        elif self.__config['type'] == 'Python':
-            if types == 'set':
-                return self.__setpythoncache()
-            elif types == 'get':
-                return self.__getpythoncache()
-            elif types == 'del':
-                return self.__delpythoncache()
-        else:
-            raise Exception("缓存类型错误")
-    def __setpythoncache(self):
-        """设置python缓存
-        
-        return Boolean类型
-        """
-        data={
-            'expire':self.__config['expire'],
-            'time':times(),
-            'values':self.__values
-        }
-        config.cachevalue[self.__name]=data
-        return True
-    def __getpythoncache(self):
-        """获取python缓存
-        
-        return 缓存的值
-        """
-        try:
-            ar=config.cachevalue[self.__name]
-        except KeyError:
-            return ""
-        else:
-            if ar['expire'] > 0:
-                if (times()-ar['time']) > ar['expire']:
-                    self.__delpythoncache()
-                    return ""
-                else:
-                    return ar['values']
-            else:
-                return ar['values']
-    def __delpythoncache(self):
-        """删除python缓存
-        
-        return Boolean类型
-        """
-        try:
-            del config.cachevalue[self.__name]
-        except KeyError:
-            pass
-        return True
-    # def __setmysqlcache(self): ########################################################################################
-    #     """设置mysql缓存
-        
-    #     return Boolean类型
-    #     """
-    #     data=[str(self.__values)]
-    #     strs="["
-    #     for k in data:
-    #         strs=strs+k
-    #     strs=strs+"]"
-    #     k=self.__mysqlobj.table('fanshukeji_core_cache').where("name",self.__name).count('id')
-    #     self.__setmysqlonj()
-    #     if k:
-    #         return self.__mysqlobj.table('fanshukeji_core_cache').where("name",self.__name).update({"val":strs,"expire":self.__config['expire'],"time":times()})
-    #     else:
-    #         return self.__mysqlobj.table('fanshukeji_core_cache').insert({"name":self.__name,"val":strs,"expire":self.__config['expire'],"time":times()})
-    # def __getmysqlcache(self):
-    #     """获取mysql缓存
-        
-    #     return 缓存的值
-    #     """
-    #     data=self.__mysqlobj.table('fanshukeji_core_cache').where("name",self.__name).find()
-    #     if data :
-    #         if data['expire']>0 and times()-data['time']>data['expire']:
-    #             self.__setmysqlonj()
-    #             self.__mysqlobj.table('fanshukeji_core_cache').where("name",self.__name).delete()
-    #             return False
-    #         else:
-    #             return eval(data['val'])[0]
-    #     else:
-    #         return False
-    # def __delmysqlcache(self):
-    #     """删除mysql缓存
-        
-    #     return Boolean类型
-    #     """
-    #     return self.__mysqlobj.table('fanshukeji_core_cache').where("name",self.__name).delete()
-    def __setrediscache(self):
-        """设置redis缓存
-        
-        return Boolean类型
-        """
-        data=self.__values
-        try:
-            if self.__config['expire']:
-                self.__redisobj.set(self.__name,data,self.__config['expire'])
-            else:
-                self.__redisobj.set(self.__name,data)
-        except:
-            return False
-        return True
-    def __getrediscache(self):
-        """获取redis缓存
-        
-        return 缓存的值
-        """
-        lists=self.__redisobj.get(self.__name)
-        if lists:
-            return lists
-        else:
-            return False
-    def __delrediscache(self):
-        """删除redis缓存
-        
-        return int类型
-        """
-        return self.__redisobj.delete(self.__name)
-    def __setfilecache(self):
-        """设置文件缓存
-        
-        return Boolean类型
-        """
-        data={
-            'expire':self.__config['expire'],
-            'time':times(),
-            'values':self.__values
-        }
-        if not os.path.exists(self.__config['path']):
-            os.makedirs(self.__config['path']) #多层创建目录
-        f=open(self.__config['path']+"/"+self.__name,"w")
-        f.write(str(data))
-        f.close()
-        return True
-    def __getfilecache(self):
-        """获取文件缓存
-        
-        return 缓存的值
-        """
-        try:
-            f=open(self.__config['path']+"/"+self.__name,"r")
-        except Exception:
-            return ""
-        json_str=f.read()
-        f.close()
-        ar=json_decode(json_str)
-        
-        if ar and is_index(ar,'expire') and ar['expire'] > 0:
-            if (times()-ar['time']) > ar['expire']:
-                self.__delfilecache()
-                return ""
-            else:
-                return ar['values']
-        elif ar and is_index(ar,'values'):
-            return ar['values']
-        else:
-            return ''
-    def __delfilecache(self):
-        """删除文件缓存
-        
-        return Boolean类型
-        """
-        if not os.path.exists(self.__config['path']+"/"+self.__name):
-            return True
-        try:
-            os.remove(self.__config['path']+"/"+self.__name)
-        except:
-            return False
-        return True