codfrm/MoviePilot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #124 from developer-wlj/wlj0807

Browse Source
This commit is contained in:
jxxghp 2023-08-15 17:46:08 +08:00 committed by GitHub
commit b1308501be
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/api/endpoints/system.py
View File

@ -112,11 +112,11 @@ def get_logging(token: str):
def log_generator(): def log_generator():
log_path = settings.LOG_PATH / 'moviepilot.log' log_path = settings.LOG_PATH / 'moviepilot.log'
# 读取文件末尾50行，不使用tailer模块 # 读取文件末尾50行，不使用tailer模块
with open(log_path, 'r') as f: with open(log_path, 'r', encoding='utf-8') as f:
for line in f.readlines()[-50:]: for line in f.readlines()[-50:]:
yield 'data: %s\n\n' % line yield 'data: %s\n\n' % line
while True: while True:
for text in tailer.follow(open(log_path, 'r')): for text in tailer.follow(open(log_path, 'r', encoding='utf-8')):
yield 'data: %s\n\n' % (text or '') yield 'data: %s\n\n' % (text or '')
time.sleep(1) time.sleep(1)

3
app/modules/plex/plex.py
View File

@ -159,7 +159,10 @@ class Plex(metaclass=Singleton):
videos = self._plex.library.search(title=title, year=year, libtype="show") videos = self._plex.library.search(title=title, year=year, libtype="show")
if not videos: if not videos:
return {} return {}
if isinstance(videos, list):
episodes = videos[0].episodes() episodes = videos[0].episodes()
else:
episodes = videos.episodes()
season_episodes = {} season_episodes = {}
for episode in episodes: for episode in episodes:
if season and episode.seasonNumber != int(season): if season and episode.seasonNumber != int(season):