Merge branch 'Dev/v2' into Dev/v2

Author: remi-martin

l10n/app_en.arb

@@ -195,6 +195,12 @@
     "categoryUpload_takePhoto": "Take Photo",
     "categoryUpload_takeVideo": "Take Video",
 
+    "uploadList_title": "Upload Status",
+    "uploadList_uploading": "Uploading",
+    "uploadList_history": "History",
+
+    "uploadList_empty": "Empty",
+
 
     "setDefaultCategory_select": "Please select an album or sub-album which will become the new root album.",
     "setDefaultCategory_title": "Default Album",
@@ -364,8 +370,8 @@
     "imageOptions_edit": "Edit",
     "imageOptions_download": "Download",
     "imageOptions_share": "Share",
-    "imageOptions_addFavorites": "Add favorites",
-    "imageOptions_removeFavorites": "Remove favorites",
+    "imageOptions_addFavorites": "Add to favorites",
+    "imageOptions_removeFavorites": "Remove from favorites",
     "imageOptions_setAlbumImage": "Set Album Thumbnail",
 
 
@@ -692,6 +698,7 @@
     "imageUploadCompleted_title": "Upload Completed",
     "imageUploadCompleted_message": "photo uploaded to your Piwigo server.",
     "imageUploadCompleted_message1": "photos uploaded to your Piwigo server.",
+    "imageUploadCompleted_warning": "some of your photos could not be uploaded.",
 
 
     "uploadError_title": "Upload Error",

lib/api/albums.dart

@@ -14,6 +14,7 @@ Map<String, dynamic> tryParseJson(String data) {
     return json.decode(data);
   } on FormatException catch (e) {
     debugPrint('Invalid json data');
+    debugPrint(data);
     int start = data.indexOf('{');
     int end = data.lastIndexOf('}');
     String parsedData = data.substring(start, end + 1);
@@ -213,6 +214,7 @@ Future<ApiResult<bool>> editAlbum({required String name, required int albumId, S
     'name': name,
     'comment': description,
   });
+
   try {
     Response response = await ApiClient.post(
       data: formData,

lib/api/images.dart

@@ -47,7 +47,7 @@ Future<ApiResult<ImageModel>> getImage(int imageId) async {
   return ApiResult(error: ApiErrors.error);
 }
 
-Future<ApiResult<List<ImageModel>>> fetchImages(int albumID, int page) async {
+Future<ApiResult<List<ImageModel>>> fetchImages(int albumID, [int page = 0]) async {
   Map<String, dynamic> queries = {
     'format': 'json',
     'method': 'pwg.categories.getImages',
@@ -61,7 +61,7 @@ Future<ApiResult<List<ImageModel>>> fetchImages(int albumID, int page) async {
     Response response = await ApiClient.get(queryParameters: queries);
 
     if (response.statusCode == 200) {
-      var jsonImages = json.decode(response.data)["result"]["images"];
+      var jsonImages = json.decode(response.data)['result']['images'];
       List<ImageModel> images = List<ImageModel>.from(
         jsonImages.map((image) => ImageModel.fromJson(image)),
       );
@@ -78,10 +78,12 @@ Future<ApiResult<List<ImageModel>>> fetchImages(int albumID, int page) async {
 
 Future<ApiResult<Map>> searchImages(String searchQuery, [int page = 0]) async {
   Map<String, dynamic> query = {
-    "format": "json",
-    "method": "pwg.images.search",
-    "query": searchQuery,
-    "page": page,
+    'format': 'json',
+    'method': 'pwg.images.search',
+    'query': searchQuery,
+    'order': Preferences.getImageSort.value,
+    'per_page': Settings.defaultElementPerPage,
+    'page': page,
   };
 
   try {
@@ -91,17 +93,17 @@ Future<ApiResult<Map>> searchImages(String searchQuery, [int page = 0]) async {
       final Map<String, dynamic> result = json.decode(response.data);
       if (result['err'] == 1002) {
         return ApiResult<Map>(data: {
-          "total_count": 0,
-          "images": [],
+          'total_count': 0,
+          'images': [],
         });
       }
-      final jsonImages = result["result"]["images"];
+      final jsonImages = result['result']['images'];
       List<ImageModel> images = List<ImageModel>.from(
         jsonImages.map((image) => ImageModel.fromJson(image)),
       );
       return ApiResult<Map>(data: {
-        "total_count": result["result"]["paging"]["total_count"],
-        "images": images,
+        'total_count': result['result']['paging']['total_count'],
+        'images': images,
       });
     }
   } on DioError catch (e) {
@@ -112,6 +114,46 @@ Future<ApiResult<Map>> searchImages(String searchQuery, [int page = 0]) async {
   return ApiResult(error: ApiErrors.searchImagesError);
 }
 
+Future<ApiResult<Map>> fetchFavorites([int page = 0]) async {
+  Map<String, dynamic> query = {
+    'format': 'json',
+    'method': 'pwg.users.favorites.getList',
+    'order': Preferences.getImageSort.value,
+    'per_page': Settings.defaultElementPerPage,
+    'page': page,
+  };
+
+  try {
+    Response response = await ApiClient.get(queryParameters: query);
+
+    if (response.statusCode == 200) {
+      final Map<String, dynamic> result = json.decode(response.data);
+      if (result['stat'] == 'fail') {
+        return ApiResult<Map>(data: {
+          'total_count': 0,
+          'images': [],
+        });
+      }
+      final jsonImages = result['result']['images'];
+      List<ImageModel> images = List<ImageModel>.from(
+        jsonImages.map((image) {
+          image['is_favorite'] = true;
+          return ImageModel.fromJson(image);
+        }),
+      );
+      return ApiResult<Map>(data: {
+        'total_count': result['result']['paging']['count'],
+        'images': images,
+      });
+    }
+  } on DioError catch (e) {
+    debugPrint('Fetch favorites: ${e.message}');
+  } on Error catch (e) {
+    debugPrint('Fetch favorites: ${e.stackTrace}');
+  }
+  return ApiResult(error: ApiErrors.error);
+}
+
 Future<bool> _requestPermissions() async {
   var permission = await Permission.storage.status;
   if (permission != PermissionStatus.granted) {
@@ -198,14 +240,14 @@ Future<XFile?> downloadImage(String dirPath, ImageModel image) async {
   String localPath = path.join(dirPath, image.file);
   try {
     await ApiClient.download(
-      path: image.derivatives.medium.url,
+      path: image.elementUrl,
       outputPath: localPath,
     );
     return XFile(localPath);
   } on DioError catch (e) {
-    debugPrint('Download images: ${e.message}');
+    debugPrint("Download images: ${e.message}");
   } on Error catch (e) {
-    debugPrint('Download images: ${e.stackTrace}');
+    debugPrint("Download images: ${e.stackTrace}");
   }
   return null;
 }
@@ -415,7 +457,10 @@ Future<bool> editImage(ImageModel image, [Map<String, dynamic> info = const {}])
   final FormData formData = FormData.fromMap(form);
 
   try {
-    Response response = await ApiClient.post(data: formData, queryParameters: queries);
+    Response response = await ApiClient.post(
+      data: formData,
+      queryParameters: queries,
+    );
 
     if (response.statusCode == 200) {
       return true;

lib/api/upload.dart

@@ -17,12 +17,13 @@ import 'package:piwigo_ng/components/dialogs/confirm_dialog.dart';
 import 'package:piwigo_ng/services/preferences_service.dart';
 import 'package:piwigo_ng/services/upload_notifier.dart';
 import 'package:piwigo_ng/utils/localizations.dart';
+import 'package:piwigo_ng/views/upload/upload_status_page.dart';
 import 'package:provider/provider.dart';
 
 import '../services/chunked_uploader.dart';
 import '../services/notification_service.dart';
 
-Future<void> _showUploadNotification({bool success = true}) async {
+Future<void> _showUploadNotification([int nbError = 0, int nbImage = 0]) async {
   if (!Preferences.getUploadNotification) return;
   final android = AndroidNotificationDetails(
     'piwigo-ng-upload',
@@ -32,20 +33,33 @@ Future<void> _showUploadNotification({bool success = true}) async {
     importance: Importance.high,
   );
   final platform = NotificationDetails(android: android);
-  await localNotification.show(
-    1,
-    success ? 'Success' : 'Failure',
-    success ? appStrings.imageUploadCompleted_message : appStrings.uploadError_message,
-    platform,
-  );
+  late String title;
+  String? message;
+  if (nbError == 0 && nbImage == 0) {
+    // Upload cancelled
+    title = appStrings.uploadCancelled_title;
+  } else if (nbError == 0 && nbImage > 0) {
+    // Upload completed
+    title = appStrings.imageUploadCompleted_title;
+    message = nbImage == 1 ? appStrings.imageUploadCompleted_message : appStrings.imageUploadCompleted_message1;
+  } else if (nbError > 0 && nbImage != nbError) {
+    // Upload partially completed
+    title = appStrings.coreDataStore_WarningTitle;
+    message = appStrings.imageUploadCompleted_warning;
+  } else {
+    // Upload failed
+    title = appStrings.uploadError_title;
+    message = appStrings.uploadError_message;
+  }
+  await localNotification.show(1, title, message, platform);
 }
 
-Future<List<Map<String, dynamic>>> uploadPhotos(
+Future<List<int>> uploadPhotos(
   List<XFile> photos,
   int albumId, {
   Map<String, dynamic> info = const {},
 }) async {
-  /// Check if Wifi is enabled and working
+  // Check if Wifi is enabled and working
   if (Preferences.getWifiUpload) {
     var connectivity = await Connectivity().checkConnectivity();
     if (connectivity != ConnectivityResult.wifi) {
@@ -60,17 +74,17 @@ Future<List<Map<String, dynamic>>> uploadPhotos(
     }
   }
 
-  List<Map<String, dynamic>> result = [];
-  List<int> uploadCompletedList = [];
+  List<int> result = [];
   List<UploadItem> items = [];
   FlutterSecureStorage storage = const FlutterSecureStorage();
   String? url = await storage.read(key: 'SERVER_URL');
   if (url == null) return [];
   String? username = await storage.read(key: 'SERVER_USERNAME');
   String? password = await storage.read(key: 'SERVER_PASSWORD');
   UploadNotifier uploadNotifier = App.appKey.currentContext!.read<UploadNotifier>();
+  int nbError = 0;
 
-  /// Creates Upload Item list for the upload notifier
+  // Creates Upload Item list for the upload notifier
   for (var photo in photos) {
     File? compressedFile;
     if (Preferences.getRemoveMetadata) {
@@ -86,52 +100,55 @@ Future<List<Map<String, dynamic>>> uploadPhotos(
 
   uploadNotifier.addItems(items);
 
-  /// Upload loop
-  for (var item in items) {
+  App.navigatorKey.currentState?.popAndPushNamed(UploadStatusPage.routeName);
+
+  await Future.wait(List<Future<void>>.generate(items.length, (index) async {
+    UploadItem item = items[index];
     try {
-      /// Make Request
+      // Make Request
       Response? response = await uploadChunk(
         photo: item.file,
         category: albumId,
         url: url,
         username: username,
         password: password,
         info: info,
+        cancelToken: item.cancelToken,
         onProgress: (progress) {
-          // debugPrint("$progress");
           item.progress.sink.add(progress);
         },
       );
-      if (response != null) {
-        var data = json.decode(response.data);
-        if (data['stat'] != 'fail') {
-          result.add({
-            'id': data['result']['id'],
-            'url': data['result']['element_url'],
-          });
 
-          /// Notify provider upload completed
-          uploadNotifier.itemUploadCompleted(item);
-          if (Preferences.getDeleteAfterUpload) {
-            // todo: delete real file path, not the cached one.
-          }
-        } else {
+      // Handle result
+      if (response == null || json.decode(response.data)['stat'] == 'fail') {
+        if (!item.cancelToken.isCancelled) {
           uploadNotifier.itemUploadCompleted(item, error: true);
+          nbError++;
         }
       } else {
-        uploadNotifier.itemUploadCompleted(item, error: true);
+        var data = json.decode(response.data);
+        result.add(data['result']['id']);
+
+        // Notify provider upload completed
+        uploadNotifier.itemUploadCompleted(item);
+        if (Preferences.getDeleteAfterUpload) {
+          // todo: delete real file path, not the cached one.
+        }
       }
+    } on DioError catch (e) {
+      debugPrint("${e.type}");
     } catch (e) {
       debugPrint("$e");
+      nbError++;
     }
-  }
-  _showUploadNotification(success: result.isNotEmpty);
+  }));
+
+  _showUploadNotification(nbError, result.length);
   if (result.isEmpty) return [];
-  uploadCompletedList = result.map<int>((e) => e['id']).toList();
   try {
-    await uploadCompleted(uploadCompletedList, albumId);
+    await uploadCompleted(result, albumId);
     if (await methodExist('community.images.uploadCompleted')) {
-      await communityUploadCompleted(uploadCompletedList, albumId);
+      await communityUploadCompleted(result, albumId);
     }
   } on DioError catch (e) {
     debugPrint(e.message);
@@ -148,6 +165,7 @@ Future<Response?> uploadChunk({
   Function(double)? onProgress,
   String? username,
   String? password,
+  CancelToken? cancelToken,
 }) async {
   Map<String, String> queries = {
     'format': 'json',
@@ -178,6 +196,7 @@ Future<Response?> uploadChunk({
     params: queries,
     method: 'POST',
     data: fields,
+    cancelToken: cancelToken,
     contentType: Headers.formUrlEncodedContentType,
     onUploadProgress: (value) {
       if (onProgress != null) onProgress(value);