refact: some codes

apps/base/utils.py

@@ -1,85 +1,67 @@
-# @Time    : 2023/8/14 01:10
-# @Author  : Lan
-# @File    : utils.py
-# @Software: PyCharm
 import datetime
 import uuid
 import os
 from fastapi import UploadFile, HTTPException
+from typing import Tuple, Optional
 
-from apps.base.depends import IPRateLimit
+from apps.base.dependencies import IPRateLimit
 from apps.base.models import FileCodes
 from core.settings import settings
 from core.utils import get_random_num, get_random_string, max_save_times_desc
 
 
-async def get_file_path_name(file: UploadFile):
-    """
-    获取文件路径和文件名
-    :param file:
-    :return: {
-        'path': 'share/data/2021/08/13',
-        'suffix': '.jpg',
-        'prefix': 'test',
-        'file_uuid': '44a83bbd70e04c8aa7fd93bfd8c88249',
-        'uuid_file_name': '44a83bbd70e04c8aa7fd93bfd8c88249.jpg',
-        'save_path': 'share/data/2021/08/13/44a83bbd70e04c8aa7fd93bfd8c88249.jpg'
-    }
-    """
+async def get_file_path_name(file: UploadFile) -> Tuple[str, str, str, str, str]:
+    """获取文件路径和文件名"""
     today = datetime.datetime.now()
     path = f"share/data/{today.strftime('%Y/%m/%d')}"
     prefix, suffix = os.path.splitext(file.filename)
-    file_uuid = f"{uuid.uuid4().hex}"
+    file_uuid = uuid.uuid4().hex
     uuid_file_name = f"{file_uuid}{suffix}"
     save_path = f"{path}/{uuid_file_name}"
     return path, suffix, prefix, uuid_file_name, save_path
 
 
-async def get_expire_info(expire_value: int, expire_style: str):
-    """
-    获取过期信息
-    :param expire_value:
-    :param expire_style:
-    :return: expired_at 过期时间, expired_count 可用次数, used_count 已用次数, code 随机码
-    """
-    expired_count, used_count, now, code = -1, 0, datetime.datetime.now(), None
-    if int(settings.max_save_seconds) > 0:
-        max_timedelta = datetime.timedelta(seconds=settings.max_save_seconds)
-        detail = await max_save_times_desc(settings.max_save_seconds)
-        detail = f'限制最长时间为 {detail[0]}，可换用其他方式'
-    else:
-        max_timedelta = datetime.timedelta(days=7)
-        detail = '限制最长时间为 7天，可换用其他方式'
-    if expire_style == 'day':
-        if datetime.timedelta(days=expire_value) > max_timedelta:
+async def get_expire_info(expire_value: int, expire_style: str) -> Tuple[Optional[datetime.datetime], int, int, str]:
+    """获取过期信息"""
+    expired_count, used_count = -1, 0
+    now = datetime.datetime.now()
+    code = None
+
+    max_timedelta = datetime.timedelta(seconds=settings.max_save_seconds) if settings.max_save_seconds > 0 else datetime.timedelta(days=7)
+    detail = await max_save_times_desc(settings.max_save_seconds) if settings.max_save_seconds > 0 else '7天'
+    detail = f'限制最长时间为 {detail[0]}，可换用其他方式'
+
+    expire_styles = {
+        'day': lambda: now + datetime.timedelta(days=expire_value),
+        'hour': lambda: now + datetime.timedelta(hours=expire_value),
+        'minute': lambda: now + datetime.timedelta(minutes=expire_value),
+        'count': lambda: (now + datetime.timedelta(days=1), expire_value),
+        'forever': lambda: (None, None),  # 修改这里
+    }
+
+    if expire_style in expire_styles:
+        result = expire_styles[expire_style]()
+        if isinstance(result, tuple):
+            expired_at, extra = result
+            if expire_style == 'count':
+                expired_count = extra
+            elif expire_style == 'forever':
+                code = await get_random_code(style='string')  # 移动到这里
+        else:
+            expired_at = result
+        if expired_at and expired_at - now > max_timedelta:
             raise HTTPException(status_code=403, detail=detail)
-        expired_at = now + datetime.timedelta(days=expire_value)
-    elif expire_style == 'hour':
-        if datetime.timedelta(hours=expire_value) > max_timedelta:
-            raise HTTPException(status_code=403, detail=detail)
-        expired_at = now + datetime.timedelta(hours=expire_value)
-    elif expire_style == 'minute':
-        if datetime.timedelta(minutes=expire_value) > max_timedelta:
-            raise HTTPException(status_code=403, detail=detail)
-        expired_at = now + datetime.timedelta(minutes=expire_value)
-    elif expire_style == 'count':
-        expired_at = now + datetime.timedelta(days=1)
-        expired_count = expire_value
-    elif expire_style == 'forever':
-        expired_at = None
-        code = await get_random_code(style='string')
     else:
         expired_at = now + datetime.timedelta(days=1)
+
     if not code:
         code = await get_random_code()
+
     return expired_at, expired_count, used_count, code
 
 
-async def get_random_code(style='num'):
-    """
-    获取随机字符串
-    :return:
-    """
+async def get_random_code(style='num') -> str:
+    """获取随机字符串"""
     while True:
         code = await get_random_num() if style == 'num' else await get_random_string()
         if not await FileCodes.filter(code=code).exists():