⬆️ Support new attachments system

2024-08-18 22:51:52 +08:00
parent 98749f42c0
commit 49f73f5f04
19 changed files with 154 additions and 151 deletions
--- a/lib/widgets/attachments/attachment_attr_editor.dart
+++ b/lib/widgets/attachments/attachment_attr_editor.dart
@ -16,10 +16,12 @@ class AttachmentAttrEditorDialog extends StatefulWidget {
  });

  @override
-  State<AttachmentAttrEditorDialog> createState() => _AttachmentAttrEditorDialogState();
+  State<AttachmentAttrEditorDialog> createState() =>
+      _AttachmentAttrEditorDialogState();
 }

-class _AttachmentAttrEditorDialogState extends State<AttachmentAttrEditorDialog> {
+class _AttachmentAttrEditorDialogState
+    extends State<AttachmentAttrEditorDialog> {
  final _altController = TextEditingController();

  bool _isBusy = false;
@ -33,7 +35,6 @@ class _AttachmentAttrEditorDialogState extends State<AttachmentAttrEditorDialog>
      final resp = await provider.updateAttachment(
        widget.item.id,
        _altController.value.text,
-        widget.item.usage,
        isMature: _isMature,
      );

@ -109,7 +110,7 @@ class _AttachmentAttrEditorDialogState extends State<AttachmentAttrEditorDialog>
            TextButton(
              style: TextButton.styleFrom(
                  foregroundColor:
-                  Theme.of(context).colorScheme.onSurfaceVariant),
+                      Theme.of(context).colorScheme.onSurfaceVariant),
              onPressed: () => Navigator.pop(context),
              child: Text('cancel'.tr),
            ),
--- a/lib/widgets/attachments/attachment_editor.dart
+++ b/lib/widgets/attachments/attachment_editor.dart
@ -22,19 +22,19 @@ import 'package:solian/widgets/attachments/attachment_attr_editor.dart';
 import 'package:solian/widgets/attachments/attachment_fullscreen.dart';

 class AttachmentEditorPopup extends StatefulWidget {
-  final String usage;
+  final String pool;
  final bool singleMode;
  final bool imageOnly;
  final bool autoUpload;
  final double? imageMaxWidth;
  final double? imageMaxHeight;
-  final List<int>? initialAttachments;
-  final void Function(int) onAdd;
-  final void Function(int) onRemove;
+  final List<String>? initialAttachments;
+  final void Function(String) onAdd;
+  final void Function(String) onRemove;

  const AttachmentEditorPopup({
    super.key,
-    required this.usage,
+    required this.pool,
    required this.onAdd,
    required this.onRemove,
    this.singleMode = false,
@ -73,7 +73,7 @@ class _AttachmentEditorPopupState extends State<AttachmentEditorPopup> {

      _enqueueTaskBatch(medias.map((x) {
        final file = File(x.path);
-        return AttachmentUploadTask(file: file, usage: widget.usage);
+        return AttachmentUploadTask(file: file, usage: widget.pool);
      }));
    } else {
      final media = await _imagePicker.pickMedia(
@ -83,7 +83,7 @@ class _AttachmentEditorPopupState extends State<AttachmentEditorPopup> {
      if (media == null) return;

      _enqueueTask(
-        AttachmentUploadTask(file: File(media.path), usage: widget.usage),
+        AttachmentUploadTask(file: File(media.path), usage: widget.pool),
      );
    }
  }
@ -97,7 +97,7 @@ class _AttachmentEditorPopupState extends State<AttachmentEditorPopup> {

    final file = File(media.path);
    _enqueueTask(
-      AttachmentUploadTask(file: file, usage: widget.usage),
+      AttachmentUploadTask(file: file, usage: widget.pool),
    );
  }

@ -113,7 +113,7 @@ class _AttachmentEditorPopupState extends State<AttachmentEditorPopup> {
    List<File> files = result.paths.map((path) => File(path!)).toList();

    _enqueueTaskBatch(files.map((x) {
-      return AttachmentUploadTask(file: x, usage: widget.usage);
+      return AttachmentUploadTask(file: x, usage: widget.pool);
    }));
  }

@ -131,7 +131,7 @@ class _AttachmentEditorPopupState extends State<AttachmentEditorPopup> {

    final file = File(media.path);
    _enqueueTask(
-      AttachmentUploadTask(file: file, usage: widget.usage),
+      AttachmentUploadTask(file: file, usage: widget.pool),
    );
  }

@ -181,13 +181,11 @@ class _AttachmentEditorPopupState extends State<AttachmentEditorPopup> {
    WidgetsBinding.instance.addPostFrameCallback((_) => controller.dispose());

    if (input == null || input.isEmpty) return;
-    final value = int.tryParse(input);
-    if (value == null) return;

    final AttachmentProvider attach = Get.find();
-    final result = await attach.getMetadata(value);
+    final result = await attach.getMetadata(input);
    if (result != null) {
-      widget.onAdd(result.id);
+      widget.onAdd(result.rid);
      setState(() => _attachments.add(result));
      if (widget.singleMode) Navigator.pop(context);
    }
@ -202,11 +200,11 @@ class _AttachmentEditorPopupState extends State<AttachmentEditorPopup> {
    _uploadController.uploadAttachmentWithCallback(
      data,
      'Pasted Image',
-      widget.usage,
+      widget.pool,
      null,
      (item) {
        if (item == null) return;
-        widget.onAdd(item.id);
+        widget.onAdd(item.rid);
        if (mounted) {
          setState(() => _attachments.add(item));
          if (widget.singleMode) Navigator.pop(context);
@ -413,11 +411,11 @@ class _AttachmentEditorPopupState extends State<AttachmentEditorPopup> {
                            : () {
                                _uploadController
                                    .performSingleTask(index)
-                                    .then((r) {
-                                  if (r == null) return;
-                                  widget.onAdd(r.id);
+                                    .then((out) {
+                                  if (out == null) return;
+                                  widget.onAdd(out.rid);
                                  if (mounted) {
-                                    setState(() => _attachments.add(r));
+                                    setState(() => _attachments.add(out));
                                    if (widget.singleMode) {
                                      Navigator.pop(context);
                                    }
@ -515,7 +513,7 @@ class _AttachmentEditorPopupState extends State<AttachmentEditorPopup> {
                        ),
                        onTap: () {
                          _deleteAttachment(element).then((_) {
-                            widget.onRemove(element.id);
+                            widget.onRemove(element.rid);
                            setState(() => _attachments.removeAt(index));
                          });
                        },
@ -529,7 +527,7 @@ class _AttachmentEditorPopupState extends State<AttachmentEditorPopup> {
                          ),
                        ),
                        onTap: () {
-                          widget.onRemove(element.id);
+                          widget.onRemove(element.rid);
                          setState(() => _attachments.removeAt(index));
                        },
                      ),
@ -560,7 +558,7 @@ class _AttachmentEditorPopupState extends State<AttachmentEditorPopup> {

  void _startUploading() {
    _uploadController.performUploadQueue(onData: (r) {
-      widget.onAdd(r.id);
+      widget.onAdd(r.rid);
      if (mounted) {
        setState(() => _attachments.add(r));
        if (widget.singleMode) Navigator.pop(context);
@ -584,7 +582,7 @@ class _AttachmentEditorPopupState extends State<AttachmentEditorPopup> {
          if (_uploadController.isUploading.value) return;
          _enqueueTaskBatch(detail.files.map((x) {
            final file = File(x.path);
-            return AttachmentUploadTask(file: file, usage: widget.usage);
+            return AttachmentUploadTask(file: file, usage: widget.pool);
          }));
        },
        child: Column(
--- a/lib/widgets/attachments/attachment_fullscreen.dart
+++ b/lib/widgets/attachments/attachment_fullscreen.dart
@ -67,9 +67,10 @@ class _AttachmentFullScreenState extends State<AttachmentFullScreen> {
  Future<void> _saveToAlbum() async {
    final url = ServiceFinder.buildUrl(
      'files',
-      '/attachments/${widget.item.id}',
+      '/attachments/${widget.item.rid}',
    );

+    print(url);
    if (PlatformInfo.isWeb || PlatformInfo.isDesktop) {
      await launchUrlString(url);
      return;
@ -258,7 +259,7 @@ class _AttachmentFullScreenState extends State<AttachmentFullScreen> {
                        spacing: 6,
                        children: [
                          Text(
-                            '#${widget.item.id}',
+                            '#${widget.item.rid}',
                            style: metaTextStyle,
                          ),
                          if (widget.item.metadata?['width'] != null &&
--- a/lib/widgets/attachments/attachment_item.dart
+++ b/lib/widgets/attachments/attachment_item.dart
@ -91,7 +91,7 @@ class _AttachmentItemState extends State<AttachmentItem> {
                    launchUrlString(
                      ServiceFinder.buildUrl(
                        'files',
-                        '/attachments/${widget.item.id}',
+                        '/attachments/${widget.item.rid}',
                      ),
                    );
                  },
@ -135,7 +135,7 @@ class _AttachmentItemImage extends StatelessWidget {
              fit: fit,
              imageUrl: ServiceFinder.buildUrl(
                'files',
-                '/attachments/${item.id}',
+                '/attachments/${item.rid}',
              ),
              progressIndicatorBuilder: (context, url, downloadProgress) {
                return Center(
@ -240,7 +240,7 @@ class _AttachmentItemVideoState extends State<_AttachmentItemVideo> {
    final ratio = widget.item.metadata?['ratio'] ?? 16 / 9;
    _playerController = VideoPlayerController.networkUrl(
      Uri.parse(
-        ServiceFinder.buildUrl('files', '/attachments/${widget.item.id}'),
+        ServiceFinder.buildUrl('files', '/attachments/${widget.item.rid}'),
      ),
    );
    _playerController!.initialize();
--- a/lib/widgets/attachments/attachment_list.dart
+++ b/lib/widgets/attachments/attachment_list.dart
@ -14,7 +14,7 @@ import 'package:solian/widgets/sized_container.dart';

 class AttachmentList extends StatefulWidget {
  final String parentId;
-  final List<int> attachmentsId;
+  final List<String> attachmentsId;
  final bool isGrid;
  final bool isForceGrid;
  final bool autoload;
@ -334,13 +334,13 @@ class AttachmentListEntry extends StatelessWidget {
 }

 class AttachmentSelfContainedEntry extends StatefulWidget {
-  final int id;
+  final String rid;
  final String parentId;
  final bool isDense;

  const AttachmentSelfContainedEntry({
    super.key,
-    required this.id,
+    required this.rid,
    required this.parentId,
    this.isDense = false,
  });
@ -359,10 +359,12 @@ class _AttachmentSelfContainedEntryState
    final AttachmentProvider attachments = Get.find();

    return FutureBuilder(
-      future: attachments.getMetadata(widget.id),
+      future: attachments.getMetadata(widget.rid),
      builder: (context, snapshot) {
        if (!snapshot.hasData) {
-          return const Text('Loading...');
+          return const Center(
+            child: CircularProgressIndicator(),
+          );
        }

        return AttachmentListEntry(