oafuncs 0.0.71__py2.py3-none-any.whl → 0.0.73__py2.py3-none-any.whl

oafuncs/oa_down/hycom_3hourly.py

@@ -4,7 +4,7 @@
 Author: Liu Kun && 16031215@qq.com
 Date: 2024-11-01 10:31:09
 LastEditors: Liu Kun && 16031215@qq.com
-LastEditTime: 2024-12-01 11:21:49
+LastEditTime: 2024-12-01 11:48:43
 FilePath: \\Python\\My_Funcs\\OAFuncs\\oafuncs\\oa_down\\hycom_3hourly.py
 Description:
 EditPlatform: vscode
@@ -602,6 +602,33 @@ def dlownload_file(target_url, store_path, file_name, check=False):
     request_times = 0
     filename = Path(store_path) / file_name
 
+    def calculate_wait_time(time_str):
+        import re
+
+        # 定义正则表达式，匹配YYYYMMDDHH格式的时间
+        time_pattern = r'\d{10}'
+
+        # 定义两个字符串
+        # str1 = 'HYCOM_water_u_2018010100_2018010112.nc'
+        # str2 = 'HYCOM_water_u_2018010100.nc'
+
+        # 使用正则表达式查找时间
+        times_in_str = re.findall(time_pattern, time_str)
+
+        # 计算每个字符串中的时间数量
+        num_times_str = len(times_in_str)
+
+        if num_times_str > 1:
+            delta_t = datetime.datetime.strptime(times_in_str[1], '%Y%m%d%H') - datetime.datetime.strptime(times_in_str[0], '%Y%m%d%H')
+            delta_t = delta_t.total_seconds() / 3600
+            delta_t = delta_t / 3 + 1
+        else:
+            delta_t = 1
+
+        return int(delta_t*15)
+
+    max_timeout = calculate_wait_time(file_name)
+
     if check:
         if check_existing_file(filename):
             return
@@ -620,7 +647,7 @@ def dlownload_file(target_url, store_path, file_name, check=False):
         # 尝试下载文件
         try:
             headers = {'User-Agent': get_ua()}
-            response = s.get(target_url, headers=headers, timeout=random.randint(5, 15))
+            response = s.get(target_url, headers=headers, timeout=random.randint(5, max_timeout))
             response.raise_for_status()  # 如果请求返回的不是200，将抛出HTTPError异常
 
             # 保存文件

{oafuncs-0.0.71.dist-info → oafuncs-0.0.73.dist-info}/METADATA

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

{oafuncs-0.0.71.dist-info → oafuncs-0.0.73.dist-info}/RECORD

@@ -7,7 +7,7 @@ oafuncs/oa_help.py,sha256=ppNktmtNzs15R20MD1bM7yImlTQ_ngMwvoIglePOKXA,1000
 oafuncs/oa_nc.py,sha256=ALAYfqDy5lbUNJsTU29j6ZWkM4wgqQU3p2Fxn5pkvsQ,12102
 oafuncs/oa_python.py,sha256=XPTP3o7zTFzfJR_YhsKfQksa3bSYwXsne9YxlJplCEA,3994
 oafuncs/oa_down/__init__.py,sha256=a6rgxHQi8spvlI-TaVEqnrDNhYsKm5_IQf7ckAZ8U4w,603
-oafuncs/oa_down/hycom_3hourly.py,sha256=fSTAdHhWWTm7X_yx2RFg61FBvvJ6eROC9IANdcR20Wc,56524
+oafuncs/oa_down/hycom_3hourly.py,sha256=3acDSQqkqBlqFNZgoX_EDCIAw2C7YbZMTbrjz37n2x0,57430
 oafuncs/oa_down/literature.py,sha256=dT3-7-beEzQ9mTP8LNV9Gf3q5Z1Pqqjc6FOS010HZeQ,17833
 oafuncs/oa_down/refs_pdf.py,sha256=lgGKO2gQ0hRjuaBYOLeBgksJB_KXYpFcXMDwMQeYVkI,18719
 oafuncs/oa_sign/__init__.py,sha256=QKqTFrJDFK40C5uvk48GlRRbGFzO40rgkYwu6dYxatM,563
@@ -16,8 +16,8 @@ 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.71.dist-info/LICENSE.txt,sha256=rMtLpVg8sKiSlwClfR9w_Dd_5WubTQgoOzE2PDFxzs4,1074
-oafuncs-0.0.71.dist-info/METADATA,sha256=jIn5cFJMOTb0iQTdegUEdOIuFAqj5b8DhYh65RUYH7E,22531
-oafuncs-0.0.71.dist-info/WHEEL,sha256=pxeNX5JdtCe58PUSYP9upmc7jdRPgvT0Gm9kb1SHlVw,109
-oafuncs-0.0.71.dist-info/top_level.txt,sha256=bgC35QkXbN4EmPHEveg_xGIZ5i9NNPYWqtJqaKqTPsQ,8
-oafuncs-0.0.71.dist-info/RECORD,,
+oafuncs-0.0.73.dist-info/LICENSE.txt,sha256=rMtLpVg8sKiSlwClfR9w_Dd_5WubTQgoOzE2PDFxzs4,1074
+oafuncs-0.0.73.dist-info/METADATA,sha256=efEukumJFlRiwKg4419DQNU1ghKEktG-yRyqPiONlyA,22531
+oafuncs-0.0.73.dist-info/WHEEL,sha256=pxeNX5JdtCe58PUSYP9upmc7jdRPgvT0Gm9kb1SHlVw,109
+oafuncs-0.0.73.dist-info/top_level.txt,sha256=bgC35QkXbN4EmPHEveg_xGIZ5i9NNPYWqtJqaKqTPsQ,8
+oafuncs-0.0.73.dist-info/RECORD,,