oafuncs 0.0.71__tar.gz → 0.0.72__tar.gz

{oafuncs-0.0.71 → oafuncs-0.0.72}/PKG-INFO

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

{oafuncs-0.0.71 → oafuncs-0.0.72}/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:45:18
 FilePath: \\Python\\My_Funcs\\OAFuncs\\oafuncs\\oa_down\\hycom_3hourly.py
 Description:
 EditPlatform: vscode
@@ -602,6 +602,31 @@ 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
+
+        return int(delta_t*15)
+    
+    max_timeout = calculate_wait_time(file_name)
+
     if check:
         if check_existing_file(filename):
             return
@@ -620,7 +645,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 → oafuncs-0.0.72}/oafuncs.egg-info/PKG-INFO

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

{oafuncs-0.0.71 → oafuncs-0.0.72}/setup.py

@@ -18,7 +18,7 @@ URL = 'https://github.com/Industry-Pays/OAFuncs'
 EMAIL = 'liukun0312@stu.ouc.edu.cn'
 AUTHOR = 'Kun Liu'
 REQUIRES_PYTHON = '>=3.9.0'
-VERSION = '0.0.71'
+VERSION = '0.0.72'
 
 # What packages are required for this module to be executed?
 REQUIRED = [