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

oafuncs/oa_down/hycom_3hourly.py

@@ -18,13 +18,15 @@ import os
 import random
 import time
 import warnings
-from concurrent.futures import ThreadPoolExecutor
+from concurrent.futures import ThreadPoolExecutor, as_completed
 from pathlib import Path
+from threading import Lock
 
 import matplotlib.pyplot as plt
 import numpy as np
 import pandas as pd
 import requests
+from bs4 import BeautifulSoup
 from rich import print
 from rich.progress import Progress
 
@@ -512,10 +514,13 @@ def get_ua():
         # 去掉换行符和空行
         ua_list = [line.strip() for line in ua_list if line.strip()]
 
+    # if current_platform == 'Linux':
+    #     ua_list = [line for line in ua_list if 'Linux' in line]
+
     return random.choice(ua_list)
 
 
-def get_proxy():
+def get_proxy_file():
     # 获取当前脚本的绝对路径
     script_dir = os.path.dirname(os.path.abspath(__file__))
     # 构建ip.txt的绝对路径
@@ -531,15 +536,62 @@ def get_proxy():
     return proxies
 
 
-def dlownload_file(target_url, store_path, file_name, check=False):
+def scrape_and_categorize_proxies(choose_protocol="http"):
+    url = "https://topproxylinks.com/"
+    # 发送HTTP请求获取网页内容
+    response = requests.get(url)
+    # 使用BeautifulSoup解析网页
+    soup = BeautifulSoup(response.text, "html.parser")
+
+    # 初始化字典来存储不同协议的代理
+    proxies_dict = {"http": [], "socks4": [], "socks5": []}
+
+    # 查找表格中的所有行
+    tbody = soup.find("tbody")
+
+    if tbody:
+        for row in tbody.find_all("tr"):
+            # 提取协议、代理和国家的单元格
+            cells = row.find_all("td")
+            protocol = cells[0].text.strip().lower()
+            proxy = cells[1].text.strip()
+
+            # 根据协议分类存储代理
+            if protocol in proxies_dict:
+                proxies_dict[protocol].append(proxy)
+
+    if choose_protocol in proxies_dict:
+        proxies_list = proxies_dict[choose_protocol]
+    else:
+        proxies_list = proxies_dict["http"]
+
+    return proxies_list
+
+def get_proxy():
+    ip_list = scrape_and_categorize_proxies(choose_protocol="http")
+    choose_ip = random.choice(ip_list)
+    proxies = {"http": f"http://{choose_ip}", "https": f"http://{choose_ip}"}
+    print(f'Using proxy: {proxies}')
+    return proxies
+
+
+def download_file(target_url, store_path, file_name, check=False):
+    # Check if the file exists
+    fname = Path(store_path) / file_name
+    if check:
+        if check_existing_file(fname):
+            count_dict["skip"] += 1
+            return
+    clear_existing_file(fname)
+
+    # -----------------------------------------------
     print(f"[bold #f0f6d0]Requesting {file_name}...")
     # 创建会话
     s = requests.Session()
     download_success = False
     request_times = 0
-    filename = Path(store_path) / file_name
 
-    def calculate_wait_time(time_str):
+    def calculate_wait_time(time_str, target_url):
         import re
 
         # 定义正则表达式，匹配YYYYMMDDHH格式的时间
@@ -561,16 +613,15 @@ def dlownload_file(target_url, store_path, file_name, check=False):
             delta_t = delta_t / 3 + 1
         else:
             delta_t = 1
+        # 单个要素最多等待5分钟，不宜太短，太短可能请求失败；也不宜太长，太长可能会浪费时间
+        num_var = int(target_url.count("var="))
+        if num_var <= 0:
+            num_var = 1
+        return int(delta_t * 5 * 60 * num_var)
 
-        return int(delta_t * 180)
+    max_timeout = calculate_wait_time(file_name, target_url)
+    print(f"[bold #912dbc]Max timeout: {max_timeout} seconds")
 
-    max_timeout = calculate_wait_time(file_name)
-
-    if check:
-        if check_existing_file(filename):
-            count_dict['skip'] += 1
-            return
-    clear_existing_file(filename)
     # print(f'Download_start_time: {datetime.datetime.now()}')
     download_time_s = datetime.datetime.now()
     order_list = ["1st", "2nd", "3rd", "4th", "5th", "6th", "7th", "8th", "9th", "10th"]
@@ -592,12 +643,16 @@ def dlownload_file(target_url, store_path, file_name, check=False):
             # 保存文件
             with open(filename, 'wb') as f:
                 f.write(response.content) """
-
-            response = s.get(target_url, headers=headers, stream=True, timeout=random.randint(5, max_timeout))  # 启用流式传输
+            
+            if find_proxy:
+                proxies = get_proxy()
+                response = s.get(target_url, headers=headers, proxies=proxies, stream=True, timeout=random.randint(5, max_timeout))
+            else:
+                response = s.get(target_url, headers=headers, stream=True, timeout=random.randint(5, max_timeout))  # 启用流式传输
             response.raise_for_status()  # 如果请求返回的不是200，将抛出HTTPError异常
 
             # 保存文件
-            with open(filename, "wb") as f:
+            with open(fname, "wb") as f:
                 print(f"[bold #96cbd7]Downloading {file_name}...")
                 for chunk in response.iter_content(chunk_size=1024):
                     if chunk:
@@ -605,12 +660,12 @@ def dlownload_file(target_url, store_path, file_name, check=False):
 
             f.close()
 
-            # print(f'\r文件 {filename} 下载成功', end="")
-            if os.path.exists(filename):
+            # print(f'\r文件 {fname} 下载成功', end="")
+            if os.path.exists(fname):
                 download_success = True
                 download_time_e = datetime.datetime.now()
                 download_delta = download_time_e - download_time_s
-                print(f"[#3dfc40]File [bold #dfff73]{filename} [#3dfc40]has been downloaded successfully, Time: [#39cbdd]{download_delta}")
+                print(f"[#3dfc40]File [bold #dfff73]{fname} [#3dfc40]has been downloaded successfully, Time: [#39cbdd]{download_delta}")
                 count_dict["success"] += 1
                 # print(f'Download_end_time: {datetime.datetime.now()}')
 
@@ -716,7 +771,7 @@ def prepare_url_to_download(var, lon_min=0, lon_max=359.92, lat_min=-80, lat_max
             file_name = f"HYCOM_{variable_info[var]['var_name']}_{download_time}.nc"
             if download_time_end is not None:
                 file_name = f"HYCOM_{variable_info[var]['var_name']}_{download_time}_{download_time_end}.nc"
-            dlownload_file(submit_url, store_path, file_name, check)
+            download_file(submit_url, store_path, file_name, check)
         else:
             varlist = [_ for _ in var]
             for key, value in var_group.items():
@@ -740,7 +795,7 @@ def prepare_url_to_download(var, lon_min=0, lon_max=359.92, lat_min=-80, lat_max
                     file_name = f"HYCOM_{key}_{download_time}.nc"
                     if download_time_end is not None:
                         file_name = f"HYCOM_{key}_{download_time}_{download_time_end}.nc"
-                dlownload_file(submit_url, store_path, file_name, check)
+                download_file(submit_url, store_path, file_name, check)
 
 
 def convert_full_name_to_short_name(full_name):
@@ -767,6 +822,22 @@ def download_task(var, time_str, time_str_end, lon_min, lon_max, lat_min, lat_ma
     prepare_url_to_download(var, lon_min, lon_max, lat_min, lat_max, time_str, time_str_end, depth, level, store_path, dataset_name, version_name, check)
 
 
+def done_callback(future, progress, task, total, counter_lock):
+    """
+    # 并行下载任务的回调函数
+    # 这个函数是为了并行下载而设置的，是必须的，直接调用direct_download并行下载会出问题
+
+    回调函数：当一个任务完成后，会调用这个函数，这样可以及时更新进度条，显示任务的完成情况。
+    本情况下，done_callback函数的作用是当一个任务完成后，更新进度条的进度，显示任务的完成情况。
+    这样，即使多个任务同时执行，也可以及时看到每个任务的完成情况，不会等到所有任务都完成才显示。
+    """
+
+    global parallel_counter
+    with counter_lock:
+        parallel_counter += 1
+        progress.update(task, advance=1, description=f"[cyan]Downloading... {parallel_counter}/{total}")
+
+
 def download_hourly_func(var, time_s, time_e, lon_min=0, lon_max=359.92, lat_min=-80, lat_max=90, depth=None, level=None, store_path=None, dataset_name=None, version_name=None, num_workers=None, check=False, ftimes=1):
     """
     Description:
@@ -791,6 +862,10 @@ def download_hourly_func(var, time_s, time_e, lon_min=0, lon_max=359.92, lat_min
     None
     """
     ymdh_time_s, ymdh_time_e = str(time_s), str(time_e)
+    if num_workers is not None and num_workers > 1:  # 如果使用多线程下载，用于进度条显示
+        global parallel_counter
+        parallel_counter = 0
+        counter_lock = Lock()  # 创建一个锁，线程安全的计数器
     if ymdh_time_s == ymdh_time_e:
         prepare_url_to_download(var, lon_min, lon_max, lat_min, lat_max, ymdh_time_s, None, depth, level, store_path, dataset_name, version_name)
     elif int(ymdh_time_s) < int(ymdh_time_e):
@@ -808,8 +883,10 @@ def download_hourly_func(var, time_s, time_e, lon_min=0, lon_max=359.92, lat_min
                     # 并行方式
                     with ThreadPoolExecutor(max_workers=num_workers) as executor:
                         futures = [executor.submit(download_task, var, time_str, None, lon_min, lon_max, lat_min, lat_max, depth, level, store_path, dataset_name, version_name, check) for time_str in time_list]
-                        for i, future in enumerate(futures):
-                            future.add_done_callback(lambda _: progress.update(task, advance=1, description=f"[cyan]Downloading... {i+1}/{len(time_list)}"))
+                        """ for i, future in enumerate(futures):
+                            future.add_done_callback(lambda _: progress.update(task, advance=1, description=f"[cyan]Downloading... {i+1}/{len(time_list)}")) """
+                        for feature in as_completed(futures):
+                            done_callback(feature, progress, task, len(time_list), counter_lock)
             else:
                 new_time_list = get_time_list(ymdh_time_s, ymdh_time_e, 3 * ftimes, "hour")
                 total_num = len(new_time_list)
@@ -824,8 +901,10 @@ def download_hourly_func(var, time_s, time_e, lon_min=0, lon_max=359.92, lat_min
                     # 并行方式
                     with ThreadPoolExecutor(max_workers=num_workers) as executor:
                         futures = [executor.submit(download_task, var, new_time_list[i], time_list[int(min(len(time_list) - 1, int(i * ftimes + ftimes - 1)))], lon_min, lon_max, lat_min, lat_max, depth, level, store_path, dataset_name, version_name, check) for i in range(total_num)]
-                        for i, future in enumerate(futures):
-                            future.add_done_callback(lambda _: progress.update(task, advance=1, description=f"[cyan]Downloading... {i+1}/{total_num}"))
+                        """ for i, future in enumerate(futures):
+                            future.add_done_callback(lambda _: progress.update(task, advance=1, description=f"[cyan]Downloading... {i+1}/{total_num}")) """
+                        for feature in as_completed(futures):
+                            done_callback(feature, progress, task, len(time_list), counter_lock)
     else:
         print("Please ensure the time_s is no more than time_e")
 
@@ -907,31 +986,30 @@ def download(var, time_s, time_e=None, lon_min=0, lon_max=359.92, lat_min=-80, l
         time_e = str(time_e)
         if len(time_e) == 8:
             time_e += "21"
-    
+
     global count_dict
-    count_dict = {
-        'success': 0,
-        'fail': 0,
-        'skip': 0,
-        'no_data': 0,
-        'total': 0,
-        'no_data_list': []
-    }
+    count_dict = {"success": 0, "fail": 0, "skip": 0, "no_data": 0, "total": 0, "no_data_list": []}
 
-    download_hourly_func(var, time_s, time_e, lon_min, lon_max, lat_min, lat_max, depth, level, store_path, dataset_name, version_name, num_workers, check, ftimes)
+    """ global current_platform
+    current_platform = platform.system() """
     
+    global find_proxy
+    find_proxy = False
+
+    download_hourly_func(var, time_s, time_e, lon_min, lon_max, lat_min, lat_max, depth, level, store_path, dataset_name, version_name, num_workers, check, ftimes)
+
     count_dict["total"] = count_dict["success"] + count_dict["fail"] + count_dict["skip"] + count_dict["no_data"]
-    
+
     print("[bold #ecdbfe]-" * 160)
     print(f"[bold #ff80ab]Total: {count_dict['total']}\nSuccess: {count_dict['success']}\nFail: {count_dict['fail']}\nSkip: {count_dict['skip']}")
-    if count_dict['fail'] > 0:
+    if count_dict["fail"] > 0:
         print("[bold #be5528]Please try again to download the failed data later")
-    if count_dict['no_data'] > 0:
-        if count_dict['no_data'] == 1:
+    if count_dict["no_data"] > 0:
+        if count_dict["no_data"] == 1:
             print(f"[bold #f90000]There is {count_dict['no_data']} data that does not exist in any dataset and version")
         else:
             print(f"[bold #f90000]These are {count_dict['no_data']} data that do not exist in any dataset and version")
-        for no_data in count_dict['no_data_list']:
+        for no_data in count_dict["no_data_list"]:
             print(f"[bold #d81b60]{no_data}")
     print("[bold #ecdbfe]-" * 160)
 
@@ -988,7 +1066,7 @@ def how_to_use():
 if __name__ == "__main__":
     # help(hycom3h.download)
     time_s, time_e = "2018070100", "2019123121"
-    merge_name = "2018_2024"
+    merge_name = f"{time_s}_{time_e}"  # 合并后的文件名
     root_path = r"G:\Data\HYCOM\3hourly"
     location_dict = {"west": 105, "east": 130, "south": 15, "north": 45}
     download_dict = {
@@ -1012,7 +1090,7 @@ if __name__ == "__main__":
     # if you wanna download all depth or level, set both False
     depth = None  # or 0-5000 meters
     level = None  # or 1-40 levels
-    num_workers = 1
+    num_workers = 3
 
     check = True
     ftimes = 1

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-0.0.78.dist-info → oafuncs-0.0.79.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: oafuncs
-Version: 0.0.78
+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.78.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=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=YcLBysnU1y-qEyNLn93KoeUvjmrfe31ViDSKURilr98,52365
+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.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,,
+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,,