claude refactorings, flutter best practices, platform dependent changes, general cleanup
This commit is contained in:
@@ -3,9 +3,8 @@ import 'dart:io';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:loader_overlay/loader_overlay.dart';
|
||||
import 'package:nextcloud/nextcloud.dart';
|
||||
import 'package:uuid/uuid.dart';
|
||||
|
||||
import '../../../api/marianumcloud/webdav/webdavApi.dart';
|
||||
import '../../../api/marianumcloud/webdav/webdav_api.dart';
|
||||
import '../../../widget/confirm_dialog.dart';
|
||||
import '../../../widget/focus_behaviour.dart';
|
||||
|
||||
@@ -107,14 +106,14 @@ class _FilesUploadDialogState extends State<FilesUploadDialog> {
|
||||
_showUploadError('Verbindung fehlgeschlagen: $e');
|
||||
return;
|
||||
}
|
||||
var conflictingFiles = _uploadableFiles.where((file) {
|
||||
var fileName = file.fileName;
|
||||
return result.any((element) => Uri.decodeComponent(element.href!).endsWith('/$fileName'));
|
||||
final conflictingFiles = _uploadableFiles.where((file) {
|
||||
final fileName = file.fileName;
|
||||
return result.any((element) => Uri.decodeComponent((element as WebDavResponse).href!).endsWith('/$fileName'));
|
||||
}).toList();
|
||||
|
||||
if(conflictingFiles.isNotEmpty) {
|
||||
if (conflictingFiles.isNotEmpty) {
|
||||
if (!mounted) return;
|
||||
bool replaceFiles = await showDialog(
|
||||
final replaceFiles = await showDialog<bool>(
|
||||
context: context,
|
||||
barrierDismissible: false,
|
||||
builder: (context) => AlertDialog(
|
||||
@@ -160,7 +159,7 @@ class _FilesUploadDialogState extends State<FilesUploadDialog> {
|
||||
)
|
||||
);
|
||||
|
||||
if(!replaceFiles) {
|
||||
if (replaceFiles != true) {
|
||||
setState(() {
|
||||
_isUploading = false;
|
||||
_overallProgressValue = 0.0;
|
||||
@@ -179,7 +178,10 @@ class _FilesUploadDialogState extends State<FilesUploadDialog> {
|
||||
var fileName = file.fileName;
|
||||
var filePath = file.filePath;
|
||||
|
||||
if(widget.uniqueNames) fileName = '${fileName.split('.').first}-${const Uuid().v4()}.${fileName.split('.').last}';
|
||||
if (widget.uniqueNames) {
|
||||
final unique = DateTime.now().microsecondsSinceEpoch.toRadixString(36);
|
||||
fileName = '${fileName.split('.').first}-$unique.${fileName.split('.').last}';
|
||||
}
|
||||
|
||||
var fullRemotePath = '${widget.remotePath}/$fileName';
|
||||
|
||||
@@ -187,7 +189,7 @@ class _FilesUploadDialogState extends State<FilesUploadDialog> {
|
||||
_infoText = '${_uploadableFiles.indexOf(file) + 1}/${_uploadableFiles.length}';
|
||||
});
|
||||
|
||||
final dynamic uploadTask;
|
||||
final HttpClientResponse uploadTask;
|
||||
try {
|
||||
uploadTask = await webdavClient.putFile(
|
||||
File(filePath),
|
||||
|
||||
Reference in New Issue
Block a user