Cache, video and pdf support

Author: maarkop

lib/data.dart

@@ -33,7 +33,9 @@ enum Pref<T> {
   currentProfile('Current Profile', '', null),
   //INTERFACE
   autoCapitalise('Auto Capitalise', false, Icons.text_fields_rounded, ui: true),
-  sheetBlobs('Sheet blobs', false, Icons.border_bottom_rounded);
+  sheetBlobs('Sheet blobs', false, Icons.border_bottom_rounded),
+  //CACHE
+  cachePath(null, '', null);
 
   final T initial;
   final List<T>? all;
@@ -76,6 +78,8 @@ List<Tile> get settings {
 
 enum BlobType {
   image,
+  pdf,
+  video,
   text;
 
   static BlobType fromExtension(String ext) {
@@ -89,5 +93,7 @@ enum BlobType {
 }
 
 const extensions = {
-  BlobType.image: ['jpg', 'png', 'gif'],
+  BlobType.image: ['jpg', 'png', 'gif', 'webp'],
+  BlobType.video: ['mp4'],
+  BlobType.pdf: ['pdf'],
 };

lib/main.dart

@@ -1,4 +1,6 @@
+import 'package:path_provider/path_provider.dart';
 import 'package:flutter/material.dart';
+import 'data.dart';
 import 'template/class/prefs.dart';
 import 'template/widget/app.dart';
 import 'services/profile.dart';
@@ -7,6 +9,9 @@ import 'pages/root.dart';
 Future<void> main() async {
   WidgetsFlutterBinding.ensureInitialized();
   await Preferences().init();
+  if (Pref.cachePath.value == '') {
+    Pref.cachePath.set((await getApplicationCacheDirectory()).path);
+  }
   Profiles().init();
   runApp(const App(title: 'S3', child: RootPage()));
 }

lib/pages/root.dart

@@ -1,8 +1,8 @@
 import 'package:flutter/material.dart';
+import '../services/storage/storage.dart';
 import '../../template/functions.dart';
 import '../template/widget/frame.dart';
 import '../services/nodes/root.dart';
-import '../services/endpoint.dart';
 import '../widgets/node_list.dart';
 import '../layers/profiles.dart';
 import '../widgets/loading.dart';
@@ -28,7 +28,7 @@ class _RootPageState extends State<RootPage> {
     return ListenableBuilder(
       listenable: root,
       builder: (context, child) => Frame(
-        title: Text(EndPoint().profile.name),
+        title: Text(Storage().profile.name),
         actions: [
           LoadingCircle(
             show: !root.loaded,

lib/services/nodes/blob.dart

@@ -6,20 +6,22 @@ import 'dart:convert';
 import 'group.dart';
 import 'node.dart';
 import '../../template/class/tile.dart';
+import '../../widgets/nodes/image.dart';
+import '../../widgets/nodes/video.dart';
+import '../../widgets/nodes/text.dart';
 import '../../template/functions.dart';
+import '../../widgets/nodes/pdf.dart';
 import '../../pages/nodes/blobs.dart';
 import '../../layers/nodes/blob.dart';
 import '../../sheets/node/blobs.dart';
 import '../transfers/transfer.dart';
 import '../../template/data.dart';
-import '../../sheets/image.dart';
-import '../../sheets/text.dart';
+import '../storage/storage.dart';
 import '../../functions.dart';
-import '../endpoint.dart';
 import '../../data.dart';
 
 class BlobNode extends Node {
-  Uint8List data = Uint8List(0);
+  Uint8List _data = Uint8List(0);
   final textController = TextEditingController();
 
   BlobNode({
@@ -30,14 +32,21 @@ class BlobNode extends Node {
   });
 
   String get textData {
+    if (blobType == BlobType.image) return 'IMAGE';
     try {
       return utf8.decode(data);
     } catch (e) {
-      showSnack('$e', false);
       return 'ERROR';
     }
   }
 
+  Uint8List get data => _data;
+  set data(Uint8List u) {
+    _data = u;
+    textController.text = textData;
+    notify();
+  }
+
   String get extension => extensionFromPath(path);
   set textData(String s) => data = utf8.encode(s);
 
@@ -65,20 +74,16 @@ class BlobNode extends Node {
     }
   }, onHold: () => BlobNodeLayer(node: this).show());
 
-  IconData get icon => {
-    BlobType.text: Icons.list_alt_rounded,
-    BlobType.image: Icons.crop_original_rounded,
-  }[blobType]!;
+  IconData get icon =>
+      {
+        BlobType.pdf: Icons.picture_as_pdf_rounded,
+        BlobType.image: Icons.crop_original_rounded,
+        BlobType.video: Icons.movie_rounded,
+      }[blobType] ??
+      Icons.list_alt_rounded;
 
   @override
-  Future<void> refresh() async {
-    loaded = false;
-    notifyListeners();
-    data = await EndPoint().loadBlobNode(this);
-    textController.text = textData;
-    loaded = true;
-    notifyListeners();
-  }
+  Future<void> refresh() => Storage().loadBlobNode(this);
 
   void openLayer() => showModalBottomSheet(
     barrierLabel: 'Barrier',
@@ -91,16 +96,16 @@ class BlobNode extends Node {
     ),
   );
 
-  bool get hasData => data.isNotEmpty;
+  bool get hasData => loaded || data.isNotEmpty;
   BlobType get blobType => BlobType.fromExtension(extension);
 
-  Widget get subWidget {
-    if (!hasData) return Container();
-    return {
-      BlobType.image: ImageNodeSheet(blobNode: this),
-      BlobType.text: TextNodeSheet(blobNode: this),
-    }[blobType]!;
-  }
+  Widget get subWidget =>
+      {
+        BlobType.image: ImageNodeWidget(blobNode: this),
+        BlobType.video: VideoNodeWidget(blobNode: this),
+        BlobType.pdf: PDFNodeWidget(blobNode: this),
+      }[blobType] ??
+      TextNodeWidget(blobNode: this);
 
   Future<void> saveChanges() async {
     if (blobType == BlobType.text) {
@@ -112,7 +117,7 @@ class BlobNode extends Node {
   Transfer copyTo(String dest) => Transfer(
     'Copying $name to $dest',
     future: () async {
-      await EndPoint().copyBlobNode(this, dest);
+      await Storage().copyBlobNode(this, dest);
       await parent?.refresh();
     }.call(),
   );
@@ -129,17 +134,17 @@ class BlobNode extends Node {
   Transfer get upload => Transfer(
     'Uploading $name',
     future: () async {
-      await EndPoint().uploadNode(this);
+      await Storage().uploadNode(this);
       await parent!.refresh();
     }.call(),
   );
 
   @override
   Transfer get forceRemove =>
-      Transfer('Removing $name', future: EndPoint().removeBlobNode(this));
+      Transfer('Removing $name', future: Storage().removeBlobNode(this));
 
   Transfer get update =>
-      Transfer('Update $path', future: EndPoint().updateBlobNode(this));
+      Transfer('Update $path', future: Storage().updateBlobNode(this));
 
   Transfer get download => Transfer(
     'Downloading $name',

lib/services/nodes/bucket.dart

@@ -7,7 +7,7 @@ import '../../layers/nodes/bucket.dart';
 import '../../template/functions.dart';
 import '../../pages/nodes/group.dart';
 import '../transfers/transfer.dart';
-import '../endpoint.dart';
+import '../storage/storage.dart';
 
 class BucketNode extends GroupNode {
   final Bucket bucket;
@@ -31,7 +31,7 @@ class BucketNode extends GroupNode {
   Transfer get forceRemove => Transfer(
     'Removing $name',
     future: () async {
-      await EndPoint().removeBucket(this);
+      await Storage().removeBucket(this);
       await RootNode().refresh();
     }.call(),
   );

lib/services/nodes/group.dart

@@ -1,14 +1,20 @@
 import 'blob.dart';
 import 'node.dart';
 import '../transfers/transfer.dart';
-import '../endpoint.dart';
+import '../storage/storage.dart';
 import '../../data.dart';
 
 abstract class GroupNode extends Node {
-  List<Node> nodes = [];
+  List<Node> _nodes = [];
 
   GroupNode({required super.path, super.parent});
 
+  List<Node> get nodes => _nodes;
+  set nodes(List<Node> list) {
+    _nodes = list;
+    notifyListeners();
+  }
+
   List<GroupNode> get groups => nodes.whereType<GroupNode>().toList();
   List<BlobNode> get blobs => nodes.whereType<BlobNode>().toList();
 
@@ -50,18 +56,12 @@ abstract class GroupNode extends Node {
   List<BlobNode> get shownBlobs => shownNodes.whereType<BlobNode>().toList();
 
   @override
-  Future<void> refresh() async {
-    loaded = false;
-    notifyListeners();
-    nodes = await EndPoint().listNodes(this);
-    loaded = true;
-    notifyListeners();
-  }
+  Future refresh() => Storage().refreshGroup(this);
 
   Transfer uploadFiles(List<String?> files) => Transfer(
     'Uploading ${files.length} files',
     future: () async {
-      await EndPoint().uploadPaths(this, files);
+      await Storage().uploadPaths(this, files);
       await refresh();
     }.call(),
   );

lib/services/nodes/node.dart

@@ -9,7 +9,7 @@ import '../../data.dart';
 
 abstract class Node with ChangeNotifier {
   String path; //Path inside the bucket
-  bool loaded = false;
+  bool _loaded = false;
   GroupNode? parent;
   DateTime? date;
   int? size;
@@ -23,12 +23,19 @@ abstract class Node with ChangeNotifier {
     }
   }
 
+  bool get loaded => _loaded;
+  set loaded(bool b) {
+    _loaded = b;
+    notifyListeners();
+  }
+
   String get fullPath => '${bucketNode.name}/$path';
 
   Node({required this.path, this.parent, this.date, this.size});
 
   Future<void> refresh();
   Transfer get forceRemove;
+  void notify() => notifyListeners();
 
   void tryRemove() =>
       showSnack('Press to confirm', false, onTap: () => forceRemove.call());

lib/services/nodes/prefix.dart

@@ -6,7 +6,7 @@ import '../../layers/nodes/prefix.dart';
 import '../../template/functions.dart';
 import '../../pages/nodes/group.dart';
 import '../transfers/transfer.dart';
-import '../endpoint.dart';
+import '../storage/storage.dart';
 
 class PrefixNode extends GroupNode {
   PrefixNode({required super.parent, required super.path});
@@ -78,6 +78,6 @@ class PrefixNode extends GroupNode {
 
   Transfer removeNodes(List<BlobNode> collected) => Transfer(
     'Removing nodes in $name',
-    future: EndPoint().removeBlobNodes(collected),
+    future: Storage().removeBlobNodes(collected),
   );
 }

lib/services/nodes/root.dart

@@ -1,32 +1,40 @@
 import 'package:flutter/material.dart';
+import 'package:minio/models.dart';
 import 'bucket.dart';
-import '../../template/functions.dart';
 import '../transfers/transfer.dart';
-import '../endpoint.dart';
+import '../storage/storage.dart';
 
 class RootNode extends ChangeNotifier {
   static final instance = RootNode.internal();
   factory RootNode() => instance;
   RootNode.internal();
 
   List<BucketNode> buckets = [];
-  bool loaded = false;
+  bool _loaded = false;
 
-  Future<void> refresh() async {
-    try {
-      loaded = false;
-      final result = await EndPoint().listBuckets();
-      buckets = result.map((bucket) {
-        return BucketNode(bucket: bucket);
-      }).toList();
-      buckets.sort((a, b) => a.name.compareTo(b.name));
-    } catch (e) {
-      showSnack('$e', false);
-    }
-    loaded = true;
+  bool get loaded => _loaded;
+  set loaded(bool b) {
+    _loaded = b;
     notifyListeners();
   }
 
-  Transfer createBucket(String name) =>
-      Transfer('Creating bucket $name', future: EndPoint().createBucket(name));
+  void loadBuckets(List<Bucket> list) {
+    buckets = list.map((bucket) {
+      return BucketNode(bucket: bucket);
+    }).toList();
+    buckets.sort((a, b) => a.name.compareTo(b.name));
+    notifyListeners();
+  }
+
+  void notify() => notifyListeners();
+
+  Future<void> refresh() => Storage().refreshRoot(this);
+
+  Transfer createBucket(String name) => Transfer(
+    'Creating bucket $name',
+    future: () async {
+      await Storage().createBucket(name);
+      refresh();
+    }.call(),
+  );
 }

lib/services/profile.dart

@@ -34,7 +34,7 @@ class Profile {
   };
 
   static Profile get empty =>
-      Profile(name: 'Hold to edit', endPoint: '', accessKey: '', secretKey: '');
+      Profile(name: 'Edit profile', endPoint: '', accessKey: '', secretKey: '');
 
   @override
   String toString() => jsonEncode(toMap);