mdbq 3.6.21__tar.gz → 3.6.23__tar.gz

{mdbq-3.6.21 → mdbq-3.6.23}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mdbq
-Version: 3.6.21
+Version: 3.6.23
 Home-page: https://pypi.org/project/mdbq
 Author: xigua, 
 Author-email: 2587125111@qq.com

{mdbq-3.6.21 → mdbq-3.6.23}/mdbq/config/default.py

@@ -16,6 +16,19 @@ else:
 logger = logging.getLogger(__name__)
 
 
+def get_mysql_engine(platform, hostname, sql, local, config_file=None):
+    if not config_file:
+        config_file = os.path.join(support_path, 'my_config.txt')
+    if not os.path.isfile(config_file):
+        print(f'缺少配置文件，无法读取配置文件： {config_file}')
+        return None
+    with open(config_file, 'r', encoding='utf-8') as f:
+        conf = json.load(f)
+    conf_data = conf[platform][hostname][sql][local]
+    username, password, host, port = conf_data['username'], conf_data['password'], conf_data['host'], conf_data['port']
+    return mysql.MysqlUpload(username=username, password=password, host=host, port=port, charset='utf8mb4')
+
+
 def return_host(conf_data):
     """
     从配置文件数据中获取: username, password, host, port
@@ -95,3 +108,16 @@ def write_back(datas):
 
 if __name__ == '__main__':
     pass
+    username, password, host, port = get_hostname(
+        platform='Windows',
+        hostname='xigua_lx',
+        sql='mysql',
+        local='remoto'
+    )
+    res = get_mysql_engine(
+        platform='Windows',
+        hostname='xigua_lx',
+        sql='mysql',
+        local='remoto'
+    )
+    print(res)

{mdbq-3.6.21 → mdbq-3.6.23}/mdbq/config/set_support.py

@@ -10,11 +10,11 @@ class SetSupport:
     def __init__(self, dirname):
         self.dirname = dirname
         if platform.system() == 'Windows':
-            self.dirname = f'C:\\同步空间\\BaiduSyncdisk\\自动0备份\\py\\数据更新\\support'
+            self.dirname = f'C:\\数据中心2\\support'
         elif platform.system() == 'Darwin':
-            self.dirname = f'/Users/{getpass.getuser()}/数据中心/自动0备份/py/数据更新/support'
+            self.dirname = f'/Users/{getpass.getuser()}/数据中心2/support'
         else:
-            self.dirname = '数据中心/数据更新/support'  # 没有用可以删
+            self.dirname = '数据中心2/support'  # 没有用, 可以删
 
 
 if __name__ == '__main__':

{mdbq-3.6.21 → mdbq-3.6.23}/mdbq/spider/aikucun.py

@@ -27,23 +27,13 @@ warnings.filterwarnings('ignore')
 
 if platform.system() == 'Windows':
     # windows版本
-    Data_Path = r'C:\同步空间\BaiduSyncdisk'
     D_PATH = str(pathlib.Path(f'C:\\Users\\{getpass.getuser()}\\Downloads'))
-    Share_Path = str(pathlib.Path(r'\\192.168.1.198\时尚事业部\01.运营部\天猫报表'))  # 共享文件根目录
-    Source_Path = str(pathlib.Path(Data_Path, '原始文件2'))
 elif platform.system() == 'Linux':
-    Data_Path = '数据中心'
     D_PATH = 'Downloads'
     if not os.path.exists(D_PATH):
         os.makedirs(D_PATH)
-    Share_Path = ''  # linux 通常是远程服务器，不需要访问共享
-    Source_Path = str(pathlib.Path(Data_Path, '原始文件2'))
 else:
-    Data_Path = f'/Users/{getpass.getuser()}/数据中心'  # 使用Mac独立网络时
-    # Data_Path = '/Volumes'  # 直接使用共享连接台式机时的配置， 后面接 + 自动0备份/***
     D_PATH = str(pathlib.Path(f'/Users/{getpass.getuser()}/Downloads'))
-    Share_Path = str(pathlib.Path('/Volumes/时尚事业部/01.运营部/天猫报表'))  # 共享文件根目录
-    Source_Path = str(pathlib.Path(Data_Path, '原始文件2'))
 upload_path = os.path.join(D_PATH, '数据上传中心', '爱库存')  # 此目录位于下载文件夹
 
 m_engine, company_engine, ts_engine, (username, password, host, port) = default.get_engine()

{mdbq-3.6.21 → mdbq-3.6.23}/mdbq.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mdbq
-Version: 3.6.21
+Version: 3.6.23
 Home-page: https://pypi.org/project/mdbq
 Author: xigua, 
 Author-email: 2587125111@qq.com

{mdbq-3.6.21 → mdbq-3.6.23}/setup.py

@@ -3,7 +3,7 @@
 from setuptools import setup, find_packages
 
 setup(name='mdbq',
-      version='3.6.21',
+      version='3.6.23',
       author='xigua, ',
       author_email="2587125111@qq.com",
       url='https://pypi.org/project/mdbq',