Upload provider

Author: ReightI

android/app/src/main/AndroidManifest.xml

@@ -3,6 +3,9 @@
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
+    <uses-permission android:name="android.permission.READ_MEDIA_VIDEO" />
+    <uses-permission android:name="android.permission.READ_MEDIA_AUDIO" />
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.VIBRATE" />

lib/api/upload.dart

@@ -11,8 +11,11 @@ import 'package:image_picker/image_picker.dart';
 import 'package:path_provider/path_provider.dart';
 import 'package:piwigo_ng/api/api_client.dart';
 import 'package:piwigo_ng/api/authentication.dart';
+import 'package:piwigo_ng/app.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:provider/provider.dart';
 
 import '../services/chunked_uploader.dart';
 import '../services/notification_service.dart';
@@ -38,7 +41,7 @@ Future<void> _showUploadNotification({bool success = true}) async {
 Future<List<Map<String, dynamic>>> uploadPhotos(
   List<XFile> photos,
   int albumId, {
-  Map<String, dynamic>? info,
+  Map<String, dynamic> info = const {},
 }) async {
   List<Map<String, dynamic>> result = [];
   List<int> uploadCompletedList = [];
@@ -47,13 +50,22 @@ Future<List<Map<String, dynamic>>> uploadPhotos(
   if (url == null) return [];
   String? username = await storage.read(key: 'SERVER_USERNAME');
   String? password = await storage.read(key: 'SERVER_PASSWORD');
-  try {
-    for (var photo in photos) {
-      File? compressedFile = await compressFile(photo);
-      if (compressedFile == null) {
+  UploadNotifier uploadNotifier = App.appKey.currentContext!.read<UploadNotifier>();
+
+  for (var photo in photos) {
+    File? compressedFile;
+    UploadItem? item;
+    try {
+      if (Preferences.getRemoveMetadata) {
+        compressedFile = await compressFile(photo);
+      } else {
         compressedFile = File(photo.path);
       }
-      // todo: upload video without chunk
+      item = UploadItem(
+        file: compressedFile,
+        albumId: albumId,
+      );
+      uploadNotifier.addItem(item);
       Response? response = await uploadChunk(
         photo: compressedFile,
         category: albumId,
@@ -63,30 +75,41 @@ Future<List<Map<String, dynamic>>> uploadPhotos(
         info: info,
         onProgress: (progress) {
           debugPrint("$progress");
+          item?.progress.sink.add(progress);
         },
       );
-      print(response);
       if (response != null) {
         var data = json.decode(response.data);
-        if (data["stat"] != "fail") {
+        if (data['stat'] != 'fail') {
           result.add({
-            "name": photo.name,
-            "filename": photo.path.split("/").last,
-            "url": data["result"]["element_url"],
+            'id': data['result']['id'],
+            'name': photo.name,
+            'filename': photo.path.split('/').last,
+            'url': data['result']['element_url'],
           });
-          uploadCompletedList.add(data["result"]["id"]);
+          uploadNotifier.itemUploadCompleted(item);
+          if (Preferences.getDeleteAfterUpload) {
+            // todo: delete real file path, not the cached one.
+          }
+        } else {
+          uploadNotifier.itemUploadCompleted(item, error: true);
         }
+      } else {
+        uploadNotifier.itemUploadCompleted(item, error: true);
       }
+    } catch (e) {
+      if (item != null) {
+        uploadNotifier.itemUploadCompleted(item, error: true);
+      }
+      debugPrint("$e");
     }
-    _showUploadNotification(success: true);
-  } on DioError catch (e) {
+  }
+  if (result.isEmpty) {
     _showUploadNotification(success: false);
-    debugPrint(e.message);
-  } on Error catch (e) {
-    debugPrint(e.toString());
+    return [];
   }
-  if (uploadCompletedList.isEmpty) return [];
-
+  _showUploadNotification(success: true);
+  uploadCompletedList = result.map<int>((e) => e['id']).toList();
   try {
     await uploadCompleted(uploadCompletedList, albumId);
     if (await methodExist('community.images.uploadCompleted')) {
@@ -103,7 +126,7 @@ Future<Response?> uploadChunk({
   required File photo,
   required int category,
   required String url,
-  Map<String, dynamic>? info,
+  Map<String, dynamic> info = const {},
   Function(double)? onProgress,
   String? username,
   String? password,
@@ -116,6 +139,11 @@ Future<Response?> uploadChunk({
     'category': category,
   };
 
+  if (info['name'] != '' && info['name'] != null) fields['name'] = info['name'];
+  if (info['comment'] != '' && info['comment'] != null) fields['comment'] = info['comment'];
+  if (info['tag_ids'].isNotEmpty) fields['tag_ids'] = info['tag_ids'];
+  if (info['level'] != -1) fields['level'] = info['level'];
+
   ChunkedUploader chunkedUploader = ChunkedUploader(Dio(
     BaseOptions(
       baseUrl: url,
@@ -136,23 +164,25 @@ Future<Response?> uploadChunk({
   );
 }
 
-Future<File?> compressFile(XFile file) async {
+Future<File> compressFile(XFile file) async {
   try {
     final filePath = file.path;
     var dir = await getTemporaryDirectory();
-    String filename = filePath.split('/').last;
-    final outPath = "${dir.path}/compressed/$filename";
+    final String filename = filePath.split('/').last;
+    final outPath = "${dir.absolute.path}/$filename";
 
     var result = await FlutterImageCompress.compressAndGetFile(
       filePath,
       outPath,
-      quality: 10,
+      quality: (Preferences.getUploadQuality * 100).round(),
+      keepExif: false,
     );
-    return result;
+    debugPrint("Upload Compress $result");
+    if (result != null) return result;
   } catch (e) {
     debugPrint(e.toString());
   }
-  return null;
+  return File(file.path);
 }
 
 Future<bool> uploadCompleted(List<int> imageId, int categoryId) async {

lib/services/app_providers.dart

@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:piwigo_ng/services/theme_provider.dart';
+import 'package:piwigo_ng/services/upload_notifier.dart';
 import 'package:piwigo_ng/utils/LocaleProvider.dart';
 import 'package:provider/provider.dart';
 
@@ -14,13 +15,18 @@ class AppProviders extends StatelessWidget {
       create: (_) => LocaleNotifier(),
       child: ChangeNotifierProvider(
         create: (_) => ThemeNotifier(),
-        child: Consumer<LocaleNotifier>(builder: (context, localNotifier, child) {
-          return Consumer<ThemeNotifier>(
-            builder: (context, themeNotifier, child) {
-              return builder(localNotifier, themeNotifier);
+        child: ChangeNotifierProvider(
+          create: (_) => UploadNotifier(),
+          child: Consumer<LocaleNotifier>(
+            builder: (context, localNotifier, child) {
+              return Consumer<ThemeNotifier>(
+                builder: (context, themeNotifier, child) {
+                  return builder(localNotifier, themeNotifier);
+                },
+              );
             },
-          );
-        }),
+          ),
+        ),
       ),
     );
   }

lib/services/upload_notifier.dart

@@ -0,0 +1,48 @@
+import 'dart:async';
+import 'dart:io';
+
+import 'package:flutter/material.dart';
+
+class UploadNotifier extends ChangeNotifier {
+  final List<UploadItem> _uploadList = [];
+  final List<UploadItem> _uploadHistoryList = [];
+
+  UploadNotifier();
+
+  void addItem(UploadItem item) {
+    _uploadList.add(item);
+    notifyListeners();
+  }
+
+  void itemUploadCompleted(UploadItem item, {bool error = false}) {
+    _uploadList.remove(item);
+    item.error = error;
+    _uploadHistoryList.add(item);
+    notifyListeners();
+  }
+
+  void removeItem(UploadItem item) {
+    _uploadList.remove(item);
+    notifyListeners();
+  }
+
+  void clearHistory() {
+    _uploadHistoryList.clear();
+  }
+
+  List<UploadItem> get uploadList => _uploadList;
+  List<UploadItem> get uploadHistoryList => _uploadHistoryList;
+}
+
+class UploadItem {
+  final File file;
+  final StreamController<double> progress;
+  final int albumId;
+  bool error;
+
+  UploadItem({
+    required this.file,
+    required this.albumId,
+    this.error = false,
+  }) : progress = StreamController<double>();
+}

lib/services/upload_provider.dart

@@ -12,6 +12,7 @@ import 'package:piwigo_ng/components/modals/move_or_copy_modal.dart';
 import 'package:piwigo_ng/components/snackbars.dart';
 import 'package:piwigo_ng/models/album_model.dart';
 import 'package:piwigo_ng/models/image_model.dart';
+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';
 
@@ -40,7 +41,11 @@ Future<XFile?> onTakePhoto(BuildContext context) async {
     XFile? image;
     switch (choice) {
       case 0:
-        image = await picker.pickImage(source: ImageSource.camera);
+        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);