mdbq 3.7.15__tar.gz → 3.7.16__tar.gz

{mdbq-3.7.15 → mdbq-3.7.16}/PKG-INFO

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

{mdbq-3.7.15 → mdbq-3.7.16}/mdbq/aggregation/optimize_data.py

@@ -10,7 +10,17 @@ import logging
 """
 对指定数据库所有冗余数据进行清理
 """
-m_engine, username, password, host, port = default.get_mysql_engine(platform='Windows', hostname='xigua_lx', sql='mysql', local='remoto', config_file=None)
+hostname = 'xigua_lx'  # 正常情况下 spider_tg 只会在 xigua_lx 或者 xigua1 运行，且都指向主库
+local = 'remoto'
+targe_host = socket.gethostname()
+if targe_host == 'xigua_lx':
+    local = 'local'  # 直接指向局域网地址
+elif targe_host in ['localhost.localdomain', 'xigua1']:
+    targe_host = 'xigua1'  # 修正 Linux 系统用户名
+    local = 'local'  # 直接指向局域网地址
+elif targe_host == 'MacBookPro':
+    local = 'local'  # 直接指向局域网地址
+m_engine, username, password, host, port = default.get_mysql_engine(platform='Windows', hostname=hostname, sql='mysql', local=local, config_file=None)
 if not username:
     logger.info(f'找不到主机：')
 

{mdbq-3.7.15 → mdbq-3.7.16}/mdbq/aggregation/query_data.py

@@ -21,12 +21,24 @@ import concurrent.futures
 import traceback
 import logging
 import sys
+import socket
 
 """
 
 """
 dirname = os.path.join(os.path.realpath(os.path.dirname(sys.argv[0])), 'support')
-m_engine, username, password, host, port = default.get_mysql_engine(platform='Windows', hostname='xigua_lx', sql='mysql', local='remoto', config_file=None)
+hostname = 'xigua_lx'  # 正常情况下 spider_tg 只会在 xigua_lx 或者 xigua1 运行，且都指向主库
+local = 'remoto'
+targe_host = socket.gethostname()
+
+if targe_host == 'xigua_lx':
+    local = 'local'  # 直接指向局域网地址
+elif targe_host in ['localhost.localdomain', 'xigua1']:
+    targe_host = 'xigua1'  # 修正 Linux 系统用户名
+    local = 'local'  # 直接指向局域网地址
+elif targe_host == 'MacBookPro':
+    local = 'local'  # 直接指向局域网地址
+m_engine, username, password, host, port = default.get_mysql_engine(platform='Windows', hostname=hostname, sql='mysql', local=local, config_file=None)
 logger = logging.getLogger(__name__)
 
 

{mdbq-3.7.15 → mdbq-3.7.16}/mdbq/config/default.py

@@ -2,18 +2,10 @@
 import os
 import sys
 import json
-# import platform
-# import getpass
 import socket
 import logging
 from mdbq.mysql import mysql
 
-# if platform.system() == 'Windows':
-#     support_path = r'C:\数据中心2\support'
-# elif platform.system() == 'Darwin':
-#     support_path = f'/Users/{getpass.getuser()}/数据中心2/support'
-# else:
-#     support_path = '数据中心2/support'  # 没有用, 可以删
 support_path = os.path.join(os.path.realpath(os.path.dirname(sys.argv[0])), 'support')
 logger = logging.getLogger(__name__)
 

{mdbq-3.7.15 → mdbq-3.7.16}/mdbq/config/products.py

@@ -13,7 +13,18 @@ from numpy.ma.core import product
 天猫货品年份基准对照
 用于聚合数据，通过此数据表进一步可确定商品上架年月
 """
-m_engine, username, password, host, port = default.get_mysql_engine(platform='Windows', hostname='xigua_lx', sql='mysql', local='remoto', config_file=None)
+hostname = 'xigua_lx'  # 正常情况下 spider_tg 只会在 xigua_lx 或者 xigua1 运行，且都指向主库
+local = 'remoto'
+targe_host = socket.gethostname()
+
+if targe_host == 'xigua_lx':
+    local = 'local'  # 直接指向局域网地址
+elif targe_host in ['localhost.localdomain', 'xigua1']:
+    targe_host = 'xigua1'  # 修正 Linux 系统用户名
+    local = 'local'  # 直接指向局域网地址
+elif targe_host == 'MacBookPro':
+    local = 'local'  # 直接指向局域网地址
+m_engine, username, password, host, port = default.get_mysql_engine(platform='Windows', hostname=hostname, sql='mysql', local=local, config_file=None)
 if not username:
     print(f'找不到主机1：')
 

{mdbq-3.7.15 → mdbq-3.7.16}/mdbq/log/spider_logging.py

@@ -10,15 +10,6 @@ def setup_logging(reMoveOldHandler=True):
     """
     reMoveOldHandler: 替换根日志记录器的所有现有处理器
     """
-    # if platform.system() == 'Windows':
-    #     from mdbq.pbix import refresh_all
-    #     D_PATH = os.path.join(f'C:\\Users\\{getpass.getuser()}\\Downloads')
-    # elif platform.system() == 'Linux':
-    #     D_PATH = os.path.join(os.path.realpath(os.path.dirname(sys.argv[0])), 'Downloads')
-    #     if not os.path.exists(D_PATH):
-    #         os.makedirs(D_PATH)
-    # else:
-    #     D_PATH = os.path.join(f'/Users/{getpass.getuser()}/Downloads')
     D_PATH = os.path.join(os.path.realpath(os.path.dirname(sys.argv[0])))
 
     if not os.path.isdir(os.path.join(D_PATH, 'logfile')):

{mdbq-3.7.15 → mdbq-3.7.16}/mdbq/other/download_sku_picture.py

@@ -50,7 +50,19 @@ upload_path = os.path.join(D_PATH, '数据上传中心')  # 此目录位于下
 if not os.path.exists(upload_path):  # 数据中心根目录
     os.makedirs(upload_path)
 
-m_engine, username, password, host, port = default.get_mysql_engine(platform='Windows', hostname='xigua_lx', sql='mysql', local='remoto', config_file=None)
+hostname = 'xigua_lx'  # 正常情况下 spider_tg 只会在 xigua_lx 或者 xigua1 运行，且都指向主库
+local = 'remoto'
+targe_host = socket.gethostname()
+
+if targe_host == 'xigua_lx':
+    local = 'local'  # 直接指向局域网地址
+elif targe_host in ['localhost.localdomain', 'xigua1']:
+    targe_host = 'xigua1'  # 修正 Linux 系统用户名
+    local = 'local'  # 直接指向局域网地址
+elif targe_host == 'MacBookPro':
+    local = 'local'  # 直接指向局域网地址
+
+m_engine, username, password, host, port = default.get_mysql_engine(platform='Windows', hostname=hostname, sql='mysql', local=local, config_file=None)
 if not username:
     print(f'找不到主机：')
 

{mdbq-3.7.15 → mdbq-3.7.16}/mdbq/redis/getredis.py

@@ -18,7 +18,18 @@ import platform
 from decimal import Decimal
 import orjson
 
-m_engine, username, password, host, port = default.get_mysql_engine(platform='Windows', hostname='xigua_lx', sql='mysql', local='remoto', config_file=None)
+hostname = 'xigua_lx'  # 正常情况下 spider_tg 只会在 xigua_lx 或者 xigua1 运行，且都指向主库
+local = 'remoto'
+targe_host = socket.gethostname()
+
+if targe_host == 'xigua_lx':
+    local = 'local'  # 直接指向局域网地址
+elif targe_host in ['localhost.localdomain', 'xigua1']:
+    targe_host = 'xigua1'  # 修正 Linux 系统用户名
+    local = 'local'  # 直接指向局域网地址
+elif targe_host == 'MacBookPro':
+    local = 'local'  # 直接指向局域网地址
+m_engine, username, password, host, port = default.get_mysql_engine(platform='Windows', hostname=hostname, sql='mysql', local=local, config_file=None)
 
 # 获取当前模块的日志记录器
 logger = logging.getLogger(__name__)

{mdbq-3.7.15 → mdbq-3.7.16}/mdbq/spider/aikucun.py

@@ -38,7 +38,18 @@ else:
     D_PATH = str(pathlib.Path(f'/Users/{getpass.getuser()}/Downloads'))
 upload_path = os.path.join(D_PATH, '数据上传中心', '爱库存')  # 此目录位于下载文件夹
 
-m_engine, username, password, host, port = default.get_mysql_engine(platform='Windows', hostname='xigua_lx', sql='mysql', local='remoto', config_file=None)
+hostname = 'xigua_lx'  # 正常情况下 spider_tg 只会在 xigua_lx 或者 xigua1 运行，且都指向主库
+local = 'remoto'
+targe_host = socket.gethostname()
+
+if targe_host == 'xigua_lx':
+    local = 'local'  # 直接指向局域网地址
+elif targe_host in ['localhost.localdomain', 'xigua1']:
+    targe_host = 'xigua1'  # 修正 Linux 系统用户名
+    local = 'local'  # 直接指向局域网地址
+elif targe_host == 'MacBookPro':
+    local = 'local'  # 直接指向局域网地址
+m_engine, username, password, host, port = default.get_mysql_engine(platform='Windows', hostname=hostname, sql='mysql', local=local, config_file=None)
 print(username, password, host, port)
 # 实例化一个数据查询类，用来获取 cookies 表数据
 download = s_query.QueryDatas(username=username, password=password, host=host, port=port)

{mdbq-3.7.15 → mdbq-3.7.16}/mdbq.egg-info/PKG-INFO

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

{mdbq-3.7.15 → mdbq-3.7.16}/mdbq.egg-info/SOURCES.txt

@@ -7,7 +7,6 @@ mdbq.egg-info/SOURCES.txt
 mdbq.egg-info/dependency_links.txt
 mdbq.egg-info/top_level.txt
 mdbq/aggregation/__init__.py
-mdbq/aggregation/datashow_bak.py
 mdbq/aggregation/optimize_data.py
 mdbq/aggregation/query_data.py
 mdbq/bdup/__init__.py

{mdbq-3.7.15 → mdbq-3.7.16}/setup.py

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