Skip to content

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
  • Loading branch information
jxxghp committed Jul 10, 2023
1 parent ed4fc08 commit bfddd98
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 5 deletions.
9 changes: 7 additions & 2 deletions app/api/endpoints/dashboard.py
Original file line number Diff line number Diff line change
Expand Up @@ -82,11 +82,16 @@ def schedule(_: schemas.TokenPayload = Depends(verify_token)) -> Any:
continue
if not StringUtils.is_chinese(job.name):
continue
next_run = TimerUtils.time_difference(job.next_run_time)
if not next_run:
status = "已停止"
else:
status = "等待" if job.pending else "运行中"
schedulers.append(schemas.ScheduleInfo(
id=job.id,
name=job.name,
status="等待" if job.pending else "运行中",
next_run=TimerUtils.time_difference(job.next_run_time) or "已停止"
status=status,
next_run=next_run
))

return schedulers
6 changes: 3 additions & 3 deletions app/chain/search.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ def search_by_tmdbid(self, tmdbid: int, mtype: MediaType = None) -> List[Context
results = self.process(mediainfo=mediainfo)
# 保存眲结果
self.systemconfig.set(SystemConfigKey.SearchResults,
pickle.dumps(results or []))
return results or []
pickle.dumps(results))
return results

def search_by_title(self, title: str) -> List[TorrentInfo]:
"""
Expand Down Expand Up @@ -84,7 +84,7 @@ def browse(self, domain: str, keyword: str = None) -> List[TorrentInfo]:

def process(self, mediainfo: MediaInfo,
keyword: str = None,
no_exists: Dict[int, Dict[int, NotExistMediaInfo]] = None) -> Optional[List[Context]]:
no_exists: Dict[int, Dict[int, NotExistMediaInfo]] = None) -> List[Context]:
"""
根据媒体信息搜索种子资源,精确匹配,应用过滤规则,同时根据no_exists过滤本地已存在的资源
:param mediainfo: 媒体信息
Expand Down
2 changes: 2 additions & 0 deletions app/utils/timer.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@ def random_scheduler(num_executions: int = 1,

@staticmethod
def time_difference(input_datetime: datetime) -> str:
if not input_datetime:
return ""
current_datetime = datetime.datetime.now(datetime.timezone.utc).astimezone()
time_difference = input_datetime - current_datetime

Expand Down
20 changes: 20 additions & 0 deletions nginx.conf
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,26 @@ http {
proxy_pass http://backend_api;
}

location ~ ^/(api/v1/system/message|api/v1/system/progress/) {
# SSE MIME类型设置
default_type text/event-stream;

# 禁用缓存
add_header Cache-Control no-cache;
add_header X-Accel-Buffering no;

# 代理设置
proxy_pass http://backend_api;
proxy_http_version 1.1;
proxy_set_header Connection "";
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;

# 超时设置
proxy_read_timeout 3600s;
}

location /api {
# 后端API
proxy_pass http://backend_api;
Expand Down

0 comments on commit bfddd98

Please sign in to comment.