[Core] Extended file manager element

Author: Programistich

Flipper/Packages/Core/Sources/FileManager/ExtendedElement.swift

@@ -0,0 +1,19 @@
+import Peripheral
+
+public struct ExtendedElement: Equatable, Identifiable {
+    public var id: String { path.string }
+
+    public let path: Path
+    public let type: Element
+
+    public var name: String {
+        type.name
+    }
+}
+
+extension ExtendedElement {
+    init(element: Element, relativeTo path: Path) {
+        self.path = path.appending(element.name)
+        self.type = element
+    }
+}

Flipper/Packages/Core/Sources/Model/RemoteFileManager.swift renamed to Flipper/Packages/Core/Sources/FileManager/RemoteFileManager.swift

@@ -23,9 +23,11 @@ public class RemoteFileManager: ObservableObject {
 
     // MARK: Directory
 
-    public func list(at path: Path) async throws -> [Element] {
+    public func list(at path: Path) async throws -> [ExtendedElement] {
         do {
-            return try await storage.list(at: path)
+            return try await storage
+                .list(at: path)
+                .map { .init(element: $0, relativeTo: path) }
         } catch {
             logger.error("list directory: \(error)")
             throw Error.unknown(.init(describing: error))

Flipper/Packages/Peripheral/Sources/RPC/Model/Storage.swift

@@ -7,12 +7,10 @@ public struct StorageSpace: Equatable {
     public var used: Int { total - free }
 }
 
-public enum Element: Equatable, Identifiable {
+public enum Element: Equatable {
     case file(File)
     case directory(Directory)
 
-    public var id: String { name }
-
     public var name: String {
         switch self {
         case .file(let file): return file.name

Flipper/iOS/UI/FileManager/Components/ElementRow.swift

@@ -1,11 +1,10 @@
 import Core
-import Peripheral
 
 import SwiftUI
 
 extension FileManagerView.FileManagerListing {
     struct ElementRow: View {
-        let element: Element
+        let element: ExtendedElement
         let type: DisplayType
 
         let onAction: () -> Void
@@ -40,10 +39,10 @@ extension FileManagerView.FileManagerListing {
 
 fileprivate extension FileManagerView.FileManagerListing.ElementRow {
     struct Icon: View {
-        let element: Element
+        let element: ExtendedElement
 
         private var image: Image {
-            switch element {
+            switch element.type {
             case .directory:
                 return .init("Folder")
             case .file:
@@ -55,7 +54,7 @@ fileprivate extension FileManagerView.FileManagerListing.ElementRow {
             }
         }
 
-        init(for element: Element) {
+        init(for element: ExtendedElement) {
             self.element = element
         }
 
@@ -69,9 +68,9 @@ fileprivate extension FileManagerView.FileManagerListing.ElementRow {
     }
 
     struct Title: View {
-        let element: Element
+        let element: ExtendedElement
 
-        init(for element: Element) {
+        init(for element: ExtendedElement) {
             self.element = element
         }
 
@@ -82,7 +81,7 @@ fileprivate extension FileManagerView.FileManagerListing.ElementRow {
                     .foregroundColor(.primary)
                     .lineLimit(1)
 
-                if case let .file(file) = element {
+                if case let .file(file) = element.type {
                     Text(file.size.hr)
                         .font(.system(size: 10, weight: .medium))
                         .foregroundColor(.black30)

Flipper/iOS/UI/FileManager/Components/FileManagerElements.swift

@@ -1,23 +1,23 @@
-import Peripheral
+import Core
 
 import SwiftUI
 
 extension FileManagerView.FileManagerListing {
     struct FileManagerElements: View {
-        let elements: [Element]
+        let elements: [ExtendedElement]
         let displayType: DisplayType
 
-        let onTap: (Element) -> Void
-        let onDelete: (Element) -> Void
-        let onAction: (Element) -> Void
+        let onTap: (ExtendedElement) -> Void
+        let onDelete: (ExtendedElement) -> Void
+        let onAction: (ExtendedElement) -> Void
 
         private let columns = [GridItem(.flexible()), GridItem(.flexible())]
 
         var body: some View {
             Group {
                 switch displayType {
                 case .list:
-                    ForEach(elements, id: \.description) { element in
+                    ForEach(elements) { element in
                         ElementRow(
                             element: element,
                             type: displayType,
@@ -36,7 +36,7 @@ extension FileManagerView.FileManagerListing {
                     }
                 case .grid:
                     LazyVGrid(columns: columns, spacing: 12) {
-                        ForEach(elements, id: \.description) { element in
+                        ForEach(elements) { element in
                             ElementRow(
                                 element: element,
                                 type: displayType,

Flipper/iOS/UI/FileManager/Components/SelectedElementSheet.swift

@@ -1,4 +1,4 @@
-import Peripheral
+import Core
 
 import SwiftUI
 
@@ -7,24 +7,24 @@ extension FileManagerView.FileManagerListing {
         @Environment(\.colorScheme) var colorScheme
         @Environment(\.dismiss) private var dismiss
 
-        let element: Element
+        let element: ExtendedElement
 
-        let onExport: (Element) -> Void
-        let onDelete: (Element) -> Void
+        let onExport: (ExtendedElement) -> Void
+        let onDelete: (ExtendedElement) -> Void
 
         private var backgroundColor: Color {
             colorScheme == .light ? .white : .black88
         }
 
         private var type: String {
-            switch element {
+            switch element.type {
             case .directory: "Folder"
             case .file: "File"
             }
         }
 
         private var isDirectory: Bool {
-            return if case .directory = element {
+            return if case .directory = element.type {
                 true
             } else {
                 false

Flipper/iOS/UI/FileManager/FileManagerListing.swift

@@ -12,13 +12,13 @@ extension FileManagerView {
         @Environment(\.path) var navigationPath
         @Environment(\.dismiss) var dismiss
 
-        @State private var _elements: [Element] = []
+        @State private var _elements: [ExtendedElement] = []
         @State private var isLoading = true
         @State private var error: String?
 
         @State private var isFileImporterPresented = false
         @State private var showOptions = false
-        @State private var selectedElement: Element?
+        @State private var selectedElement: ExtendedElement?
 
         @AppStorage(.fileManagerShowHiddenFiles)
         private var isHiddenFilesShow: Bool = false
@@ -37,7 +37,7 @@ extension FileManagerView {
             case grid
         }
 
-        var elements: [Element] {
+        var elements: [ExtendedElement] {
             isHiddenFilesShow
                 ? _elements
                 : _elements.filter { !$0.name.hasPrefix(".") }
@@ -104,9 +104,9 @@ extension FileManagerView {
                     isHiddenFilesShow: isHiddenFilesShow
                 )
             }
-            .sheet(item: $selectedElement) { element in
+            .sheet(item: $selectedElement) {
                 SelectedElementSheet(
-                    element: element,
+                    element: $0,
                     onExport: downloadFile,
                     onDelete: deleteFile
                 )
@@ -138,8 +138,8 @@ extension FileManagerView {
             }
         }
 
-        private func navigate(_ element: Element) {
-            switch element {
+        private func navigate(_ extended: ExtendedElement) {
+            switch extended.type {
             case .directory(let directory):
                 let nextPath = path.appending(directory.name)
                 navigationPath.append(Destination.listing(nextPath))
@@ -165,11 +165,11 @@ extension FileManagerView {
             }
         }
 
-        private func downloadFile(_ element: Element) {
+        private func downloadFile(_ extended: ExtendedElement) {
             isLoading = true
             defer { isLoading = false }
 
-            guard case let .file(file) = element else { return }
+            guard case let .file(file) = extended.type else { return }
 
             Task {
                 do {
@@ -187,13 +187,13 @@ extension FileManagerView {
             }
         }
 
-        private func deleteFile(_ element: Element) {
+        private func deleteFile(_ extended: ExtendedElement) {
             isLoading = true
             defer { isLoading = false }
 
             Task {
                 do {
-                    try await fileManager.delete(element, at: path)
+                    try await fileManager.delete(extended.type, at: path)
                     await load()
                 } catch {
                     self.error = String(describing: error)