Bradley Nelson
9f4bc54113
Resolve conflicts between the external-file-mounts feature and upstream's D5/D7 refactor (per-file provenance, keyset pagination, cross-drive move gates, resource-access hook, folder-cascade lifecycle hook). Key resolutions: - FolderService::new now takes (repo, authz, file_lifecycle, mount_router); all callers + DI updated. - FileRetrievalService / FileManagementService keep both the mount_router and the new resource_access_hook / drive_repo / storage_usage wiring. - list_files_batch_with_perms: adapt the mount branch from offset- to keyset (after_name) pagination, mirroring paginate_mount_entries. - download_file_impl: keep upstream's &HeaderMap + `impl IntoResponse + use<>` signature, retain the mount-download branch. - Mount DTOs: the retired `owner_id` field maps onto created_by/updated_by (the mount owner) — the fields the frontend now uses for owner display. - admin/+page.svelte: keep upstream's user-delete modal + the 'mounts' tab. - Bump memmap2 0.9.10 -> 0.9.11 (RUSTSEC critical advisory fix) and regenerate Cargo.lock against the merged Cargo.toml.
53 lines
1.5 KiB
Rust
53 lines
1.5 KiB
Rust
pub mod admin_settings_service;
|
|
pub mod app_password_service;
|
|
pub mod auth_application_service;
|
|
pub mod batch_operations;
|
|
pub mod blob_lifecycle_service;
|
|
pub mod calendar_service;
|
|
pub mod contact_service;
|
|
pub mod delta_upload_service;
|
|
pub mod device_auth_service;
|
|
pub mod drive_management_service;
|
|
pub mod external_identity_service;
|
|
pub mod external_mount_router;
|
|
pub mod external_upload_service;
|
|
pub mod favorites_service;
|
|
pub mod file_lifecycle_service;
|
|
pub mod file_management_service;
|
|
pub mod file_retrieval_service;
|
|
pub mod file_upload_service;
|
|
pub mod file_use_case_factory;
|
|
pub mod folder_service;
|
|
pub mod i18n_application_service;
|
|
pub mod magic_link_invite_service;
|
|
pub mod mount_dto;
|
|
pub mod mount_registry;
|
|
pub mod music_service;
|
|
pub mod nextcloud_file_id_service;
|
|
pub mod nextcloud_login_flow_service;
|
|
pub mod people_service;
|
|
pub mod places_service;
|
|
pub mod recent_service;
|
|
pub mod recipient_notification_service;
|
|
pub mod search_service;
|
|
pub mod share_browse_service;
|
|
pub mod share_service;
|
|
pub mod storage_settings_service;
|
|
pub mod storage_usage_service;
|
|
pub mod subject_group_service;
|
|
pub mod trash_service;
|
|
pub mod user_lifecycle_service;
|
|
pub mod wopi_lock_service;
|
|
pub mod wopi_token_service;
|
|
|
|
#[cfg(test)]
|
|
mod batch_operations_test;
|
|
#[cfg(test)]
|
|
mod trash_service_test;
|
|
|
|
// Re-exportar para facilitar acceso
|
|
pub use file_management_service::FileManagementService;
|
|
pub use file_retrieval_service::FileRetrievalService;
|
|
pub use file_upload_service::FileUploadService;
|
|
pub use file_use_case_factory::AppFileUseCaseFactory;
|