Upload and download notifications

Author: ReightI

lib/api/albums.dart

@@ -39,7 +39,6 @@ Future<ApiResult<List<AlbumModel>>> fetchAlbums(int albumID) async {
       List<dynamic> jsonAlbums = json.decode(response.data)['result']['categories'];
       List<AlbumModel> albums = List<AlbumModel>.from(jsonAlbums.map(
         (album) {
-          print(album);
           bool canUpload = false;
           if ((appPreferences.getBool(Preferences.isAdminKey) ?? false) ||
               uploadCategoryIdList.contains(album['id'].toString())) {

lib/api/authentication.dart

@@ -42,6 +42,7 @@ Future<ApiResult<bool>> loginUser(
     );
   }
 
+  ApiClient.cookieJar.deleteAll();
   FlutterSecureStorage secureStorage = const FlutterSecureStorage();
   await secureStorage.write(key: 'SERVER_URL', value: url);
 

lib/api/images.dart

@@ -164,8 +164,6 @@ Future<List<XFile>?> downloadImages(
   bool showNotification = true,
   bool cached = false,
 }) async {
-  final isPermissionStatusGranted = await _requestPermissions();
-  if (!isPermissionStatusGranted) return null;
   String? dirPath = (await getTemporaryDirectory()).path;
   if (!cached) {
     dirPath = await Preferences.getDownloadDestination;
@@ -181,7 +179,7 @@ Future<List<XFile>?> downloadImages(
     }
   });
 
-  if (showNotification) {
+  if (showNotification && Preferences.getDownloadNotification) {
     if (files.isNotEmpty) {
       await _showDownloadNotification(
         success: true,
@@ -235,12 +233,12 @@ Future<int> deleteImages(
 
 Future<bool> deleteImage(ImageModel image) async {
   Map<String, String> queries = {
-    "format": "json",
-    "method": "pwg.images.delete",
+    'format': 'json',
+    'method': 'pwg.images.delete',
   };
   FormData formData = FormData.fromMap({
-    "image_id": image.id,
-    "pwg_token": appPreferences.getString(Preferences.tokenKey),
+    'image_id': image.id,
+    'pwg_token': appPreferences.getString(Preferences.tokenKey),
   });
   try {
     Response response = await ApiClient.post(

lib/api/upload.dart

@@ -45,48 +45,55 @@ Future<List<Map<String, dynamic>>> uploadPhotos(
 }) async {
   List<Map<String, dynamic>> result = [];
   List<int> uploadCompletedList = [];
+  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>();
 
+  /// Creates Upload Item list for the upload notifier
   for (var photo in photos) {
     File? compressedFile;
-    UploadItem? item;
+    if (Preferences.getRemoveMetadata) {
+      compressedFile = await compressFile(photo);
+    } else {
+      compressedFile = File(photo.path);
+    }
+    items.add(UploadItem(
+      file: compressedFile,
+      albumId: albumId,
+    ));
+  }
+
+  uploadNotifier.addItems(items);
+
+  /// Upload loop
+  for (var item in items) {
     try {
-      if (Preferences.getRemoveMetadata) {
-        compressedFile = await compressFile(photo);
-      } else {
-        compressedFile = File(photo.path);
-      }
-      item = UploadItem(
-        file: compressedFile,
-        albumId: albumId,
-      );
-      uploadNotifier.addItem(item);
+      /// Make Request
       Response? response = await uploadChunk(
-        photo: compressedFile,
+        photo: item.file,
         category: albumId,
         url: url,
         username: username,
         password: password,
         info: info,
         onProgress: (progress) {
           debugPrint("$progress");
-          item?.progress.sink.add(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'],
-            'name': photo.name,
-            'filename': photo.path.split('/').last,
             'url': data['result']['element_url'],
           });
+
+          /// Notify provider upload completed
           uploadNotifier.itemUploadCompleted(item);
           if (Preferences.getDeleteAfterUpload) {
             // todo: delete real file path, not the cached one.
@@ -98,17 +105,16 @@ Future<List<Map<String, dynamic>>> uploadPhotos(
         uploadNotifier.itemUploadCompleted(item, error: true);
       }
     } catch (e) {
-      if (item != null) {
-        uploadNotifier.itemUploadCompleted(item, error: true);
-      }
       debugPrint("$e");
     }
   }
-  if (result.isEmpty) {
-    _showUploadNotification(success: false);
-    return [];
+  if (Preferences.getUploadNotification) {
+    if (result.isEmpty) {
+      _showUploadNotification(success: false);
+    }
+    _showUploadNotification(success: true);
   }
-  _showUploadNotification(success: true);
+  if (result.isEmpty) return [];
   uploadCompletedList = result.map<int>((e) => e['id']).toList();
   try {
     await uploadCompleted(uploadCompletedList, albumId);
@@ -131,7 +137,10 @@ Future<Response?> uploadChunk({
   String? username,
   String? password,
 }) async {
-  Map<String, String> queries = {"format": "json", "method": "pwg.images.uploadAsync"};
+  Map<String, String> queries = {
+    'format': 'json',
+    'method': 'pwg.images.uploadAsync',
+  };
   Map<String, dynamic> fields = {
     'username': username,
     'password': password,
@@ -151,7 +160,7 @@ Future<Response?> uploadChunk({
   ));
 
   return await chunkedUploader.upload(
-    path: "/ws.php",
+    path: '/ws.php',
     filePath: photo.absolute.path,
     maxChunkSize: 100000,
     params: queries,

lib/services/notification_service.dart

@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_local_notifications/flutter_local_notifications.dart';
-import 'package:open_file/open_file.dart';
+import 'package:open_filex/open_filex.dart';
 
 final FlutterLocalNotificationsPlugin localNotification = FlutterLocalNotificationsPlugin();
 
@@ -18,7 +18,7 @@ void initLocalNotifications() {
 Future<void> onSelectNotification(NotificationResponse response) async {
   debugPrint("Notification payload: ${response.payload}");
   if (response.payload == null) return;
-  OpenResult result = await OpenFile.open(response.payload);
+  OpenResult result = await OpenFilex.open(response.payload);
   debugPrint(result.message);
 }
 

lib/services/preferences_service.dart

@@ -90,19 +90,19 @@ class Preferences {
     return appPreferences.getDouble(uploadQualityKey) ?? Settings.defaultUploadQuality;
   }
 
-  static const String downloadDestination = 'DOWNLOAD_DESTINATION';
+  static const String downloadDestinationKey = 'DOWNLOAD_DESTINATION';
   static Future<String?> get getDownloadDestination async {
-    return appPreferences.getString(downloadDestination) ?? await pickDirectoryPath();
+    return appPreferences.getString(downloadDestinationKey) ?? await pickDirectoryPath();
   }
 
-  static const String downloadNotification = 'DOWNLOAD_NOTIFICATION';
+  static const String downloadNotificationKey = 'DOWNLOAD_NOTIFICATION';
   static bool get getDownloadNotification {
-    return appPreferences.getBool(downloadNotification) ?? true;
+    return appPreferences.getBool(downloadNotificationKey) ?? true;
   }
 
-  static const String uploadNotification = 'UPLOAD_NOTIFICATION';
+  static const String uploadNotificationKey = 'UPLOAD_NOTIFICATION';
   static bool get getUploadNotification {
-    return appPreferences.getBool(uploadNotification) ?? true;
+    return appPreferences.getBool(uploadNotificationKey) ?? true;
   }
 
   // ------------ Set preferences ------------

lib/services/upload_notifier.dart

@@ -14,6 +14,11 @@ class UploadNotifier extends ChangeNotifier {
     notifyListeners();
   }
 
+  void addItems(List<UploadItem> item) {
+    _uploadList.addAll(item);
+    notifyListeners();
+  }
+
   void itemUploadCompleted(UploadItem item, {bool error = false}) {
     _uploadList.remove(item);
     item.error = error;
@@ -44,5 +49,5 @@ class UploadItem {
     required this.file,
     required this.albumId,
     this.error = false,
-  }) : progress = StreamController<double>();
+  }) : progress = StreamController<double>.broadcast();
 }

lib/utils/image_actions.dart

@@ -16,8 +16,15 @@ import 'package:piwigo_ng/services/preferences_service.dart';
 import 'package:piwigo_ng/utils/localizations.dart';
 import 'package:piwigo_ng/views/image/edit_image_page.dart';
 
+final ImagePicker _picker = ImagePicker();
+
 Future<List<XFile>?> onPickImages() async {
   try {
+    // List<XFile> images = await _picker.pickMultiImage(
+    //   imageQuality: (Preferences.getUploadQuality * 100).round(),
+    //   requestFullMetadata: Preferences.getRemoveMetadata,
+    // );
+    // if (images.isNotEmpty) return images;
     final FilePickerResult? result = await FilePicker.platform.pickFiles(
       allowMultiple: true,
       type: FileType.media,
@@ -37,18 +44,17 @@ Future<XFile?> onTakePhoto(BuildContext context) async {
   );
   if (choice == null) return null;
   try {
-    final ImagePicker picker = ImagePicker();
     XFile? image;
     switch (choice) {
       case 0:
-        image = await picker.pickImage(
+        image = await _picker.pickImage(
           source: ImageSource.camera,
           imageQuality: (Preferences.getUploadQuality * 100).round(),
           requestFullMetadata: Preferences.getRemoveMetadata,
         );
         break;
       case 1:
-        image = await picker.pickVideo(source: ImageSource.camera);
+        image = await _picker.pickVideo(source: ImageSource.camera);
         break;
     }
     return image;

lib/views/authentication/login_form_view.dart

@@ -257,10 +257,10 @@ class _LoginFormViewState extends State<LoginFormView> {
                 : null,
           ),
           Padding(
-            padding: const EdgeInsets.only(top: 12),
+            padding: const EdgeInsets.only(top: 12.0),
             child: AnimatedPiwigoButton(
               controller: _btnController,
-              disabled: _urlError,
+              // disabled: _urlError,
               color: Theme.of(context).primaryColor,
               onPressed: _onLogin,
               child: Text(

lib/views/image/image_view_page.dart

@@ -185,7 +185,7 @@ class _ImageViewPageState extends State<ImageViewPage> {
     return WillPopScope(
       onWillPop: _onWillPop,
       child: AnnotatedRegion<SystemUiOverlayStyle>(
-        // Changes System overlay colors to match black background
+        /// Changes System overlay colors to match black background
         value: SystemUiOverlayStyle.light.copyWith(
           systemNavigationBarColor: Colors.black.withOpacity(0.1),
           statusBarColor: Colors.black.withOpacity(0.1),
@@ -202,8 +202,9 @@ class _ImageViewPageState extends State<ImageViewPage> {
                 children: [
                   _content,
                   _top,
-                  // Show bottom on portrait mode only
-                  // (to keep vertical space in landscape mode).
+
+                  /// Show bottom on portrait mode only
+                  /// (to keep vertical space in landscape mode).
                   if (orientation == Orientation.portrait) _bottom,
                 ],
               );
@@ -320,7 +321,7 @@ class _ImageViewPageState extends State<ImageViewPage> {
         behavior: HitTestBehavior.opaque,
         onTap: () => _onToggleOverlay(MediaQuery.of(context).orientation),
         child: PhotoViewGallery.builder(
-          // Compatibility with PageView and PhotoView
+          /// Compatibility with PageView and PhotoView
           pageController: _pageController,
           onPageChanged: (page) => setState(() {
             _page = page;
@@ -331,10 +332,12 @@ class _ImageViewPageState extends State<ImageViewPage> {
           itemCount: _imageList.length,
           builder: (context, index) {
             final ImageModel image = _imageList[index];
-            // Check mime type of file (multiple test to ensure it is not null)
+            print(image.derivatives);
+
+            /// Check mime type of file (multiple test to ensure it is not null)
             String? mimeType = mime(image.file) ?? mime(image.elementUrl) ?? mime(image.derivatives.medium.url);
             if (mimeType != null && mimeType.startsWith('video')) {
-              // Returns video player
+              /// Returns video player
               return PhotoViewGalleryPageOptions.customChild(
                 disableGestures: true,
                 child: VideoView(
@@ -346,7 +349,8 @@ class _ImageViewPageState extends State<ImageViewPage> {
                 ),
               );
             }
-            // Default behavior: Zoomable image
+
+            /// Default behavior: Zoomable image
             return PhotoViewGalleryPageOptions(
               imageProvider: NetworkImage(
                 image.getDerivativeFromString(Preferences.getImageFullScreenSize)?.url ?? '',