oafuncs 0.0.93__py2.py3-none-any.whl → 0.0.95__py2.py3-none-any.whl

oafuncs/oa_nc.py

@@ -199,6 +199,12 @@ def merge(file_list, var_name=None, dim_name=None, target_filename=None):
         merge(file_list, var_name=['u', 'v'], dim_name='time', target_filename='merged.nc')
         merge(file_list, var_name=None, dim_name='time', target_filename='merged.nc')
     """
+    # 看看保存文件是单纯文件名还是包含路径的，如果有路径，需要确保路径存在
+    if target_filename is None:
+        target_filename = "merged.nc"
+    if not os.path.exists(os.path.dirname(str(target_filename))):
+        os.makedirs(os.path.dirname(str(target_filename)))
+    
     if isinstance(file_list, str):
         file_list = [file_list]
     
@@ -372,44 +378,56 @@ def rename(ncfile_path, old_name, new_name):
         print(f"An error occurred: {e}")
 
 
-def check(ncfile, if_delete=False):
+def check(ncfile: str, delete_switch: bool = False) -> bool:
     """
-    Description:
-        Check if the NetCDF file is corrupted using xarray.
+    Check if a NetCDF file is corrupted with enhanced error handling.
 
-    Parameters:
-        ncfile (str): The path to the NetCDF file.
-        if_delete (bool): Whether to delete the file if it is corrupted, default is False.
-
-    Returns:
-        bool: True if the file is not corrupted, False otherwise.
+    Handles HDF5 library errors gracefully without terminating program.
     """
+    is_valid = False
+
     if not os.path.exists(ncfile):
+        print(f"File missing: {ncfile}")
         return False
 
     try:
-        with xr.open_dataset(ncfile) as ds:
-            if len(ds.variables) > 0:
-                return True
+        # # 深度验证文件结构
+        # with nc.Dataset(ncfile, "r") as ds:
+        #     # 显式检查文件结构完整性
+        #     ds.sync()  # 强制刷新缓冲区
+        #     ds.close()  # 显式关闭后重新打开验证
+
+        # 二次验证确保变量可访问
+        with nc.Dataset(ncfile, "r") as ds_verify:
+            if not ds_verify.variables:
+                print(f"Empty variables: {ncfile}")
             else:
-                print(f"File {ncfile} is empty or corrupted.")
-                if if_delete:
-                    os.remove(ncfile)
-                    print(f"File {ncfile} has been deleted.")
-                return False
-    except OSError as e:
-        print(f"An error occurred while opening the file: {e}")
-        if if_delete:
-            os.remove(ncfile)
-            print(f"File {ncfile} has been deleted.")
-        return False
-    except Exception as e:
-        print(f"An unexpected error occurred: {e}")
-        if if_delete:
-            os.remove(ncfile)
-            print(f"File {ncfile} has been deleted.")
+                # 尝试访问元数据
+                _ = ds_verify.__dict__
+                # 抽样检查第一个变量
+                for var in ds_verify.variables.values():
+                    _ = var.shape  # 触发实际数据访问
+                    break
+                is_valid = True
+
+    except Exception as e:  # 捕获所有异常类型
+        print(f"HDF5 validation failed for {ncfile}: {str(e)}")
+        error_type = type(e).__name__
+        if "HDF5" in error_type or "h5" in error_type.lower():
+            print(f"Critical HDF5 structure error detected in {ncfile}")
+
+    # 安全删除流程
+    if not is_valid:
+        if delete_switch:
+            try:
+                os.remove(ncfile)
+                print(f"Removed corrupted: {ncfile}")
+            except Exception as del_error:
+                print(f"Delete failed: {ncfile} - {str(del_error)}")
         return False
 
+    return True
+
 
 def convert_longitude(ds, lon_name="longitude", convert=180):
     """

{oafuncs-0.0.93.dist-info → oafuncs-0.0.95.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: oafuncs
-Version: 0.0.93
+Version: 0.0.95
 Summary: Oceanic and Atmospheric Functions
 Home-page: https://github.com/Industry-Pays/OAFuncs
 Author: Kun Liu
@@ -27,9 +27,12 @@ Requires-Dist: pathlib
 Requires-Dist: requests
 Requires-Dist: bs4
 Requires-Dist: matplotlib
-Requires-Dist: Cartopy
 Requires-Dist: netCDF4
 Requires-Dist: xlrd
+Requires-Dist: geopandas
+Requires-Dist: Cartopy
+Requires-Dist: rasterio
+Requires-Dist: salem
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier

{oafuncs-0.0.93.dist-info → oafuncs-0.0.95.dist-info}/RECORD

@@ -1,15 +1,16 @@
 oafuncs/__init__.py,sha256=glcIlhQ9xSK4WtL58dq7Od2S3JPqsuEyhUQ-VWO8hOc,1426
 oafuncs/oa_cmap.py,sha256=azVg9QR_IlG9lXCCXXVs1LS1kFci8yjxDmb_VA_TdTQ,7408
-oafuncs/oa_data.py,sha256=40cZsixCaMDW2kg8kzh60bvD9PPPFn9ZXlQuPr7QhpQ,6563
+oafuncs/oa_data.py,sha256=Skhi70IY7T4lHd_eu3BxcSAfpXMH8SzUURR8gB7bj74,7679
 oafuncs/oa_draw.py,sha256=QypQp4vJIrbAyFddEVxd9K9Q4d85PRYqYQi9xDUmSZw,11150
 oafuncs/oa_file.py,sha256=EUL9osp7scZ3JTCwTUlKNfS1d_9xOsFrIkmFxzZAbdg,14233
 oafuncs/oa_help.py,sha256=loyzTbjU_0VpSIBvAEUA_tqxG8MVsO0xFE_2hgQ3zMw,4188
-oafuncs/oa_nc.py,sha256=CVZlv2EIehdgzrf1MHXYOUFcNkdOnmE1GYQYLldzrk0,17499
+oafuncs/oa_nc.py,sha256=pdc3vEI-5uFYnyzXHAIHNlyeci4MJkeWgKJwjHJ3olI,18343
 oafuncs/oa_python.py,sha256=Q-6UGGw_dJff7Ef8i87fsLPoGeHV5jBzfb-7HP4THR0,4018
-oafuncs/data_store/OAFuncs.png,sha256=Cc0TDi9H5mWBporXYw9K0bUWC0oSsI-Qj3FGAXUtGKM,3332020
+oafuncs/data_store/OAFuncs.png,sha256=Ekgwb6DNX_jNo3F7EIyIDWPZ0KUAFPEb2njzi_DcD3U,3439715
 oafuncs/oa_down/User_Agent-list.txt,sha256=pazxSip8_lphEBOPHG902zmIBUg8sBKXgmqp_g6j_E4,661062
 oafuncs/oa_down/__init__.py,sha256=kRX5eTUCbAiz3zTaQM1501paOYS_3fizDN4Pa0mtNUA,585
-oafuncs/oa_down/hycom_3hourly.py,sha256=4-DslP18BM2NOx_eHol4KzZNHE1uvvsf6E05fyB22FI,65536
+oafuncs/oa_down/hycom_3hourly.py,sha256=9ge6l8xMB-VBzCd1Fr4pIDZfUY_PbrBkWyvur0V27bs,64941
+oafuncs/oa_down/hycom_3hourly_20250129.py,sha256=zbUp5NNBMzDXEqSC0-Z9H_EoM6Fg-6tXymK0AXH9qRk,65553
 oafuncs/oa_down/idm.py,sha256=XfYCNnQWADxOhhJd-T8sNYN0nGiRrAs7zbQcsB5-UmI,1668
 oafuncs/oa_down/literature.py,sha256=2bF9gSKQbzcci9LcKE81j8JEjIJwON7jbwQB3gDDA3E,11331
 oafuncs/oa_down/test_ua.py,sha256=0IQq3NjqfNr7KkyjS_U-a4mYu-r-E7gzawwo4IfEa6Y,10851
@@ -21,8 +22,8 @@ oafuncs/oa_sign/scientific.py,sha256=a4JxOBgm9vzNZKpJ_GQIQf7cokkraV5nh23HGbmTYKw
 oafuncs/oa_tool/__init__.py,sha256=bNTy9abznDhg3k_Irx0YieXl37r-oDRMtTAxf57Stzs,487
 oafuncs/oa_tool/email.py,sha256=4lJxV_KUzhxgLYfVwYTqp0qxRugD7fvsZkXDe5WkUKo,3052
 oafuncs/oa_tool/parallel.py,sha256=kYbiIFDB7EoxasmXGSomaEDVUsg9Rfvdgbw93lBOY7o,3770
-oafuncs-0.0.93.dist-info/LICENSE.txt,sha256=rMtLpVg8sKiSlwClfR9w_Dd_5WubTQgoOzE2PDFxzs4,1074
-oafuncs-0.0.93.dist-info/METADATA,sha256=aZ1Ba8QueKY3H7zCpGwD_WErgfs6e-PreartuaZoI5s,3545
-oafuncs-0.0.93.dist-info/WHEEL,sha256=9Hm2OB-j1QcCUq9Jguht7ayGIIZBRTdOXD1qg9cCgPM,109
-oafuncs-0.0.93.dist-info/top_level.txt,sha256=bgC35QkXbN4EmPHEveg_xGIZ5i9NNPYWqtJqaKqTPsQ,8
-oafuncs-0.0.93.dist-info/RECORD,,
+oafuncs-0.0.95.dist-info/LICENSE.txt,sha256=rMtLpVg8sKiSlwClfR9w_Dd_5WubTQgoOzE2PDFxzs4,1074
+oafuncs-0.0.95.dist-info/METADATA,sha256=338EOy1HaTm46EOciOekPlYvoqta75nqX65vhvIQVFI,3618
+oafuncs-0.0.95.dist-info/WHEEL,sha256=9Hm2OB-j1QcCUq9Jguht7ayGIIZBRTdOXD1qg9cCgPM,109
+oafuncs-0.0.95.dist-info/top_level.txt,sha256=bgC35QkXbN4EmPHEveg_xGIZ5i9NNPYWqtJqaKqTPsQ,8
+oafuncs-0.0.95.dist-info/RECORD,,