mdbq 2.1.3__tar.gz → 2.1.5__tar.gz

{mdbq-2.1.3 → mdbq-2.1.5}/PKG-INFO

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

{mdbq-2.1.3 → mdbq-2.1.5}/mdbq/company/copysh.py

@@ -21,6 +21,7 @@ from mdbq.config import set_support
 from mdbq.config import products
 from mdbq.mysql import mysql
 from mdbq.pbix import refresh_all
+from mdbq.other import sku_picture
 warnings.filterwarnings('ignore')
 
 
@@ -361,6 +362,15 @@ def main():
             dp.upload_df(service_databases=[{'company': 'mysql'}])
             dp.date_table(service_databases=[{'company': 'mysql'}])  # 因为日期表不受 days 参数控制，因此单独更新日期表
             dp.other_table(service_databases=[{'company': 'mysql'}])  # 上传 support 文件夹下的 主推商品.csv
+            if datetime.datetime.now().day in [1, 3, 7, 9, 12, 16, 19, 22, 25, 27]:
+                sku_picture.download_spu(
+                    service_name='company',
+                    database='mysql',
+                    db_name='属性设置2',
+                    table_name='商品spu素材下载记录',
+                    col_name='商品图片',
+                    save_path=os.path.join(f'\\\\192.168.1.198\\时尚事业部\\01.运营部\\天猫报表\\其他文件', '商品id_商家编码_图片'),
+                )
 
             # 此操作用于修改 .copysh_conf 文件，将 ch_record 改为 false (更新完成)
             w = update_conf.UpdateConf()

{mdbq-2.1.3 → mdbq-2.1.5}/mdbq/config/products.py

@@ -126,8 +126,10 @@ class Products:
                     df=df,
                     db_name='属性设置2',
                     table_name='货品年份基准',
+                    move_insert = False,
                     df_sql=False,  # 值为 True 时使用 df.to_sql 函数上传整个表, 不会排重
                     drop_duplicates=True,  # 值为 True 时检查重复数据再插入，反之直接上传，会比较慢
+                    icm_update=[],
                     service_database=service_database,  # 用来追踪处理进度
                 )
 
@@ -149,6 +151,15 @@ def main():
 if __name__ == '__main__':
     product_id = '696017020186'
     p = Products()
-    # p.to_mysql(service_databases=[{'home_lx': 'mysql'}, {'company': 'mysql'}])
     year = p.market_date(product_id=product_id)
-    print(year)
+    print(f'{product_id}:  {year}')
+
+    p.to_mysql(service_databases=[
+        {
+            'home_lx': 'mysql'
+        },
+        {
+            'company': 'mysql'
+        }
+    ]
+    )

{mdbq-2.1.3 → mdbq-2.1.5}/mdbq/mysql/mysql.py

@@ -68,7 +68,7 @@ class MysqlUpload:
 
         return wrapper
 
-    # @try_except
+    @try_except
     def df_to_mysql(self, df, table_name, db_name='远程数据源', icm_update=[], service_database={'home_lx': 'mysql'}, move_insert=False, df_sql=False, drop_duplicates=False, filename=None, count=None, json_path=None, reset_id=False):
         """
         将 df 写入数据库
@@ -249,11 +249,12 @@ class MysqlUpload:
                     if drop_duplicates:  # 查重插入
                         sql = "SELECT %s FROM %s WHERE %s" % (cols, table_name, condition)
                         # sql = f"SELECT {cols} FROM `{table_name}` WHERE `创建时间` = '2014-09-19 14:32:33'"
-                        # print(sql)
                         cursor.execute(sql)
                         result = cursor.fetchall()  # 获取查询结果, 有结果返回 list 表示数据已存在(不重复插入)，没有则返回空 tuple
+                        # print(result)
                         if not result:  # 数据不存在则插入
                             sql = f"INSERT INTO `{table_name}` ({cols}) VALUES (%s);" % (values)
+                            # print(sql)
                             cursor.execute(sql)
                         # else:
                         #     print(f'重复数据不插入: {condition[:50]}...')

{mdbq-2.1.3 → mdbq-2.1.5}/mdbq/other/sku_picture.py

@@ -21,15 +21,20 @@ from mdbq.config import set_support
 from mdbq.config import get_myconf
 from mdbq.mysql import mysql
 from mdbq.mysql import s_query
-import ua_sj
+from mdbq.other import ua_sj
 import requests
 
 import io
 from openpyxl import load_workbook
 from openpyxl.drawing.image import Image
 from openpyxl.utils import get_column_letter
+from setuptools.sandbox import save_path
 
 warnings.filterwarnings('ignore')
+""" 
+用来下载商品spu/sku图片素材
+"""
+
 
 if platform.system() == 'Windows':
     D_PATH = os.path.normpath(f'C:\\Users\\{getpass.getuser()}\\Downloads')
@@ -502,10 +507,8 @@ class DownloadPicture():
         self.download = s_query.QueryDatas(username=username, password=password, host=host, port=port)
         self.df = pd.DataFrame()
         self.headers = {'User-Agent': ua_sj.get_ua()}
-        self.save_path = os.path.join(D_PATH, 'sku图片链接')
+        self.save_path = None
         self.filename = ''
-        if not os.path.exists(self.save_path):
-            os.mkdir(self.save_path)
         self.local_file = ''
         self.finish_download = []
 
@@ -532,8 +535,8 @@ class DownloadPicture():
         self.df = pd.read_excel(self.local_file, header=0, engine='openpyxl')
 
     def download_data(self):
-        if not os.path.exists(self.save_path):
-            os.mkdir(self.save_path)
+        # if not os.path.exists(self.save_path):
+        #     os.mkdir(self.save_path)
         dict_data = self.df.to_dict('records')
         num = len(dict_data)
         i = 0
@@ -557,7 +560,8 @@ class DownloadPicture():
             i += 1
             time.sleep(0.5)
 
-    def download_data_from_local(self, col_name='sku图片链接'):
+    def download_data_from_local(self, col_name='sku图片链接', save_path=os.path.join(D_PATH, 'sku图片链接')):
+        self.save_path = save_path
         if not os.path.exists(self.save_path):
             os.mkdir(self.save_path)
         dict_data = self.df.to_dict('records')
@@ -583,7 +587,8 @@ class DownloadPicture():
             i += 1
             time.sleep(0.5)
 
-    def download_from_df(self, col_name='商品图片'):
+    def download_from_df(self, col_name='商品图片', save_path=os.path.join(D_PATH, '商品id_商家编码_图片')):
+        self.save_path = save_path
         if not os.path.exists(self.save_path):
             os.mkdir(self.save_path)
         dict_data = self.df.to_dict('records')
@@ -914,7 +919,7 @@ def download_sku(service_name='company', database='mysql', db_name='属性设置
     )  # 3. 回传数据库
 
 
-def download_spu(service_name='company', database='mysql', db_name='属性设置2', table_name='商品spu素材下载记录', col_name='商品图片'):
+def download_spu(service_name='company', database='mysql', db_name='属性设置2', table_name='商品spu素材下载记录', col_name='商品图片', save_path=os.path.join(D_PATH, '商品id_商家编码_图片')):
     """
 
     """
@@ -1008,10 +1013,10 @@ def download_spu(service_name='company', database='mysql', db_name='属性设置
     if len(df) > 0:
         #  5. 实例化一个下载器类，并下载数据
         d = DownloadPicture(service_name=service_name)
-        d.save_path = os.path.join(D_PATH, '商品id_商家编码_图片')  # 下载图片到本地时的存储位置
+        d.save_path = save_path  # 下载图片到本地时的存储位置
         d.filename = f'{db_name}_{table_name}.xlsx'
         d.df = df
-        d.download_from_df(col_name=col_name)
+        d.download_from_df(col_name=col_name, save_path=save_path)
         df['获取与下载'] = df.apply(lambda x: '已下载' if x['商品id'] in d.finish_download else x['获取与下载'], axis=1)
 
         # 6. 回传数据库
@@ -1035,4 +1040,11 @@ if __name__ == '__main__':
     # main2(service_name='home_lx', database='mysql')
     # main3()
     # download_sku(service_name='company', database='mysql', db_name='属性设置2', table_name='商品素材下载记录')
-    download_spu(service_name='company', database='mysql', db_name='属性设置2', table_name='商品spu素材下载记录', col_name='商品图片')
+    download_spu(
+        service_name='company',
+        database='mysql',
+        db_name='属性设置2',
+        table_name='商品spu素材下载记录',
+        col_name='商品图片',
+        save_path=os.path.join(D_PATH, '1商品id_商家编码_图片'),
+    )

{mdbq-2.1.3 → mdbq-2.1.5}/mdbq.egg-info/PKG-INFO

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

{mdbq-2.1.3 → mdbq-2.1.5}/setup.py

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