merge new features

2026-05-27 19:19:11 +08:00
parent 886046a72b
commit 98af110531
37 changed files with 6405 additions and 993 deletions
@@ -1,7 +1,54 @@
+import 'package:dio/dio.dart';
 import 'api_service.dart';
+import '../core/exceptions/app_exception.dart';
 import '../data/models/share_model.dart';
 import '../core/utils/app_logger.dart';

+/// 分享授权对象类型。
+enum SharePrincipalType { user, group }
+
+/// 分享弹窗中搜索并加入的用户/用户组。
+class SharePrincipal {
+  final String id;
+  final String name;
+  final String? email;
+  final String? groupName;
+  final SharePrincipalType type;
+
+  const SharePrincipal({
+    required this.id,
+    required this.name,
+    required this.type,
+    this.email,
+    this.groupName,
+  });
+
+  factory SharePrincipal.userFromJson(Map<String, dynamic> json) {
+    final group = _asMap(json['group']);
+    return SharePrincipal(
+      id: json['id']?.toString() ?? '',
+      name: (json['nickname'] ?? json['email'] ?? json['id'] ?? '用户').toString(),
+      email: json['email']?.toString(),
+      groupName: group?['name']?.toString(),
+      type: SharePrincipalType.user,
+    );
+  }
+
+  factory SharePrincipal.groupFromJson(Map<String, dynamic> json) {
+    return SharePrincipal(
+      id: json['id']?.toString() ?? '',
+      name: (json['name'] ?? json['id'] ?? '用户组').toString(),
+      type: SharePrincipalType.group,
+    );
+  }
+
+  static Map<String, dynamic>? _asMap(dynamic value) {
+    if (value is Map<String, dynamic>) return value;
+    if (value is Map) return Map<String, dynamic>.from(value);
+    return null;
+  }
+}
+
 /// 分享服务
 class ShareService {
  /// 将文件系统路径转换为 cloudreve URI 格式
@@ -17,33 +64,98 @@ class ShareService {
    return 'cloudreve://my/$cleanPath';
  }

-  /// 创建分享链接
+  /// 创建分享链接。
+  ///
+  /// Cloudreve V4 接口为 PUT /share，核心字段包括 permissions、uri、
+  /// is_private、share_view、expire、price、password、show_readme。
  Future<String> createShare({
    required String uri,
+    Map<String, dynamic>? permissions,
    bool? isPrivate,
    bool? shareView,
    int? expire,
+    int? downloads,
    int? price,
    String? password,
    bool? showReadme,
  }) async {
    final data = <String, dynamic>{
-      'permissions': {'anonymous': 'BQ==', 'everyone': 'AQ=='},
+      'permissions': permissions ?? {'anonymous': 'BQ==', 'everyone': 'AQ=='},
      'uri': _toCloudreveUri(uri),
-      'is_private': ?isPrivate,
-      'share_view': ?shareView,
-      'expire': ?expire,
-      'price': ?price,
-      'password': ?password,
-      'show_readme': ?showReadme,
    };
-    // 当请求的接口为创建分享时, 逻辑上不适合走到 _parseResponse -> ApiResponse.fromJson 直接返回结果即可
+
+    if (isPrivate != null) data['is_private'] = isPrivate;
+    if (shareView != null) data['share_view'] = shareView;
+    if (expire != null) data['expire'] = expire;
+    if (downloads != null) data['downloads'] = downloads;
+    if (price != null) data['price'] = price;
+    if (password != null && password.isNotEmpty) data['password'] = password;
+    if (showReadme != null) data['show_readme'] = showReadme;
+
    final response = await ApiService.instance.put<Map<String, dynamic>>(
      '/share',
      data: data,
      isNoData: true,
    );
-    return response['data'] as String;
+    final raw = response['data'];
+    return raw?.toString() ?? '';
+  }
+
+  /// 搜索用户，用于分享权限显式授权。
+  Future<List<SharePrincipal>> searchUsers(String keyword) async {
+    final trimmed = keyword.trim();
+    if (trimmed.isEmpty) return const [];
+
+    final response = await ApiService.instance.get<dynamic>(
+      '/user/search',
+      queryParameters: {'keyword': trimmed},
+    );
+
+    return _extractList(response)
+        .whereType<Map>()
+        .map((e) => SharePrincipal.userFromJson(Map<String, dynamic>.from(e)))
+        .where((e) => e.id.isNotEmpty)
+        .toList();
+  }
+
+  /// 列出用户组，用于分享权限显式授权。
+  ///
+  /// Cloudreve Pro 才支持 /group/list，非 Pro 或无权限时返回 null。
+  /// 调用方据此决定是否提示用户。
+  Future<List<SharePrincipal>?> listGroups() async {
+    try {
+      final response = await ApiService.instance.get<dynamic>(
+        '/group/list',
+        silent404: true,
+      );
+
+      return _extractList(response)
+          .whereType<Map>()
+          .map((e) => SharePrincipal.groupFromJson(Map<String, dynamic>.from(e)))
+          .where((e) => e.id.isNotEmpty)
+          .toList();
+    } on DioException catch (e) {
+      if (e.response?.statusCode == 404) return null;
+      rethrow;
+    } on AppException catch (e) {
+      if (e.code == 404) return null;
+      rethrow;
+    }
+  }
+
+  List<dynamic> _extractList(dynamic value) {
+    if (value is List) return value;
+    if (value is Map) {
+      final data = value['data'];
+      if (data is List) return data;
+      final items = value['items'];
+      if (items is List) return items;
+      final groups = value['groups'];
+      if (groups is List) return groups;
+      final users = value['users'];
+      if (users is List) return users;
+    }
+    return const [];
  }

  /// 获取我的分享列表
@@ -55,11 +167,11 @@ class ShareService {
  }) async {
    final queryParams = <String, dynamic>{
      'page_size': pageSize,
-      'order_by': ?orderBy,
-      'order_direction': ?orderDirection,
-      'next_page_token': ?nextPageToken,
    };
-    // 请求方法为get, claude 写成post, fixed
+    if (orderBy != null) queryParams['order_by'] = orderBy;
+    if (orderDirection != null) queryParams['order_direction'] = orderDirection;
+    if (nextPageToken != null) queryParams['next_page_token'] = nextPageToken;
+
    return await ApiService.instance.get<Map<String, dynamic>>(
      '/share',
      queryParameters: queryParams,
@@ -79,13 +191,10 @@ class ShareService {
    if (ownerExtended != null) {
      queryParams['owner_extended'] = ownerExtended.toString();
    }
-    // 获取分享详情是 GET 请求
    final response = await ApiService.instance.get<Map<String, dynamic>>(
      '/share/info/$id',
      queryParameters: queryParams,
    );
-    // 获取分享详情返回的 response 已经经过 _parseResponse -> ApiResponse.fromJson 处理, 不需要再通过 ['data'] 获取数据
-    // return ShareModel.fromJson(response['data'] as Map<String, dynamic>);
    return ShareModel.fromJson(response);
  }

@@ -93,19 +202,26 @@ class ShareService {
  Future<String> editShare({
    required String id,
    required String uri,
+    Map<String, dynamic>? permissions,
    bool? isPrivate,
    String? password,
    bool? shareView,
    int? downloads,
    int? expire,
+    int? price,
+    bool? showReadme,
  }) async {
    final data = <String, dynamic>{
      'uri': uri,
-      'is_private': ?isPrivate,
-      'share_view': ?shareView,
-      'downloads': ?downloads,
-      'expire': ?expire,
    };
+
+    if (permissions != null) data['permissions'] = permissions;
+    if (isPrivate != null) data['is_private'] = isPrivate;
+    if (shareView != null) data['share_view'] = shareView;
+    if (downloads != null) data['downloads'] = downloads;
+    if (expire != null) data['expire'] = expire;
+    if (price != null) data['price'] = price;
+    if (showReadme != null) data['show_readme'] = showReadme;
    if (password != null && password.isNotEmpty) {
      data['password'] = password;
    }
@@ -116,7 +232,8 @@ class ShareService {
      data: data,
      isNoData: true,
    );
-    return response['data'] as String;
+    final raw = response['data'];
+    return raw?.toString() ?? '';
  }

  /// 删除分享