Skip to content

Commit

Permalink
feat(neon_files): Implement file syncing
Browse files Browse the repository at this point in the history
Signed-off-by: jld3103 <[email protected]>
  • Loading branch information
provokateurin committed Nov 4, 2023
1 parent d9996c3 commit 1c12134
Show file tree
Hide file tree
Showing 13 changed files with 461 additions and 69 deletions.
8 changes: 8 additions & 0 deletions packages/app/pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1397,6 +1397,14 @@ packages:
url: "https://pub.dev"
source: hosted
version: "1.1.0"
watcher:
dependency: transitive
description:
name: watcher
sha256: "3d2ad6751b3c16cf07c7fca317a1413b3f26530319181b37e3b9039b84fc01d8"
url: "https://pub.dev"
source: hosted
version: "1.1.0"
web:
dependency: transitive
description:
Expand Down
53 changes: 15 additions & 38 deletions packages/neon/neon_files/lib/blocs/files.dart
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ part of '../neon_files.dart';
abstract interface class FilesBlocEvents {
void uploadFile(final List<String> path, final String localPath);

void syncFile(final List<String> path);

void openFile(final List<String> path, final String etag, final String? mimeType);

void shareFileNative(final List<String> path, final String etag);
Expand Down Expand Up @@ -57,6 +55,21 @@ class FilesBloc extends InteractiveBloc implements FilesBlocEvents, FilesBlocSta
@override
BehaviorSubject<List<FilesTask>> tasks = BehaviorSubject<List<FilesTask>>.seeded([]);

@override
Future<void> refresh() async {
await browser.refresh();
}

@override
void removeFavorite(final List<String> path) {
wrapAction(
() async => account.client.webdav.proppatch(
Uri(pathSegments: path),
set: WebDavProp(ocfavorite: 0),
),
);
}

@override
void addFavorite(final List<String> path) {
wrapAction(
Expand Down Expand Up @@ -109,21 +122,6 @@ class FilesBloc extends InteractiveBloc implements FilesBlocEvents, FilesBlocSta
);
}

@override
Future<void> refresh() async {
await browser.refresh();
}

@override
void removeFavorite(final List<String> path) {
wrapAction(
() async => account.client.webdav.proppatch(
Uri(pathSegments: path),
set: WebDavProp(ocfavorite: 0),
),
);
}

@override
void rename(final List<String> path, final String name) {
wrapAction(
Expand All @@ -134,27 +132,6 @@ class FilesBloc extends InteractiveBloc implements FilesBlocEvents, FilesBlocSta
);
}

@override
void syncFile(final List<String> path) {
wrapAction(
() async {
final file = File(
p.join(
await NeonPlatform.instance.userAccessibleAppDataPath,
account.humanReadableID,
'files',
path.join(Platform.pathSeparator),
),
);
if (!file.parent.existsSync()) {
file.parent.createSync(recursive: true);
}
await _downloadFile(path, file);
},
disableTimeout: true,
);
}

@override
void uploadFile(final List<String> path, final String localPath) {
wrapAction(
Expand Down
3 changes: 1 addition & 2 deletions packages/neon/neon_files/lib/models/file_details.dart
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@ class FileDetails {

FileDetails.fromWebDav({
required final WebDavFile file,
required final List<String> path,
}) : path = List.from(path)..add(file.name),
}) : path = file.path.split('/').where((final element) => element.isNotEmpty).toList(),
isDirectory = file.isDirectory,
size = file.size,
etag = file.etag,
Expand Down
8 changes: 8 additions & 0 deletions packages/neon/neon_files/lib/neon_files.dart
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,13 @@ import 'package:neon/models.dart';
import 'package:neon/platform.dart';
import 'package:neon/settings.dart';
import 'package:neon/sort_box.dart';
import 'package:neon/sync.dart';
import 'package:neon/theme.dart';
import 'package:neon/utils.dart';
import 'package:neon/widgets.dart';
import 'package:neon_files/l10n/localizations.dart';
import 'package:neon_files/routes.dart';
import 'package:neon_files/sync/mapping.dart';
import 'package:neon_files/widgets/file_list_tile.dart';
import 'package:nextcloud/core.dart' as core;
import 'package:nextcloud/nextcloud.dart';
Expand All @@ -65,9 +67,12 @@ part 'options.dart';
part 'pages/details.dart';
part 'pages/main.dart';
part 'sort/files.dart';
part 'sync/implementation.dart';
part 'sync/sources.dart';
part 'utils/task.dart';
part 'widgets/browser_view.dart';
part 'widgets/file_preview.dart';
part 'widgets/file_tile.dart';
part 'widgets/navigator.dart';

class FilesApp extends AppImplementation<FilesBloc, FilesAppSpecificOptions> {
Expand All @@ -94,6 +99,9 @@ class FilesApp extends AppImplementation<FilesBloc, FilesAppSpecificOptions> {
@override
final Widget page = const FilesMainPage();

@override
final FilesSync syncImplementation = const FilesSync();

@override
final RouteBase route = $filesAppRoute;
}
97 changes: 97 additions & 0 deletions packages/neon/neon_files/lib/sync/implementation.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,97 @@
part of '../neon_files.dart';

@immutable
class FilesSync implements SyncImplementation<FilesSyncMapping, WebDavFile, FileSystemEntity> {
const FilesSync();

@override
String get appId => AppIDs.files;

@override
FilesSyncSources getSources(final Account account, final FilesSyncMapping mapping) => FilesSyncSources(
account.client,
mapping.remotePath,
mapping.localPath,
);

@override
Map<String, dynamic> serializeMapping(final FilesSyncMapping mapping) => mapping.toJson();

@override
FilesSyncMapping deserializeMapping(final Map<String, dynamic> json) => FilesSyncMapping.fromJson(json);

@override
Future<FilesSyncMapping?> addMapping(final BuildContext context, final Account account) async {
final accountsBloc = NeonProvider.of<AccountsBloc>(context);
final appsBloc = accountsBloc.getAppsBlocFor(account);
final filesBloc = appsBloc.getAppBlocByID(AppIDs.files)! as FilesBloc;
final filesBrowserBloc = filesBloc.getNewFilesBrowserBloc();

final remotePath = await showDialog<List<String>?>(
context: context,
builder: (final context) => FilesChooseFolderDialog(
bloc: filesBrowserBloc,
filesBloc: filesBloc,
originalPath: const [],
),
);
filesBrowserBloc.dispose();
if (remotePath == null) {
return null;
}

final localPath = await FileUtils.pickDirectory();
if (localPath == null) {
return null;
}
if (!context.mounted) {
return null;
}

return FilesSyncMapping(
appId: AppIDs.files,
accountId: account.id,
remotePath: Uri(pathSegments: remotePath),
localPath: Directory(localPath),
journal: SyncJournal(),
);
}

@override
String getMappingDisplayTitle(final FilesSyncMapping mapping) => mapping.remotePath.toString();

@override
String getMappingDisplaySubtitle(final FilesSyncMapping mapping) => mapping.localPath.path;

@override
String getMappingId(final FilesSyncMapping mapping) =>
'${Uri.encodeComponent(mapping.remotePath.toString())}-${Uri.encodeComponent(mapping.localPath.path)}';

@override
Widget getConflictDetailsLocal(final BuildContext context, final FileSystemEntity object) {
final stat = object.statSync();
return FilesFileTile(
showFullPath: true,
filesBloc: NeonProvider.of<FilesBloc>(context),
details: FileDetails(
path: object.path.split('/'),
isDirectory: object is Directory,
size: stat.size,
etag: '',
mimeType: '',
lastModified: stat.modified,
hasPreview: false,
isFavorite: false,
),
);
}

@override
Widget getConflictDetailsRemote(final BuildContext context, final WebDavFile object) => FilesFileTile(
showFullPath: true,
filesBloc: NeonProvider.of<FilesBloc>(context),
details: FileDetails.fromWebDav(
file: object,
),
);
}
62 changes: 62 additions & 0 deletions packages/neon/neon_files/lib/sync/mapping.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
import 'dart:async';
import 'dart:io';

import 'package:flutter/foundation.dart';
import 'package:json_annotation/json_annotation.dart';
import 'package:neon/sync.dart';
import 'package:nextcloud/webdav.dart' as webdav;
import 'package:watcher/watcher.dart';

part 'mapping.g.dart';

@JsonSerializable()
class FilesSyncMapping implements SyncMapping<webdav.WebDavFile, FileSystemEntity> {
FilesSyncMapping({
required this.accountId,
required this.appId,
required this.journal,
required this.remotePath,
required this.localPath,
});

factory FilesSyncMapping.fromJson(final Map<String, dynamic> json) => _$FilesSyncMappingFromJson(json);
Map<String, dynamic> toJson() => _$FilesSyncMappingToJson(this);

@override
final String accountId;

@override
final String appId;

@override
final SyncJournal journal;

final Uri remotePath;

@JsonKey(
fromJson: _directoryFromJson,
toJson: _directoryToJson,
)
final Directory localPath;

static Directory _directoryFromJson(final String value) => Directory(value);
static String _directoryToJson(final Directory value) => value.path;

StreamSubscription<WatchEvent>? _subscription;

@override
void watch(final void Function() onUpdated) {
debugPrint('Watching file changes: $localPath');
_subscription ??= DirectoryWatcher(localPath.path).events.listen(
(final event) {
debugPrint('Registered file change: ${event.path} ${event.type}');
onUpdated();
},
);
}

@override
void dispose() {
unawaited(_subscription?.cancel());
}
}
23 changes: 23 additions & 0 deletions packages/neon/neon_files/lib/sync/mapping.g.dart

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 1c12134

Please sign in to comment.