Merge pull request #124 from developer-wlj/wlj0807

app/api/endpoints/system.py

@@ -112,11 +112,11 @@ def get_logging(token: str):
     def log_generator():
         log_path = settings.LOG_PATH / 'moviepilot.log'
         # 读取文件末尾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:]:
                 yield 'data: %s\n\n' % line
         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 '')
             time.sleep(1)
 

app/modules/plex/plex.py

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