fix #655

app/plugins/bestfilmversion/__init__.py

@@ -386,33 +386,37 @@ class BestFilmVersion(_PluginBase):
             # 读取历史记录
             history = self.get_data('history') or []
 
-            all_item = []
+            # 媒体服务器类型，多个以,分隔
-            # 读取收藏
+            if not settings.MEDIASERVER:
-            if settings.MEDIASERVER == 'jellyfin':
-                self.jellyfin_get_items(all_item)
-            elif settings.MEDIASERVER == 'emby':
-                self.emby_get_items(all_item)
-            else:
-                resp = self.plex_get_watchlist()
-                if not resp:
                 return
-                all_item.extend(resp)
+            media_servers = settings.MEDIASERVER.split(',')
+
+            # 读取收藏
+            all_items = {}
+            for media_server in media_servers:
+                if media_server == 'jellyfin':
+                    all_items['jellyfin'] = self.jellyfin_get_items()
+                elif media_server == 'emby':
+                    all_items['emby'] = self.emby_get_items()
+                else:
+                    all_items['plex'] = self.plex_get_watchlist()
 
             def function(y, x):
                 return y if (x['Name'] in [i['Name'] for i in y]) else (lambda z, u: (z.append(u), z))(y, x)[1]
 
+            # 处理所有结果
+            for server, all_item in all_items.items():
                 # all_item 根据电影名去重
                 result = reduce(function, all_item, [])
-
                 for data in result:
                     # 检查缓存
                     if data.get('Name') in caches:
                         continue
 
                     # 获取详情
-                if settings.MEDIASERVER == 'jellyfin':
+                    if server == 'jellyfin':
                         item_info_resp = Jellyfin().get_iteminfo(itemid=data.get('Id'))
-                elif settings.MEDIASERVER == 'emby':
+                    elif server == 'emby':
                         item_info_resp = Emby().get_iteminfo(itemid=data.get('Id'))
                     else:
                         item_info_resp = self.plex_get_iteminfo(itemid=data.get('Id'))
@@ -468,13 +472,14 @@ class BestFilmVersion(_PluginBase):
         finally:
             lock.release()
 
-    def jellyfin_get_items(self, all_item):
+    def jellyfin_get_items(self) -> List[dict]:
         # 获取所有user
         users_url = "{HOST}Users?&apikey={APIKEY}"
         users = self.get_users(Jellyfin().get_data(users_url))
         if not users:
             logger.info(f"bestfilmversion/users_url: {users_url}")
-            return
+            return []
+        all_items = []
         for user in users:
             # 根据加入日期 降序排序
             url = "{HOST}Users/" + user + "/Items?SortBy=DateCreated%2CSortName" \
@@ -490,14 +495,16 @@ class BestFilmVersion(_PluginBase):
             resp = self.get_items(Jellyfin().get_data(url))
             if not resp:
                 continue
-            all_item.extend(resp)
+            all_items.extend(resp)
+        return all_items
 
-    def emby_get_items(self, all_item):
+    def emby_get_items(self) -> List[dict]:
         # 获取所有user
         get_users_url = "{HOST}Users?&api_key={APIKEY}"
         users = self.get_users(Emby().get_data(get_users_url))
         if not users:
-            return
+            return []
+        all_items = []
         for user in users:
             # 根据加入日期 降序排序
             url = "{HOST}emby/Users/" + user + "/Items?SortBy=DateCreated%2CSortName" \
@@ -512,7 +519,8 @@ class BestFilmVersion(_PluginBase):
             resp = self.get_items(Emby().get_data(url))
             if not resp:
                 continue
-            all_item.extend(resp)
+            all_items.extend(resp)
+        return all_items
 
     @staticmethod
     def get_items(resp: Response):
@@ -538,7 +546,7 @@ class BestFilmVersion(_PluginBase):
             return []
 
     @staticmethod
-    def plex_get_watchlist():
+    def plex_get_watchlist() -> List[dict]:
         # 根据加入日期 降序排序
         url = f"https://metadata.provider.plex.tv/library/sections/watchlist/all?type=1&sort=addedAt%3Adesc" \
               f"&X-Plex-Container-Start=0&X-Plex-Container-Size=50" \

app/plugins/dirmonitor/__init__.py

@@ -598,7 +598,7 @@ class DirMonitor(_PluginBase):
                                             'rows': 5,
                                             'placeholder': '每一行一个目录，支持两种配置方式：\n'
                                                            '监控目录\n'
-                                                           '监控目录:转移目的目录'
+                                                           '监控目录:转移目的目录（需同时在媒体库目录中配置该目的目录）'
                                         }
                                     }
                                 ]

app/plugins/mediasyncdel/__init__.py

@@ -718,16 +718,18 @@ class MediaSyncDel(_PluginBase):
         """
         # 读取历史记录
         history = self.get_data('history') or []
-
-        # 媒体服务器类型
-        media_server = settings.MEDIASERVER
-
         last_time = self.get_data("last_time")
         del_medias = []
+
+        # 媒体服务器类型，多个以,分隔
+        if not settings.MEDIASERVER:
+            return
+        media_servers = settings.MEDIASERVER.split(',')
+        for media_server in media_servers:
             if media_server == 'emby':
-            del_medias = self.parse_emby_log(last_time)
+                del_medias.extend(self.parse_emby_log(last_time))
             elif media_server == 'jellyfin':
-            del_medias = self.parse_jellyfin_log(last_time)
+                del_medias.extend(self.parse_jellyfin_log(last_time))
             elif media_server == 'plex':
                 # TODO plex解析日志
                 return

app/plugins/speedlimiter/__init__.py

@@ -383,9 +383,15 @@ class SpeedLimiter(_PluginBase):
                 return
         # 当前播放的总比特率
         total_bit_rate = 0
+        # 媒体服务器类型，多个以,分隔
+        if not settings.MEDIASERVER:
+            return
+        media_servers = settings.MEDIASERVER.split(',')
+        # 查询所有媒体服务器状态
+        for media_server in media_servers:
             # 查询播放中会话
             playing_sessions = []
-        if settings.MEDIASERVER == "emby":
+            if media_server == "emby":
                 req_url = "{HOST}emby/Sessions?api_key={APIKEY}"
                 try:
                     res = Emby().get_data(req_url)
@@ -396,6 +402,7 @@ class SpeedLimiter(_PluginBase):
                                 playing_sessions.append(session)
                 except Exception as e:
                     logger.error(f"获取Emby播放会话失败：{str(e)}")
+                    continue
                 # 计算有效比特率
                 for session in playing_sessions:
                     # 设置了不限速范围则判断session ip是否在不限速范围内
@@ -407,7 +414,7 @@ class SpeedLimiter(_PluginBase):
                     elif not IpUtils.is_private_ip(session.get("RemoteEndPoint")) \
                             and session.get("NowPlayingItem", {}).get("MediaType") == "Video":
                         total_bit_rate += int(session.get("NowPlayingItem", {}).get("Bitrate") or 0)
-        elif settings.MEDIASERVER == "jellyfin":
+            elif media_server == "jellyfin":
                 req_url = "{HOST}Sessions?api_key={APIKEY}"
                 try:
                     res = Jellyfin().get_data(req_url)
@@ -418,6 +425,7 @@ class SpeedLimiter(_PluginBase):
                                 playing_sessions.append(session)
                 except Exception as e:
                     logger.error(f"获取Jellyfin播放会话失败：{str(e)}")
+                    continue
                 # 计算有效比特率
                 for session in playing_sessions:
                     # 设置了不限速范围则判断session ip是否在不限速范围内
@@ -433,7 +441,7 @@ class SpeedLimiter(_PluginBase):
                         media_streams = session.get("NowPlayingItem", {}).get("MediaStreams") or []
                         for media_stream in media_streams:
                             total_bit_rate += int(media_stream.get("BitRate") or 0)
-        elif settings.MEDIASERVER == "plex":
+            elif media_server == "plex":
                 _plex = Plex().get_plex()
                 if _plex:
                     sessions = _plex.sessions()