Skip to content

Commit

Permalink
feat: 使用fastapi替换flask,解决多线程问题
Browse files Browse the repository at this point in the history
  • Loading branch information
hanxi committed Jul 13, 2024
1 parent ee6f4ee commit cd5869f
Show file tree
Hide file tree
Showing 8 changed files with 1,049 additions and 332 deletions.
614 changes: 536 additions & 78 deletions pdm.lock

Large diffs are not rendered by default.

9 changes: 6 additions & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ dependencies = [
"miservice-fork>=2.7.0",
"mutagen>=1.47.0",
"yt-dlp>=2024.07.01",
"flask[async]>=3.0.1",
"waitress>=3.0.0",
"flask-HTTPAuth>=4.8.0",
"uvicorn>=0.30.1",
"fastapi>=0.111.0",
"starlette>=0.37.2",
]
requires-python = ">=3.10"
readme = "README.md"
Expand Down Expand Up @@ -55,6 +55,9 @@ include = ["**/*.py", "**/*.pyi", "**/pyproject.toml"]
[tool.ruff.lint.pydocstyle]
convention = "google"

[tool.ruff.lint.flake8-bugbear]
extend-immutable-calls = ["fastapi.Depends", "fastapi.params.Depends", "fastapi.Query", "fastapi.params.Query"]

[tool.pdm.scripts]
lint = "ruff check ."
fmt = "ruff format ."
Expand Down
362 changes: 336 additions & 26 deletions requirements.txt

Large diffs are not rendered by default.

14 changes: 8 additions & 6 deletions xiaomusic/cli.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
import argparse
import asyncio

from xiaomusic import (
__version__,
)
import uvicorn

from xiaomusic import __version__
from xiaomusic.config import Config
from xiaomusic.httpserver import HttpInit
from xiaomusic.httpserver import app as HttpApp
from xiaomusic.xiaomusic import XiaoMusic

LOGO = r"""
Expand Down Expand Up @@ -74,8 +75,9 @@ def main():
config = Config.from_options(options)

xiaomusic = XiaoMusic(config)
loop = asyncio.get_event_loop()
loop.run_until_complete(xiaomusic.run_forever())
HttpInit(xiaomusic)

uvicorn.run(HttpApp, host="0.0.0.0", port=config.port)


if __name__ == "__main__":
Expand Down
Loading

0 comments on commit cd5869f

Please sign in to comment.