Improved community support for image actions an empty albums

Author: ReightI

lib/network/albums.dart

@@ -9,19 +9,6 @@ import 'package:piwigo_ng/services/preferences_service.dart';
 import 'api_client.dart';
 import 'authentication.dart';
 
-Map<String, dynamic> tryParseJson(String data) {
-  try {
-    return json.decode(data);
-  } on FormatException catch (_) {
-    debugPrint('Invalid json data');
-    debugPrint(data);
-    int start = data.indexOf('{');
-    int end = data.lastIndexOf('}');
-    String parsedData = data.substring(start, end + 1);
-    return json.decode(parsedData);
-  }
-}
-
 Future<ApiResponse<List<AlbumModel>>> fetchAlbums(int albumID) async {
   final Map<String, dynamic> queries = {
     'format': 'json',
@@ -31,17 +18,8 @@ Future<ApiResponse<List<AlbumModel>>> fetchAlbums(int albumID) async {
   };
 
   try {
-    List<String> uploadCategoryIdList = [];
     if (await methodExist('community.categories.getList')) {
       queries['faked_by_community'] = false;
-      ApiResponse communityResult = await fetchCommunityAlbums(albumID);
-      if (communityResult.hasData) {
-        uploadCategoryIdList = communityResult.data.map<String>(
-          (cat) {
-            return cat.id.toString();
-          },
-        ).toList();
-      }
     }
 
     Response response = await ApiClient.get(
@@ -53,15 +31,36 @@ Future<ApiResponse<List<AlbumModel>>> fetchAlbums(int albumID) async {
           tryParseJson(response.data)['result']['categories'];
       List<AlbumModel> albums = List<AlbumModel>.from(jsonAlbums.map(
         (album) {
-          bool canUpload = false;
-          if ((appPreferences.getBool(Preferences.isAdminKey) ?? false) ||
-              uploadCategoryIdList.contains(album['id'].toString())) {
-            canUpload = true;
-          }
+          bool canUpload =
+              appPreferences.getBool(Preferences.isAdminKey) ?? false;
           album['can_upload'] = canUpload;
           return AlbumModel.fromJson(album);
         },
       ));
+
+      if (await methodExist('community.categories.getList')) {
+        ApiResponse communityResult = await fetchCommunityAlbums(albumID);
+        if (!communityResult.hasData || communityResult.data!.isEmpty) {
+          return ApiResponse<List<AlbumModel>>(
+            data: albums,
+          );
+        }
+        if (communityResult.hasData) {
+          for (AlbumModel communityAlbum in communityResult.data) {
+            int index =
+                albums.indexWhere((album) => album.id == communityAlbum.id);
+            if (index >= 0) {
+              AlbumModel newAlbum = albums.elementAt(index);
+              newAlbum.canUpload = true;
+              albums[index] = newAlbum;
+            } else {
+              communityAlbum.canUpload = true;
+              albums.add(communityAlbum);
+            }
+          }
+        }
+      }
+
       return ApiResponse<List<AlbumModel>>(
         data: albums,
       );

lib/network/api_client.dart

@@ -1,9 +1,11 @@
+import 'dart:convert';
 import 'dart:io';
 
 import 'package:cookie_jar/cookie_jar.dart';
 import 'package:dio/adapter.dart';
 import 'package:dio/dio.dart';
 import 'package:dio_cookie_manager/dio_cookie_manager.dart';
+import 'package:flutter/foundation.dart';
 import 'package:piwigo_ng/services/preferences_service.dart';
 
 import 'api_interceptor.dart';
@@ -140,3 +142,19 @@ class SSLHttpOverrides extends HttpOverrides {
       ..badCertificateCallback = ApiClient.piwigoSSLBypass;
   }
 }
+
+Map<String, dynamic> tryParseJson(String data) {
+  try {
+    return json.decode(data);
+  } on FormatException catch (_) {
+    if (kDebugMode) {
+      print('Invalid json data');
+      print(data);
+    }
+    int start = data.indexOf('{');
+    int end = data.lastIndexOf('}');
+    String parsedData = data.substring(start, end + 1);
+    if (kDebugMode) print("Parsed : $parsedData");
+    return json.decode(parsedData);
+  }
+}

lib/network/images.dart

@@ -68,7 +68,7 @@ Future<ApiResponse<List<ImageModel>>> fetchImages(
     Response response = await ApiClient.get(queryParameters: queries);
 
     if (response.statusCode == 200) {
-      var jsonImages = json.decode(response.data)['result']['images'];
+      var jsonImages = tryParseJson(response.data)['result']['images'];
       List<ImageModel> images = List<ImageModel>.from(
         jsonImages.map((image) => ImageModel.fromJson(image)),
       );
@@ -77,8 +77,8 @@ Future<ApiResponse<List<ImageModel>>> fetchImages(
     }
   } on DioError catch (e) {
     debugPrint('Fetch images: ${e.message}');
-  } on Error catch (e) {
-    debugPrint('Fetch images: ${e.stackTrace}');
+  } catch (e) {
+    debugPrint('Fetch images: $e');
   }
   return ApiResponse(error: ApiErrors.fetchImagesError);
 }

lib/views/album/album_page.dart

@@ -313,7 +313,7 @@ class _AlbumPageState extends State<AlbumPage> {
           ),
         if (orientation == Orientation.landscape && _selectedList.isNotEmpty)
           ..._imageActions,
-        if (widget.isAdmin)
+        if (widget.isAdmin || _currentAlbum.canUpload)
           PopupMenuButton(
             tooltip: appStrings.imageOptions_title,
             position: PopupMenuPosition.under,
@@ -617,6 +617,8 @@ class _AlbumPageState extends State<AlbumPage> {
       ),
     ];
 
-    return widget.isAdmin ? adminActions : userActions;
+    return widget.isAdmin || _currentAlbum.canUpload
+        ? adminActions
+        : userActions;
   }
 }