oafuncs 0.0.77__py2.py3-none-any.whl → 0.0.79__py2.py3-none-any.whl

oafuncs/oa_down/test.py

@@ -1,45 +1,45 @@
 #!/usr/bin/env python
 # coding=utf-8
-'''
+"""
 Author: Liu Kun && 16031215@qq.com
 Date: 2024-12-01 19:32:25
 LastEditors: Liu Kun && 16031215@qq.com
-LastEditTime: 2024-12-01 19:50:32
+LastEditTime: 2024-12-10 11:16:36
 FilePath: \\Python\\My_Funcs\\OAFuncs\\oafuncs\\oa_down\\test.py
-Description:  
+Description:
 EditPlatform: vscode
 ComputerInfo: XPS 15 9510
 SystemInfo: Windows 11
 Python Version: 3.12
-'''
+"""
 
 import os
 import random
+import re
 
-txtfile = r'E:\Code\Python\My_Funcs\OAFuncs\oafuncs\oa_down\User_Agent-list.txt'
 
-with open(txtfile, 'r') as f:
-    lines = f.readlines()
-    # 去掉换行符和空行
-    lines = [line.strip() for line in lines if line.strip()]
-new_line = []
-for i in range(len(lines)):
-    if '/' in lines[i]:
-        new_line.append(lines[i])
-    else:
-        print(lines[i])
+def is_valid_user_agent(user_agent):
+    # 简单的正则表达式来检查User Agent的格式
+    # 这个正则表达式检查User Agent是否包含常见的浏览器信息格式
+    pattern = re.compile(
+        r"^(?:(?:Mozilla|Opera|Chrome|Safari|Edg|OPR)/[\d.]+)"
+        r"(?:\s(?:\(.*?\)))?"
+        r"(?:\s(?:Gecko|AppleWebKit|KHTML, like Gecko|Version|Edge|OPR)/[\d.]+)?"
+        r"(?:\s.*?(?:rv:|Version/|Ubuntu|Macintosh|Windows|X11|Linux|CrOS|FreeBSD|OpenBSD|NetBSD|iPhone|iPad|iPod|Android|BlackBerry|BB10|Mobile|Symbian|Windows Phone|IEMobile|Opera Mini|Opera Mobi|UCBrowser|MQQBrowser|baiduboxapp|baidubrowser|Safari|Firefox|MSIE|Trident|Edge|EdgA|Chrome|CriOS|Vivaldi|Sleipnir|Midori|ELinks|Lynx|w3m|Arora|Epiphany|Konqueror|Dillo|Netscape|SeaMonkey|K-Meleon|Camino|Iceape|Galeon|GranParadiso|Iceweasel|Firefox|Fennec|Conkeror|PaleMoon|Uzbl|QupZilla|Otter|Waterfox|Basilisk|Cyberfox|PaleMoon|GNU IceCat|GNU IceWeasel|IceCat|IceWeasel|Seamonkey|Iceape|Firefox|Epiphany|Web|Safari|Android|Mobile|BlackBerry|BB10|Tablet|Silk|Kindle|FxiOS|Focus|SamsungBrowser|browser|AppleWebKit|Puffin|DuckDuckGo|YaBrowser|Yandex|Amigo|NokiaBrowser|OviBrowser|OneBrowser|Chrome|Firefox|Safari|OPR|Coast|Mercury|Silk|Skyfire|IEMobile|Bolt|Jasmine|NativeHost|Crosswalk|TizenBrowser|SailfishBrowser|SamsungBrowser|Silk-Accelerated|UCBrowser|Quark|XiaoMi|OnePlus|Vivo|Oppo|Realme|Meizu|Lenovo|Huawei|ZTE|Alcatel|Sony|Nokia|LG|HTC|Asus|Acer|Motorola|Samsung)/[\d.]+)?$"
+    )
 
-newtxtfile = r'E:\Code\Python\My_Funcs\OAFuncs\oafuncs\oa_down\ua_list_new.txt'
-""" with open(newtxtfile, 'w') as f:
-    for line in new_line:
-        f.write(line + '\n') """
+    # 使用正则表达式匹配User Agent字符串
+    if pattern.match(user_agent):
+        return True
+    else:
+        return False
 
 
 def get_ua():
     current_dir = os.path.dirname(os.path.abspath(__file__))
-    ua_file_txt = os.path.join(current_dir, 'User_Agent-list.txt')
+    ua_file_txt = os.path.join(current_dir, "User_Agent-list.txt")
 
-    with open(ua_file_txt, 'r') as f:
+    with open(ua_file_txt, "r") as f:
         ua_list = f.readlines()
         # 去掉换行符和空行
         ua_list = [line.strip() for line in ua_list if line.strip()]
@@ -47,9 +47,6 @@ def get_ua():
     return random.choice(ua_list)
 
 
-print(get_ua())
-
-
 def get_ua_org():
     ua_list = [
         "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/39.0.2171.95 Safari/537.36 OPR/26.0.1656.60",
@@ -115,13 +112,40 @@ def get_ua_org():
         "NOKIA5700/UCWEB7.0.2.37/28/999",
         "Openwave/UCWEB7.0.2.37/28/999",
         "Openwave/UCWEB7.0.2.37/28/999",
-
     ]
-    with open(newtxtfile, 'w') as f:
+    with open(newtxtfile, "w") as f:
         for line in ua_list:
-            f.write(line + '\n')
+            f.write(line + "\n")
     # print(f'Using User-Agent: {ua}')
     ua = random.choice(ua_list)
     return ua
 
-# get_ua_org()
+
+# get_ua_org()
+
+if __name__ == "__main__":
+    txtfile = r"E:\Code\Python\My_Funcs\OAFuncs\oafuncs\oa_down\User_Agent-list.txt"
+
+    with open(txtfile, "r") as f:
+        lines = f.readlines()
+        # 去掉换行符和空行
+        lines = [line.strip() for line in lines if line.strip()]
+    """ new_line = []
+    for i in range(len(lines)):
+        if '/' in lines[i]:
+            new_line.append(lines[i])
+        else:
+            print(lines[i]) """
+
+    new_line = []
+    for line in lines:
+        if is_valid_user_agent(line):
+            # print(line)
+            new_line.append(line)
+        else:
+            print(f"Invalid User-Agent: {line}")
+
+    newtxtfile = r"E:\Code\Python\My_Funcs\OAFuncs\oafuncs\oa_down\ua_list_new.txt"
+    with open(newtxtfile, "w") as f:
+        for line in new_line:
+            f.write(line + "\n")

oafuncs/oa_draw.py

@@ -26,10 +26,54 @@ import xarray as xr
 from cartopy.mpl.ticker import LatitudeFormatter, LongitudeFormatter
 from mpl_toolkits.axes_grid1 import make_axes_locatable
 
-__all__ = ['create_gif', 'xy2lonlat', 'plot_contourf', 'plot_contourf_lonlat', 'plot_quiver', 'plot_contourf_cartopy']
+__all__ = ['fig_minus', 'create_gif', 'xy2lonlat', 'plot_contourf', 'plot_contourf_lonlat', 'plot_quiver', 'plot_contourf_cartopy']
 
 warnings.filterwarnings('ignore')
 
+def fig_minus(ax_x=None, ax_y=None, cbar=None, decimal=None, add_space=False):
+    '''
+    Description: 将坐标轴刻度中的负号替换为减号
+    
+    param {*} ax_x : x轴
+    param {*} ax_y : y轴
+    param {*} cbar : colorbar
+    param {*} decimal : 小数位数
+    param {*} add_space : 是否在非负数前面加空格
+    
+    return {*} ax_x or ax_y or cbar
+    '''
+    if ax_x is not None:
+        current_ticks = ax_x.get_xticks()
+    if ax_y is not None:
+        current_ticks = ax_y.get_yticks()
+    if cbar is not None:
+        current_ticks = cbar.get_ticks()
+    # 先判断是否需要加空格，如果要，先获取需要加的索引
+    if add_space:
+        index = 0
+        for _, tick in enumerate(current_ticks):
+            if tick >= 0:
+                index = _
+                break
+    if decimal is not None:
+        # my_ticks = [(round(float(iii), decimal)) for iii in my_ticks]
+        current_ticks = [f"{val:.{decimal}f}" if val != 0 else "0" for val in current_ticks]
+
+    out_ticks = [f"{val}".replace("-", "\u2212") for val in current_ticks]
+    if add_space:
+        # 在非负数前面加两个空格
+        out_ticks[index:] = ["  " + m for m in out_ticks[index:]]
+
+    if ax_x is not None:
+        ax_x.set_xticklabels(out_ticks)
+        return ax_x
+    if ax_y is not None:
+        ax_y.set_yticklabels(out_ticks)
+        return ax_y
+    if cbar is not None:
+        cbar.set_ticklabels(out_ticks)
+        return cbar
+
 # ** 将生成图片/已有图片制作成动图
 
 

oafuncs/oa_nc.py

@@ -153,9 +153,14 @@ def merge5nc(file_list, var_name=None, dim_name=None, target_filename=None):
 
     参数：
     file_list：nc 文件路径列表
-    var_name：要提取的变量名或变量名列表，默认为 None
+    var_name：要提取的变量名或变量名列表，默认为 None，表示提取所有变量
     dim_name：用于合并的维度名
     target_filename：合并后的目标文件名
+    
+    example: 
+    merge5nc(file_list, var_name='data', dim_name='time', target_filename='merged.nc')
+    merge5nc(file_list, var_name=['data1', 'data2'], dim_name='time', target_filename='merged.nc')
+    merge5nc(file_list, var_name=None, dim_name='time', target_filename='merged.nc')
     """
     # 初始化变量名列表
     var_names = None
@@ -208,67 +213,6 @@ def merge5nc(file_list, var_name=None, dim_name=None, target_filename=None):
         os.remove(target_filename)
     merged_data.to_netcdf(target_filename)
     print(f'File "{target_filename}" has been created.')
-    
-
-def merge5nc_his1(file_list, var_name, dim_name, target_filename):
-    """
-    批量提取 nc 文件中的某一变量，按照某一维度合并后写入新的 nc 文件。
-
-    参数：
-    file_list：nc 文件路径列表
-    var_name：要提取的变量名
-    dim_name：用于合并的维度名
-    target_filename：合并后的目标文件名
-    example: merge5nc(file_list, 'sst', 'time', 'merged_data.nc')
-    """
-    data_list = []
-    for i, file in enumerate(file_list):
-        print(f"\rReading file {i + 1}/{len(file_list)}...", end="")
-        ds = xr.open_dataset(file)
-        var = ds[var_name]
-        data_list.append(var)
-        ds.close()
-    print("\nMerging data...")
-    data = xr.concat(data_list, dim=dim_name)
-    print("Writing data to file...")
-    if os.path.exists(target_filename):
-        print("Warning: The target file already exists.")
-        print("Removing existing file...")
-        os.remove(target_filename)
-    data.to_netcdf(target_filename)
-
-
-def merge5nc_vars_his1(file_list, var_names, dim_name, target_filename):
-    """
-    批量提取 nc 文件中的两个变量，按照某一维度合并后写入新的 nc 文件。
-
-    参数：
-    file_list：nc 文件路径列表
-    var_names：要提取的变量名列表，例如 ['u', 'v']
-    dim_name：用于合并的维度名
-    target_filename：合并后的目标文件名
-
-    example: merge5nc_vars(file_list, ['u', 'v'], 'time', 'merged_data.nc')
-    """
-    data_lists = [[] for _ in var_names]
-    for i, file in enumerate(file_list):
-        print(f"\rReading file {i + 1}/{len(file_list)}...", end="")
-        ds = xr.open_dataset(file)
-        for j, var_name in enumerate(var_names):
-            var = ds[var_name]
-            data_lists[j].append(var)
-        ds.close()
-    print("\nMerging data...")
-    merged_data = {}
-    for var_name, data_list in zip(var_names, data_lists):
-        merged_data[var_name] = xr.concat(data_list, dim=dim_name)
-    print("Writing data to file...")
-    ds_merged = xr.Dataset(merged_data)
-    if os.path.exists(target_filename):
-        print("Warning: The target file already exists.")
-        print("Removing existing file...")
-        os.remove(target_filename)
-    ds_merged.to_netcdf(target_filename)
 
 
 def modify_var_value(nc_file_path, variable_name, new_value):

{oafuncs-0.0.77.dist-info → oafuncs-0.0.79.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: oafuncs
-Version: 0.0.77
+Version: 0.0.79
 Summary: My short description for my project.
 Home-page: https://github.com/Industry-Pays/OAFuncs
 Author: Kun Liu

{oafuncs-0.0.77.dist-info → oafuncs-0.0.79.dist-info}/RECORD

@@ -1,24 +1,24 @@
 oafuncs/__init__.py,sha256=2QiNjIIMtstD8y9HWlu23yiZGmmljkNUQknHEbnRwYI,673
 oafuncs/oa_cmap.py,sha256=LnHI6vMCoFFkMq4P3RgItmJ01Kx5MjjwwlhnaqhRLKI,7242
 oafuncs/oa_data.py,sha256=H9qZrUziOpc456iIL-1lBwSkBPApl2rlR-ajZg-mDMs,8119
-oafuncs/oa_draw.py,sha256=K5B_otgx7Bu5P6ZYipNt9C-uRI1w9oxwY1M1F0-kGuM,17329
+oafuncs/oa_draw.py,sha256=R5KONDf3Rp8STXepawtYUTdbcfAK1h6AYh8xiOfac3g,18860
 oafuncs/oa_file.py,sha256=iHgv0CTH4k_7YUnQ8-qQbLoz_f2lUmVhzGWQ2LkPFP8,11624
 oafuncs/oa_help.py,sha256=ppNktmtNzs15R20MD1bM7yImlTQ_ngMwvoIglePOKXA,1000
-oafuncs/oa_nc.py,sha256=7KSONwujhElQo1dfuEE4EpVfaqnWyILdGvsdqpKrnMI,14666
+oafuncs/oa_nc.py,sha256=7Fp65BJF_PtyaaxS5PS2apA-KkkQLhqh19Xlw__8XMo,12656
 oafuncs/oa_python.py,sha256=XPTP3o7zTFzfJR_YhsKfQksa3bSYwXsne9YxlJplCEA,3994
-oafuncs/oa_down/User_Agent-list.txt,sha256=j88ML0zwVibNj484ehurfZMX-PZ7G_1TwhwpcJZMIB0,884393
+oafuncs/oa_down/User_Agent-list.txt,sha256=pazxSip8_lphEBOPHG902zmIBUg8sBKXgmqp_g6j_E4,661062
 oafuncs/oa_down/__init__.py,sha256=nY5X7gM1jw7DJxyooR2UJSq4difkw-flz2Ucr_OuDbA,540
-oafuncs/oa_down/hycom_3hourly.py,sha256=wVJgA8SBMr0RurTz7AkI8d5pJ4sj1oWl__cnSPATiCA,50343
+oafuncs/oa_down/hycom_3hourly.py,sha256=pgONwoaLEKPQ4RjoFC4N2b7M6nIvKBgLNwk0XckfyRQ,56030
 oafuncs/oa_down/literature.py,sha256=dT3-7-beEzQ9mTP8LNV9Gf3q5Z1Pqqjc6FOS010HZeQ,17833
-oafuncs/oa_down/test.py,sha256=5sm73uduL0WO1GFv66ONIDLDAFavGz5qFoQpah5PbW8,8934
+oafuncs/oa_down/test.py,sha256=0IQq3NjqfNr7KkyjS_U-a4mYu-r-E7gzawwo4IfEa6Y,10851
 oafuncs/oa_sign/__init__.py,sha256=QKqTFrJDFK40C5uvk48GlRRbGFzO40rgkYwu6dYxatM,563
 oafuncs/oa_sign/meteorological.py,sha256=mLbupsZSq427HTfVbZMvIlFzDHwSzQAbK3X19o8anFY,6525
 oafuncs/oa_sign/ocean.py,sha256=xrW-rWD7xBWsB5PuCyEwQ1Q_RDKq2KCLz-LOONHgldU,5932
 oafuncs/oa_sign/scientific.py,sha256=a4JxOBgm9vzNZKpJ_GQIQf7cokkraV5nh23HGbmTYKw,5064
 oafuncs/oa_tool/__init__.py,sha256=IKOlqpWlb4cMDCtq2VKR_RTxQHDNqR_vfqqsOsp_lKQ,466
 oafuncs/oa_tool/email.py,sha256=4lJxV_KUzhxgLYfVwYTqp0qxRugD7fvsZkXDe5WkUKo,3052
-oafuncs-0.0.77.dist-info/LICENSE.txt,sha256=rMtLpVg8sKiSlwClfR9w_Dd_5WubTQgoOzE2PDFxzs4,1074
-oafuncs-0.0.77.dist-info/METADATA,sha256=66VNZ7aM1IFNy5H50VrBOMDlphZ0Mxr-gmBZVC6oAT4,22481
-oafuncs-0.0.77.dist-info/WHEEL,sha256=pxeNX5JdtCe58PUSYP9upmc7jdRPgvT0Gm9kb1SHlVw,109
-oafuncs-0.0.77.dist-info/top_level.txt,sha256=bgC35QkXbN4EmPHEveg_xGIZ5i9NNPYWqtJqaKqTPsQ,8
-oafuncs-0.0.77.dist-info/RECORD,,
+oafuncs-0.0.79.dist-info/LICENSE.txt,sha256=rMtLpVg8sKiSlwClfR9w_Dd_5WubTQgoOzE2PDFxzs4,1074
+oafuncs-0.0.79.dist-info/METADATA,sha256=0fQiVoR8HZQfISZClpFTyPKLXiwnTVA8Iq2Qvzxgj7U,22481
+oafuncs-0.0.79.dist-info/WHEEL,sha256=pxeNX5JdtCe58PUSYP9upmc7jdRPgvT0Gm9kb1SHlVw,109
+oafuncs-0.0.79.dist-info/top_level.txt,sha256=bgC35QkXbN4EmPHEveg_xGIZ5i9NNPYWqtJqaKqTPsQ,8
+oafuncs-0.0.79.dist-info/RECORD,,