oafuncs 0.0.76__py2.py3-none-any.whl → 0.0.78__py2.py3-none-any.whl

oafuncs/oa_down/test.py

@@ -4,7 +4,7 @@
 Author: Liu Kun && 16031215@qq.com
 Date: 2024-12-01 19:32:25
 LastEditors: Liu Kun && 16031215@qq.com
-LastEditTime: 2024-12-01 19:38:40
+LastEditTime: 2024-12-01 19:50:32
 FilePath: \\Python\\My_Funcs\\OAFuncs\\oafuncs\\oa_down\\test.py
 Description:  
 EditPlatform: vscode
@@ -16,6 +16,24 @@ Python Version: 3.12
 import os
 import random
 
+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])
+
+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') """
+
 
 def get_ua():
     current_dir = os.path.dirname(os.path.abspath(__file__))
@@ -99,6 +117,11 @@ def get_ua_org():
         "Openwave/UCWEB7.0.2.37/28/999",
 
     ]
+    with open(newtxtfile, 'w') as f:
+        for line in ua_list:
+            f.write(line + '\n')
     # print(f'Using User-Agent: {ua}')
     ua = random.choice(ua_list)
     return ua
+
+# get_ua_org()

oafuncs/oa_file.py

@@ -4,7 +4,7 @@
 Author: Liu Kun && 16031215@qq.com
 Date: 2024-09-17 15:07:13
 LastEditors: Liu Kun && 16031215@qq.com
-LastEditTime: 2024-11-21 13:07:54
+LastEditTime: 2024-12-02 10:33:19
 FilePath: \\Python\\My_Funcs\\OAFuncs\\oafuncs\\oa_file.py
 Description:
 EditPlatform: vscode
@@ -19,7 +19,43 @@ import os
 import re
 import shutil
 
-__all__ = ['link_file', 'copy_file', 'rename_files', 'make_folder', 'clear_folder', 'remove_empty_folders', 'remove', 'file_size']
+__all__ = ['find_file', 'link_file', 'copy_file', 'rename_file', 'make_folder', 'clear_folder', 'remove_empty_folders', 'remove', 'file_size']
+
+
+def find_file(parent_path, fname, mode='path'):
+    '''
+    description: 
+    param {*} parent_path: The parent path where the files are located
+    param {*} fname: The file name pattern to search for
+    param {*} mode: 'path' to return the full path of the files, 'file' to return only the file names
+    return {*} A list of file paths or file names if files are found, None otherwise
+    '''
+    def natural_sort_key(s):
+        """生成一个用于自然排序的键"""
+        return [int(text) if text.isdigit() else text.lower() for text in re.split('([0-9]+)', s)]
+
+    # 将parent_path和fname结合成完整的搜索路径
+    search_pattern = os.path.join(str(parent_path), fname)
+
+    # 使用glob模块查找所有匹配的文件
+    matched_files = glob.glob(search_pattern)
+
+    # 如果没有找到任何文件，则返回False
+    if not matched_files:
+        return None
+
+    # 在find_files函数中替换natsorted调用
+    matched_files = sorted(matched_files, key=natural_sort_key)
+
+    # 根据mode参数决定返回的内容
+    if mode == 'file':
+        # 只返回文件名
+        result = [os.path.basename(file) for file in matched_files]
+    else:  # 默认为'path'
+        # 返回文件的绝对路径
+        result = [os.path.abspath(file) for file in matched_files]
+
+    return result
 
 
 def link_file(src_pattern, dst):
@@ -113,14 +149,14 @@ def copy_file(src_pattern, dst):
         print(f'复制文件或目录并重命名: {src_file} -> {dst_file}')
 
 
-def rename_files(directory, old_str, new_str):
+def rename_file(directory, old_str, new_str):
     '''
     # 描述：重命名目录下的文件，支持通配符
     # 使用示例
     directory_path = r"E:\windfarm\CROCO_FILES"
     old_str = "croco"
     new_str = "roms"
-    rename_files(directory_path, old_str, new_str)
+    rename_file(directory_path, old_str, new_str)
     param      {*} directory # 目录
     param      {*} old_str # 要替换的字符串
     param      {*} new_str # 新字符串

oafuncs/oa_nc.py

@@ -1,18 +1,17 @@
 #!/usr/bin/env python
 # coding=utf-8
-'''
+"""
 Author: Liu Kun && 16031215@qq.com
 Date: 2024-09-17 14:58:50
 LastEditors: Liu Kun && 16031215@qq.com
-LastEditTime: 2024-11-21 13:05:51
+LastEditTime: 2024-12-06 14:16:56
 FilePath: \\Python\\My_Funcs\\OAFuncs\\oafuncs\\oa_nc.py
-Description:  
+Description:
 EditPlatform: vscode
 ComputerInfo: XPS 15 9510
 SystemInfo: Windows 11
 Python Version: 3.11
-'''
-
+"""
 
 import os
 
@@ -20,16 +19,16 @@ import netCDF4 as nc
 import numpy as np
 import xarray as xr
 
-__all__ = ['get_var', 'extract5nc', 'write2nc', 'merge5nc', 'modify_var_value', 'modify_var_attr', 'rename_var_or_dim', 'check_ncfile']
+__all__ = ["get_var", "extract5nc", "write2nc", "merge5nc", "modify_var_value", "modify_var_attr", "rename_var_or_dim", "check_ncfile"]
 
 
 def get_var(file, *vars):
-    '''
+    """
     description: 读取nc文件中的变量
     param {file: 文件路径, *vars: 变量名}
     example: datas = get_var(file_ecm, 'h', 't', 'u', 'v')
     return {datas: 变量数据}
-    '''
+    """
     ds = xr.open_dataset(file)
     datas = []
     for var in vars:
@@ -40,7 +39,7 @@ def get_var(file, *vars):
 
 
 def extract5nc(file, varname):
-    '''
+    """
     描述：
     1、提取nc文件中的变量
     2、将相应维度提取，建立字典
@@ -49,7 +48,7 @@ def extract5nc(file, varname):
     file: 文件路径
     varname: 变量名
     example: data, dimdict = extract5nc(file_ecm, 'h')
-    '''
+    """
     ds = xr.open_dataset(file)
     vardata = ds[varname]
     dims = vardata.dims
@@ -63,22 +62,22 @@ def extract5nc(file, varname):
 def _numpy_to_nc_type(numpy_type):
     """将NumPy数据类型映射到NetCDF数据类型"""
     numpy_to_nc = {
-        'float32': 'f4',
-        'float64': 'f8',
-        'int8': 'i1',
-        'int16': 'i2',
-        'int32': 'i4',
-        'int64': 'i8',
-        'uint8': 'u1',
-        'uint16': 'u2',
-        'uint32': 'u4',
-        'uint64': 'u8',
+        "float32": "f4",
+        "float64": "f8",
+        "int8": "i1",
+        "int16": "i2",
+        "int32": "i4",
+        "int64": "i8",
+        "uint8": "u1",
+        "uint16": "u2",
+        "uint32": "u4",
+        "uint64": "u8",
     }
-    return numpy_to_nc.get(str(numpy_type), 'f4')  # 默认使用 'float32'
+    return numpy_to_nc.get(str(numpy_type), "f4")  # 默认使用 'float32'
 
 
 def write2nc(file, data, varname, coords, mode):
-    '''
+    """
     description: 写入数据到nc文件
     参数：
     file: 文件路径
@@ -87,16 +86,16 @@ def write2nc(file, data, varname, coords, mode):
     coords: 坐标，字典，键为维度名称，值为坐标数据
     mode: 写入模式，'w'为写入，'a'为追加
     example: write2nc(r'test.nc', data, 'data', {'time': np.linspace(0, 120, 100), 'lev': np.linspace(0, 120, 50)}, 'a')
-    '''
+    """
     # 判断mode是写入还是追加
-    if mode == 'w':
+    if mode == "w":
         if os.path.exists(file):
             os.remove(file)
             print("Warning: File already exists. Deleting it.")
-    elif mode == 'a':
+    elif mode == "a":
         if not os.path.exists(file):
             print("Warning: File doesn't exist. Creating a new file.")
-            mode = 'w'
+            mode = "w"
 
     # 打开 NetCDF 文件
     with nc.Dataset(file, mode, format="NETCDF4") as ncfile:
@@ -146,65 +145,74 @@ def write2nc(file, data, varname, coords, mode):
             raise ValueError("Number of dimensions does not match the data shape.")
 
 
-def merge5nc(file_list, var_name, dim_name, target_filename):
+def merge5nc(file_list, var_name=None, dim_name=None, target_filename=None):
     """
-    批量提取 nc 文件中的某一变量，按照某一维度合并后写入新的 nc 文件。
+    批量提取 nc 文件中的变量，按照某一维度合并后写入新的 nc 文件。
+    如果 var_name 是字符串，则认为是单变量；如果是列表，且只有一个元素，也是单变量；
+    如果列表元素大于1，则是多变量；如果 var_name 是 None，则合并所有变量。
 
     参数：
     file_list：nc 文件路径列表
-    var_name：要提取的变量名
+    var_name：要提取的变量名或变量名列表，默认为 None，表示提取所有变量
     dim_name：用于合并的维度名
     target_filename：合并后的目标文件名
-    example: merge5nc(file_list, 'sst', 'time', 'merged_data.nc')
+    
+    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')
     """
-    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)
+    # 初始化变量名列表
+    var_names = None
+
+    # 判断 var_name 是单变量、多变量还是合并所有变量
+    if var_name is None:
+        # 获取第一个文件中的所有变量名
+        ds = xr.open_dataset(file_list[0])
+        var_names = list(ds.variables.keys())
         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(file_list, var_names, dim_name, target_filename):
-    """
-    批量提取 nc 文件中的两个变量，按照某一维度合并后写入新的 nc 文件。
-
-    参数：
-    file_list：nc 文件路径列表
-    var_names：要提取的变量名列表，例如 ['u', 'v']
-    dim_name：用于合并的维度名
-    target_filename：合并后的目标文件名
+    elif isinstance(var_name, str):
+        var_names = [var_name]
+    elif isinstance(var_name, list):
+        var_names = var_name
+    else:
+        raise ValueError("var_name must be a string, a list of strings, or None")
+
+    # 初始化合并数据字典
+    merged_data = {}
 
-    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):
+        for var_name in var_names:
             var = ds[var_name]
-            data_lists[j].append(var)
+            # 如果变量包含合并维度，则合并它们
+            if dim_name in var.dims:
+                if var_name not in merged_data:
+                    merged_data[var_name] = [var]
+                else:
+                    merged_data[var_name].append(var)
+            # 如果变量不包含合并维度，则仅保留第一个文件中的值
+            else:
+                if var_name not in merged_data:
+                    merged_data[var_name] = 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)
+    for var_name in merged_data:
+        if isinstance(merged_data[var_name], list):
+            merged_data[var_name] = xr.concat(merged_data[var_name], dim=dim_name)
+
+    merged_data = xr.Dataset(merged_data)
+
     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)
+    merged_data.to_netcdf(target_filename)
+    print(f'File "{target_filename}" has been created.')
 
 
 def modify_var_value(nc_file_path, variable_name, new_value):
@@ -220,7 +228,7 @@ def modify_var_value(nc_file_path, variable_name, new_value):
     """
     try:
         # Open the NetCDF file
-        dataset = nc.Dataset(nc_file_path, 'r+')
+        dataset = nc.Dataset(nc_file_path, "r+")
         # Get the variable to be modified
         variable = dataset.variables[variable_name]
         # Modify the value of the variable
@@ -243,7 +251,7 @@ def modify_var_attr(nc_file_path, variable_name, attribute_name, attribute_value
     example: modify_var_attr('test.nc', 'data', 'long_name', 'This is a test variable.')
     """
     try:
-        ds = nc.Dataset(nc_file_path, 'r+')
+        ds = nc.Dataset(nc_file_path, "r+")
         if variable_name not in ds.variables:
             raise ValueError(f"Variable '{variable_name}' not found in the NetCDF file.")
 
@@ -272,7 +280,7 @@ def rename_var_or_dim(ncfile_path, old_name, new_name):
     example: rename_var_or_dim('test.nc', 'time', 'ocean_time')
     """
     try:
-        with nc.Dataset(ncfile_path, 'r+') as dataset:
+        with nc.Dataset(ncfile_path, "r+") as dataset:
             # If the old name is not found as a variable or dimension, print a message
             if old_name not in dataset.variables and old_name not in dataset.dimensions:
                 print(f"Variable or dimension {old_name} not found in the file.")
@@ -299,7 +307,7 @@ def check_ncfile(ncfile, if_delete=False):
         return False
 
     try:
-        with nc.Dataset(ncfile, 'r') as f:
+        with nc.Dataset(ncfile, "r") as f:
             # 确保f被使用，这里我们检查文件中变量的数量
             if len(f.variables) > 0:
                 return True
@@ -322,8 +330,6 @@ def check_ncfile(ncfile, if_delete=False):
         return False
 
 
-if __name__ == '__main__':
-
+if __name__ == "__main__":
     data = np.random.rand(100, 50)
-    write2nc(r'test.nc', data,
-             'data', {'time': np.linspace(0, 120, 100), 'lev': np.linspace(0, 120, 50)}, 'a')
+    write2nc(r"test.nc", data, "data", {"time": np.linspace(0, 120, 100), "lev": np.linspace(0, 120, 50)}, "a")

{oafuncs-0.0.76.dist-info → oafuncs-0.0.78.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: oafuncs
-Version: 0.0.76
+Version: 0.0.78
 Summary: My short description for my project.
 Home-page: https://github.com/Industry-Pays/OAFuncs
 Author: Kun Liu
@@ -9,9 +9,6 @@ License: MIT
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.6
-Classifier: Programming Language :: Python :: 3.7
-Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
@@ -267,6 +264,12 @@ oafuncs.oa_nc.write2nc(r'I:\test.nc', data,
   
   - oa_file
     
+    - find_file
+      
+      2024/12/02更新
+      
+      查找满足条件的所有文件
+    
     - link_file
       
       2024/10/28更新
@@ -279,9 +282,9 @@ oafuncs.oa_nc.write2nc(r'I:\test.nc', data,
       
       复制文件
     
-    - rename_files
+    - rename_file
       
-      2024/10/28更新
+      2024/12/02更新
       
       按一定规则重命名文件（可多个）
     

{oafuncs-0.0.76.dist-info → oafuncs-0.0.78.dist-info}/RECORD

@@ -1,25 +1,24 @@
 oafuncs/__init__.py,sha256=2QiNjIIMtstD8y9HWlu23yiZGmmljkNUQknHEbnRwYI,673
-oafuncs/oa_cmap.py,sha256=iSKk4f_GsGUV3nyzgnw5SdG2c5mgAWULaO-EsMd_vF8,4981
+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_file.py,sha256=rUfxlks9uR5B9_TBPJFnNswfDF0lRm_ZBDUwIjYtf9U,10250
+oafuncs/oa_file.py,sha256=iHgv0CTH4k_7YUnQ8-qQbLoz_f2lUmVhzGWQ2LkPFP8,11624
 oafuncs/oa_help.py,sha256=ppNktmtNzs15R20MD1bM7yImlTQ_ngMwvoIglePOKXA,1000
-oafuncs/oa_nc.py,sha256=ALAYfqDy5lbUNJsTU29j6ZWkM4wgqQU3p2Fxn5pkvsQ,12102
+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=smLA5Xxg99VL0obpNo0tawilh4qDNvP2UK0h1Zve4ZA,878144
-oafuncs/oa_down/__init__.py,sha256=a6rgxHQi8spvlI-TaVEqnrDNhYsKm5_IQf7ckAZ8U4w,603
-oafuncs/oa_down/hycom_3hourly.py,sha256=wVJgA8SBMr0RurTz7AkI8d5pJ4sj1oWl__cnSPATiCA,50343
+oafuncs/oa_down/User_Agent-list.txt,sha256=j88ML0zwVibNj484ehurfZMX-PZ7G_1TwhwpcJZMIB0,884393
+oafuncs/oa_down/__init__.py,sha256=nY5X7gM1jw7DJxyooR2UJSq4difkw-flz2Ucr_OuDbA,540
+oafuncs/oa_down/hycom_3hourly.py,sha256=YcLBysnU1y-qEyNLn93KoeUvjmrfe31ViDSKURilr98,52365
 oafuncs/oa_down/literature.py,sha256=dT3-7-beEzQ9mTP8LNV9Gf3q5Z1Pqqjc6FOS010HZeQ,17833
-oafuncs/oa_down/refs_pdf.py,sha256=lgGKO2gQ0hRjuaBYOLeBgksJB_KXYpFcXMDwMQeYVkI,18719
-oafuncs/oa_down/test.py,sha256=9HTGKrQ8V2YVKsvBoVsuG7W-z8BurLGFBKUuf_LP94o,8256
+oafuncs/oa_down/test.py,sha256=5sm73uduL0WO1GFv66ONIDLDAFavGz5qFoQpah5PbW8,8934
 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.76.dist-info/LICENSE.txt,sha256=rMtLpVg8sKiSlwClfR9w_Dd_5WubTQgoOzE2PDFxzs4,1074
-oafuncs-0.0.76.dist-info/METADATA,sha256=trxZK-YWRi4peCMjXY6EwxdfPLc1Gx09fctBK2ajkzg,22531
-oafuncs-0.0.76.dist-info/WHEEL,sha256=pxeNX5JdtCe58PUSYP9upmc7jdRPgvT0Gm9kb1SHlVw,109
-oafuncs-0.0.76.dist-info/top_level.txt,sha256=bgC35QkXbN4EmPHEveg_xGIZ5i9NNPYWqtJqaKqTPsQ,8
-oafuncs-0.0.76.dist-info/RECORD,,
+oafuncs-0.0.78.dist-info/LICENSE.txt,sha256=rMtLpVg8sKiSlwClfR9w_Dd_5WubTQgoOzE2PDFxzs4,1074
+oafuncs-0.0.78.dist-info/METADATA,sha256=FIrrAy9-BXd05CDev0zlo6FtEiy3WZFYCn58hSBWiyE,22481
+oafuncs-0.0.78.dist-info/WHEEL,sha256=pxeNX5JdtCe58PUSYP9upmc7jdRPgvT0Gm9kb1SHlVw,109
+oafuncs-0.0.78.dist-info/top_level.txt,sha256=bgC35QkXbN4EmPHEveg_xGIZ5i9NNPYWqtJqaKqTPsQ,8
+oafuncs-0.0.78.dist-info/RECORD,,