fix(auth): resolve conflicts

app/modules/filemanager/__init__.py

@@ -1106,7 +1106,9 @@ class FileManagerModule(_ModuleBase):
                 continue
             media_files = self.list_files(fileitem, True)
             if media_files:
-                ret_fileitems.extend(media_files)
+                for media_file in media_files:
+                    if f".{media_file.extension.lower()}" in settings.RMT_MEDIAEXT:
+                        ret_fileitems.append(media_file)
         return ret_fileitems
 
     def media_exists(self, mediainfo: MediaInfo, **kwargs) -> Optional[ExistMediaInfo]:

app/modules/filemanager/storages/alipan.py

@@ -159,6 +159,7 @@ class AliPan(StorageBase):
                             "updateTime": time.time(),
                         })
                         self.__update_params(data)
+                        self.__update_drives()
                         self.__init_aligo()
                 except Exception as e:
                     return {}, f"bizExt 解码失败：{str(e)}"
@@ -181,6 +182,17 @@ class AliPan(StorageBase):
         """
         return self.aligo.get_user()
 
+    def __update_drives(self):
+        """
+        更新用户存储根目录
+        """
+        drivers = self.aligo.list_my_drives()
+        for driver in drivers:
+            if driver.category == "resource":
+                self.__update_params({"resourceDriveId": driver.drive_id})
+            elif driver.category == "backup":
+                self.__update_params({"backDriveId": driver.drive_id})
+
     def __get_fileitem(self, fileinfo: BaseFile, parent: str = "/") -> schemas.FileItem:
         """
         获取文件信息
@@ -231,7 +243,7 @@ class AliPan(StorageBase):
             return [
                 schemas.FileItem(
                     storage=self.schema.value,
-                    fileid=fileitem.fileid,
+                    fileid="root",
                     drive_id=self.__auth_params.get("resourceDriveId"),
                     parent_fileid="root",
                     type="dir",
@@ -241,7 +253,7 @@ class AliPan(StorageBase):
                 ),
                 schemas.FileItem(
                     storage=self.schema.value,
-                    fileid=fileitem.fileid,
+                    fileid="root",
                     drive_id=self.__auth_params.get("backDriveId"),
                     parent_fileid="root",
                     type="dir",

app/modules/filemanager/storages/rclone.py

@@ -335,7 +335,7 @@ class Rclone(StorageBase):
             ret = subprocess.run(
                 [
                     'rclone', 'about',
-                    'MP:/', '--json'
+                    '/', '--json'
                 ],
                 capture_output=True,
                 startupinfo=self.__get_hidden_shell()