diff --git a/client/lib/libphylum/actions/action_resource_mkdir.dart b/client/lib/libphylum/actions/action_resource_mkdir.dart index 521f4801..77ecffb9 100644 --- a/client/lib/libphylum/actions/action_resource_mkdir.dart +++ b/client/lib/libphylum/actions/action_resource_mkdir.dart @@ -66,9 +66,9 @@ class ResourceMkdirAction extends PhylumAction with JsonApiAction, ResourceCreat }; @override - FutureOr processResponse(PhylumAccount account, PhylumApiResponse response) async { + FutureOr processResponse(PhylumAccount account, ApiResponse response) async { if (response is PhylumApiSuccessResponse) { - await account.resourceRepository.parseResourceSummaryResponse(response.response); + await account.resourceRepository.parseResourceSummaryResponse(response.data); } } diff --git a/client/lib/libphylum/actions/action_resource_move.dart b/client/lib/libphylum/actions/action_resource_move.dart index 6a512e57..0773a13f 100644 --- a/client/lib/libphylum/actions/action_resource_move.dart +++ b/client/lib/libphylum/actions/action_resource_move.dart @@ -70,9 +70,9 @@ class ResourceMoveAction extends PhylumAction with JsonApiAction { }; @override - FutureOr processResponse(PhylumAccount account, PhylumApiResponse response) async { + FutureOr processResponse(PhylumAccount account, ApiResponse response) async { if (response is PhylumApiSuccessResponse) { - await account.resourceRepository.parseResourceSummaryResponse(response.response); + await account.resourceRepository.parseResourceSummaryResponse(response.data); } } diff --git a/client/lib/libphylum/actions/action_resource_rename.dart b/client/lib/libphylum/actions/action_resource_rename.dart index f83b6f5b..babf8a9d 100644 --- a/client/lib/libphylum/actions/action_resource_rename.dart +++ b/client/lib/libphylum/actions/action_resource_rename.dart @@ -71,9 +71,9 @@ class ResourceRenameAction extends PhylumAction with JsonApiAction { }; @override - FutureOr processResponse(PhylumAccount account, PhylumApiResponse response) async { + FutureOr processResponse(PhylumAccount account, ApiResponse response) async { if (response is PhylumApiSuccessResponse) { - await account.resourceRepository.parseResourceSummaryResponse(response.response); + await account.resourceRepository.parseResourceSummaryResponse(response.data); } } diff --git a/client/lib/libphylum/actions/action_resource_upload.dart b/client/lib/libphylum/actions/action_resource_upload.dart index 8f78373a..e8e38925 100644 --- a/client/lib/libphylum/actions/action_resource_upload.dart +++ b/client/lib/libphylum/actions/action_resource_upload.dart @@ -102,9 +102,9 @@ class ResourceUploadAction extends PhylumAction with FileUploadApiAction, Resour } @override - FutureOr processResponse(PhylumAccount account, PhylumApiResponse response) async { + FutureOr processResponse(PhylumAccount account, ApiResponse response) async { if (response is PhylumApiSuccessResponse) { - await account.resourceRepository.parseResourceSummaryResponse(response.response); + await account.resourceRepository.parseResourceSummaryResponse(response.data); } } diff --git a/client/lib/libphylum/phylum_account.dart b/client/lib/libphylum/phylum_account.dart index d559f8cb..fcca16e4 100644 --- a/client/lib/libphylum/phylum_account.dart +++ b/client/lib/libphylum/phylum_account.dart @@ -9,7 +9,7 @@ const _persistKeyUserEmail = 'userEmail'; const _persistKeyUserName = 'userName'; const _persistKeyUserHome = 'userHome'; -class PhylumAccount extends Account { +class PhylumAccount extends Account { late final db = AppDatabase(id: id); late final resourceRepository = ResourceRepository(account: this); diff --git a/client/lib/libphylum/phylum_api_types.dart b/client/lib/libphylum/phylum_api_types.dart index 70de1171..ae959f4b 100644 --- a/client/lib/libphylum/phylum_api_types.dart +++ b/client/lib/libphylum/phylum_api_types.dart @@ -4,25 +4,20 @@ import 'package:http/http.dart'; import 'package:offtheline/offtheline.dart'; import 'package:phylum/libphylum/phylum_account.dart'; -typedef PhylumAction = OfflineAction; -typedef PhylumActionStatus = ActionStatus; -typedef PhylumActionStatusError = ActionStatusError; +typedef PhylumAction = OfflineAction; +typedef PhylumActionQueue = ApiActionQueue; +typedef PhylumActionQueueState = ApiActionQueueState; -typedef PhylumActionQueue = ApiActionQueue; -typedef PhylumActionQueueState = ApiActionQueueState; - -abstract class PhylumApiResponse extends ApiResponse {} - -class PhylumApiSuccessResponse extends PhylumApiResponse { - final Map response; +class PhylumApiSuccessResponse extends ApiResponse { + final Map data; @override String get description => 'Success'; - PhylumApiSuccessResponse(this.response); + PhylumApiSuccessResponse(this.data); } -class PhylumApiErrorResponse extends PhylumApiResponse { +class PhylumApiErrorResponse extends ApiResponse { final int httpStatusCode; final String code; final String message; @@ -45,7 +40,7 @@ class PhylumApiErrorResponse extends PhylumApiResponse { } } -Future transformApiResponse(ApiRequest _, StreamedResponse response) async { +Future transformApiResponse(ApiRequest _, StreamedResponse response) async { final body = await response.bodyString(); if (response.statusCode >= 200 && response.statusCode < 300) { final apiResponse = (jsonDecode(body) as Map?) ?? const {}; diff --git a/client/lib/libphylum/repositories/resource_repository.dart b/client/lib/libphylum/repositories/resource_repository.dart index 00206b3f..f8f5d069 100644 --- a/client/lib/libphylum/repositories/resource_repository.dart +++ b/client/lib/libphylum/repositories/resource_repository.dart @@ -10,10 +10,10 @@ class ResourceRepository { ResourceRepository({required this.account}); - Future?> requestResource(String id) async { + Future requestResource(String id) async { final response = await account.apiClient.sendRequest(ResourceDetailRequest(id)); if (response is PhylumApiSuccessResponse) { - await parseResourceDetailsResponse(response.response); + await parseResourceDetailsResponse(response.data); return null; } return response; diff --git a/client/lib/ui/sync/action_queue_list.dart b/client/lib/ui/sync/action_queue_list.dart index d604f256..360e8ad5 100644 --- a/client/lib/ui/sync/action_queue_list.dart +++ b/client/lib/ui/sync/action_queue_list.dart @@ -14,7 +14,6 @@ class ActionQueueList extends StatelessWidget { shrinkWrap: true, itemCount: queue.length, itemBuilder: (context, i) { - print(queue[i]); return ActionView(action: queue[i]); }, ); @@ -27,14 +26,14 @@ class ActionView extends StatelessWidget { @override Widget build(BuildContext context) { - final state = context.select((state) => state.actions[action]!); + final state = context.select((state) => state.actions[action]!); return switch (state) { ActionStatusWaiting() || ActionStatusReady() || ActionStatusSubmitting() || ActionStatusDone() => buildSimpleInfoTile(context, state), - PhylumActionStatusError(error: final error) => buildErrorInfoTile(context, error), + ActionStatusError(error: final error) => buildErrorInfoTile(context, error), }; } - Widget buildSimpleInfoTile(BuildContext context, PhylumActionStatus status) { + Widget buildSimpleInfoTile(BuildContext context, ActionStatus status) { final account = context.read(); return ListTile( title: Text(action.generateDescription(account)), @@ -45,7 +44,7 @@ class ActionView extends StatelessWidget { ); } - Widget buildErrorInfoTile(BuildContext context, ApiResult error) { + Widget buildErrorInfoTile(BuildContext context, ApiResult error) { final account = context.read(); String description = error.description; if (error is PhylumApiErrorResponse) { diff --git a/client/pubspec.lock b/client/pubspec.lock index b3e3315b..8ff04e25 100644 --- a/client/pubspec.lock +++ b/client/pubspec.lock @@ -577,8 +577,8 @@ packages: dependency: "direct main" description: path: "." - ref: d8a65f2feb5caf6e6a829812631deed5e4bd42b5 - resolved-ref: d8a65f2feb5caf6e6a829812631deed5e4bd42b5 + ref: eb424e19dc4e23169e70a857c8d8011f4be528ff + resolved-ref: eb424e19dc4e23169e70a857c8d8011f4be528ff url: "https://codeberg.org/shroff/offtheline.git" source: git version: "0.15.0" diff --git a/client/pubspec.yaml b/client/pubspec.yaml index 33c7f54c..a0cf7ac1 100644 --- a/client/pubspec.yaml +++ b/client/pubspec.yaml @@ -21,7 +21,7 @@ dependencies: offtheline: git: url: https://codeberg.org/shroff/offtheline.git - ref: d8a65f2feb5caf6e6a829812631deed5e4bd42b5 + ref: eb424e19dc4e23169e70a857c8d8011f4be528ff open_file: path: path_provider: