修复数据库迁移问题、新增环境变量读写
This commit is contained in:
143
models/group.py
143
models/group.py
@@ -1,5 +1,6 @@
|
||||
# my_project/models/group.py
|
||||
|
||||
from tokenize import group
|
||||
from typing import Optional, List, TYPE_CHECKING
|
||||
from sqlmodel import Field, Relationship, text, Column, func, DateTime
|
||||
from .base import BaseModel
|
||||
@@ -51,10 +52,17 @@ class Group(BaseModel, table=True):
|
||||
|
||||
@staticmethod
|
||||
async def create(
|
||||
group: "Group"
|
||||
group: Optional["Group"] = None,
|
||||
name: Optional[str] = None,
|
||||
policies: Optional[str] = None,
|
||||
max_storage: int = 0,
|
||||
share_enabled: bool = False,
|
||||
web_dav_enabled: bool = False,
|
||||
speed_limit: int = 0,
|
||||
options: Optional[dict] = None,
|
||||
) -> "Group":
|
||||
"""
|
||||
向数据库内添加用户组。
|
||||
向数据库内添加用户组。如果提供了 `group` 参数,则使用该对象,否则创建一个新的用户组对象。
|
||||
|
||||
:param group: 用户组对象
|
||||
:type group: Group
|
||||
@@ -63,12 +71,27 @@ class Group(BaseModel, table=True):
|
||||
"""
|
||||
|
||||
from .database import get_session
|
||||
import json
|
||||
|
||||
if not group:
|
||||
|
||||
if not name:
|
||||
raise ValueError("Group name is required.")
|
||||
|
||||
group = Group(
|
||||
name=name,
|
||||
policies=policies,
|
||||
max_storage=max_storage,
|
||||
share_enabled=share_enabled,
|
||||
web_dav_enabled=web_dav_enabled,
|
||||
speed_limit=speed_limit,
|
||||
options=json.dumps(options) if options else None,
|
||||
)
|
||||
|
||||
async for session in get_session():
|
||||
try:
|
||||
session.add(group)
|
||||
await session.commit()
|
||||
await session.refresh(group)
|
||||
except Exception as e:
|
||||
await session.rollback()
|
||||
raise e
|
||||
@@ -96,11 +119,111 @@ class Group(BaseModel, table=True):
|
||||
return None
|
||||
|
||||
async for session in get_session():
|
||||
statement = select(Group).where(Group.id == id)
|
||||
result = await session.exec(statement)
|
||||
group = result.one_or_none()
|
||||
|
||||
if group:
|
||||
try:
|
||||
statement = select(Group).where(Group.id == id)
|
||||
result = await session.exec(statement)
|
||||
group = result.one_or_none()
|
||||
|
||||
if group:
|
||||
return group
|
||||
else:
|
||||
return None
|
||||
except Exception as e:
|
||||
raise e
|
||||
|
||||
@staticmethod
|
||||
async def set(
|
||||
id: int,
|
||||
name: Optional[str] = None,
|
||||
policies: Optional[str] = None,
|
||||
max_storage: Optional[int] = None,
|
||||
share_enabled: Optional[bool] = None,
|
||||
web_dav_enabled: Optional[bool] = None,
|
||||
speed_limit: Optional[int] = None,
|
||||
options: Optional[str] = None
|
||||
) -> Optional["Group"]:
|
||||
"""
|
||||
更新用户组信息。
|
||||
|
||||
:param id: 用户组ID
|
||||
:type id: int
|
||||
:param name: 用户组名
|
||||
:type name: Optional[str]
|
||||
:param policies: 允许的策略ID列表,逗号分隔
|
||||
:type policies: Optional[str]
|
||||
:param max_storage: 最大存储空间(字节)
|
||||
:type max_storage: Optional[int]
|
||||
:param share_enabled: 是否允许创建分享
|
||||
:type share_enabled: Optional[bool]
|
||||
:param web_dav_enabled: 是否允许使用WebDAV
|
||||
:type web_dav_enabled: Optional[bool]
|
||||
:param speed_limit: 速度限制 (KB/s), 0为不限制
|
||||
:type speed_limit: Optional[int]
|
||||
:param options: 其他选项 (JSON格式)
|
||||
:type options: Optional[str]
|
||||
:return: 更新后的用户组对象或 None
|
||||
:rtype: Optional[Group]
|
||||
"""
|
||||
|
||||
from .database import get_session
|
||||
from sqlmodel import select
|
||||
|
||||
async for session in get_session():
|
||||
try:
|
||||
statement = select(Group).where(Group.id == id)
|
||||
result = await session.exec(statement)
|
||||
group = result.one_or_none()
|
||||
|
||||
if not group:
|
||||
raise ValueError(f"Group with id {id} not found.")
|
||||
|
||||
if name is not None:
|
||||
group.name = name
|
||||
if policies is not None:
|
||||
group.policies = policies
|
||||
if max_storage is not None:
|
||||
group.max_storage = max_storage
|
||||
if share_enabled is not None:
|
||||
group.share_enabled = share_enabled
|
||||
if web_dav_enabled is not None:
|
||||
group.web_dav_enabled = web_dav_enabled
|
||||
if speed_limit is not None:
|
||||
group.speed_limit = speed_limit
|
||||
if options is not None:
|
||||
group.options = options
|
||||
|
||||
session.add(group)
|
||||
await session.commit()
|
||||
|
||||
return group
|
||||
else:
|
||||
return None
|
||||
except Exception as e:
|
||||
await session.rollback()
|
||||
raise e
|
||||
|
||||
@staticmethod
|
||||
async def delete(
|
||||
id: int
|
||||
) -> None:
|
||||
"""
|
||||
删除用户组。
|
||||
|
||||
:param id: 用户组ID
|
||||
:type id: int
|
||||
"""
|
||||
from .database import get_session
|
||||
from sqlmodel import select
|
||||
|
||||
async for session in get_session():
|
||||
try:
|
||||
statement = select(Group).where(Group.id == id)
|
||||
result = await session.exec(statement)
|
||||
group = result.one_or_none()
|
||||
|
||||
if group is None:
|
||||
raise ValueError(f"Group with id {id} not found.")
|
||||
|
||||
await session.delete(group)
|
||||
await session.commit()
|
||||
except Exception as e:
|
||||
await session.rollback()
|
||||
raise e
|
||||
Reference in New Issue
Block a user