Meshtastic-Apple/Meshtastic/Views/Nodes/Helpers/Map/MapDataFiles.swift

221 lines
5.1 KiB
Swift
Raw Normal View History

2025-07-21 21:42:36 +00:00
import SwiftUI
import UniformTypeIdentifiers
import OSLog
2025-07-22 04:13:54 +00:00
struct MapDataFiles: View {
2025-07-23 20:58:46 +00:00
@Environment(\.managedObjectContext) var context
Transports Interface to Support TCP for all Platforms and Serial on Mac (#1341) * Initial implementation of transports * Initial LogRadio implementation * Fixes for Settings view (caused by debug commenting) * Refinement of the object and actor model * Connect view text and tab updates * Fix mac catalyst and tests * Warning and logging clean-up * In progress commit * Serial Transport and Reconnect draft work * Serial transport and reconnection draft work * Quick fix for BLE - still more work to do * interim commit * More in progress changes * Minor improvements * Pretty good initial implementation * Bump version beyond the app store * Fix for disconnection swipeAction * Tweaks to TCPConnection implementation * Retry for NONCE_ONLY_DB * Revert json string change * Simplified some of the API + "Anti-discovery" * Tweaks for devices leaving the discovery process * Bump version * iOS26 Tweaks * Tweaks and bug fixes * Add link with slash sf symbol * update symbol image on connect view * BLE disconnect handling * Log privacy attributes * Onboarding and minor fixes. * change database to nodes, add emoji to tcp logs * Error handling improvements * More logging emojis * Suppressed unnecessary errors on disconnect * Heartbeat emoji * Add bluetooth symbol * add privacy attributes to [TCP] logs, add custom bluetooth logo * Improve routing logs * Emoji for connect logs * Heartbeat emoji * Add CBCentralManagerScanOptionAllowDuplicatesKey options to central for bluetooth * fix nav errors by switching from observableobject to state * Update connection indicator icon * fix for BLE disconnects * Connection process fixes * More fixes/tweaks to connection process * Strict concurrency * Fix some warnings, remove wifi warning * delete stale keys * interim commit * Update privacy for log, fix wrong space * fix a couple of linting items * Switch to targeted * interim commit * BLE Signal strenth on connect view * Remove BLE RSSI from long press menu * Modem lights * minor spacing tweak * Additional BLE logging and a scanning fix. * Discovery and BLE RSSI improvements * Background suspension * Update isConnected to enable UI during db load * update protobufs * Replace config if statements with switches, Fix unknown module config logging, make dark mode modem circle stroke color white so they are visible * Additional logging cleanup * hast * Set unmessagable to true if the longname has the unmessagable emoji * Connect error handling improvements * Admin popup list icon and activity lights updates * Revert use of .toolbar back to .navigationBarItems * More public logging * Better BLE error handling * Node DB progress meter * minor tweak to activity light interaction timing * Fix comment linting, remove stale keys * Remove stale keys * Easy linting fixes * Two more simple linting fixes * clean up meshtasticapp * More public logging * Replay config * Logging * Fix for unselected node on Settings * Tweak to progress meter based on device idiom * Update protos * Session replay redaction of messages * Serial fix for old devices, and a let statement * Mask text too * Fix typo * BLE poweredOff is now an auto-reconnectable error * Update logging * Fix for peerRemovedPairingInformation * Logging for BLE peripheral:didUpdateValueFor errors. * Fix for inconsistent swipe disconnect behavior * periperal:didUpdateValueFor error handling * Fix for BLEConnection continuation guarding * BLEConnection actor deadlock on disconnect * Heartbeat nonce * Fix for swipe disconnect and task cancellation * Fix for swipe actions not honoring .disabled() * Tell BLETransport when BLEConnection is cancelled * Update navigation logging * Logging updates * Bump version to 2.7.0 * Organize into folders and heartbeat stuff * Minor improvements to manual TCP connection * Auto-connect toggle * Possible BLE bug, still waiting to see in logs * Concurrency tweaks * Concurrency improvements * requestDeviceMetadata fix. fixes remote admin * Minor typo fixes * "All" button for log filters: category and level * More robust continuation handling for BLE * @FetchRequest based ChannelMessageList * Update info.plist and device hardware file * Move auto connect toggle to app settings and debug mode, tint properly with the accent color * Add label to auto connect toggle * Update log for node info received from ourselves over the mesh * Remove unused scrollViewProxy * Update Meshtastic/Views/Onboarding/DeviceOnboarding.swift Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update target for connect view * Properly Set datadog environment * Comment out ble manager * Adjust cyclomatic complexity thresholds in .swiftlint.yml * Linting fixes, delete ble manager * Make session replay debug only --------- Co-authored-by: jake-b <jake-b@users.noreply.github.com> Co-authored-by: jake <jake@jakes-Mac-mini.local> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
2025-08-27 08:09:02 -07:00
@EnvironmentObject var accessoryManager: AccessoryManager
2025-07-23 20:58:46 +00:00
@ObservedObject private var mapDataManager = MapDataManager.shared
2025-07-23 20:58:46 +00:00
@State private var isShowingFilePicker = false
@State private var isProcessing = false
@State private var processingProgress: Double = 0.0
@State private var showError = false
@State private var errorMessage = ""
@State private var showSuccess = false
@State private var successMessage = ""
2025-07-23 20:58:46 +00:00
var body: some View {
Form {
Section(header: Text("Upload Map Overlays")) {
2025-07-23 20:58:46 +00:00
Text("Upload GeoJSON files to display custom map overlays. Files are stored locally and can be up to 10MB.")
.font(.callout)
2025-07-23 20:58:46 +00:00
.foregroundColor(.secondary)
// Upload Button
Button(action: {
isShowingFilePicker = true
}) {
HStack {
Image(systemName: "doc.badge.plus")
.font(.title2)
Text("Select Map File")
.fontWeight(.medium)
}
.frame(maxWidth: .infinity)
.padding()
.background(Color.accentColor)
.foregroundColor(.white)
.cornerRadius(10)
2025-07-23 20:58:46 +00:00
}
.disabled(isProcessing)
.padding(.horizontal)
// Processing Indicator
if isProcessing {
VStack(spacing: 12) {
ProgressView(value: processingProgress)
.progressViewStyle(LinearProgressViewStyle())
.padding(.horizontal)
Text("Processing file...")
.font(.caption)
.foregroundColor(.secondary)
}
2025-07-23 20:58:46 +00:00
}
}
Section(header: Text("Uploaded Map Overlays")) {
2025-07-23 20:58:46 +00:00
let uploadedFiles = mapDataManager.getUploadedFiles()
2025-07-23 20:58:46 +00:00
if uploadedFiles.isEmpty {
Transports Interface to Support TCP for all Platforms and Serial on Mac (#1341) * Initial implementation of transports * Initial LogRadio implementation * Fixes for Settings view (caused by debug commenting) * Refinement of the object and actor model * Connect view text and tab updates * Fix mac catalyst and tests * Warning and logging clean-up * In progress commit * Serial Transport and Reconnect draft work * Serial transport and reconnection draft work * Quick fix for BLE - still more work to do * interim commit * More in progress changes * Minor improvements * Pretty good initial implementation * Bump version beyond the app store * Fix for disconnection swipeAction * Tweaks to TCPConnection implementation * Retry for NONCE_ONLY_DB * Revert json string change * Simplified some of the API + "Anti-discovery" * Tweaks for devices leaving the discovery process * Bump version * iOS26 Tweaks * Tweaks and bug fixes * Add link with slash sf symbol * update symbol image on connect view * BLE disconnect handling * Log privacy attributes * Onboarding and minor fixes. * change database to nodes, add emoji to tcp logs * Error handling improvements * More logging emojis * Suppressed unnecessary errors on disconnect * Heartbeat emoji * Add bluetooth symbol * add privacy attributes to [TCP] logs, add custom bluetooth logo * Improve routing logs * Emoji for connect logs * Heartbeat emoji * Add CBCentralManagerScanOptionAllowDuplicatesKey options to central for bluetooth * fix nav errors by switching from observableobject to state * Update connection indicator icon * fix for BLE disconnects * Connection process fixes * More fixes/tweaks to connection process * Strict concurrency * Fix some warnings, remove wifi warning * delete stale keys * interim commit * Update privacy for log, fix wrong space * fix a couple of linting items * Switch to targeted * interim commit * BLE Signal strenth on connect view * Remove BLE RSSI from long press menu * Modem lights * minor spacing tweak * Additional BLE logging and a scanning fix. * Discovery and BLE RSSI improvements * Background suspension * Update isConnected to enable UI during db load * update protobufs * Replace config if statements with switches, Fix unknown module config logging, make dark mode modem circle stroke color white so they are visible * Additional logging cleanup * hast * Set unmessagable to true if the longname has the unmessagable emoji * Connect error handling improvements * Admin popup list icon and activity lights updates * Revert use of .toolbar back to .navigationBarItems * More public logging * Better BLE error handling * Node DB progress meter * minor tweak to activity light interaction timing * Fix comment linting, remove stale keys * Remove stale keys * Easy linting fixes * Two more simple linting fixes * clean up meshtasticapp * More public logging * Replay config * Logging * Fix for unselected node on Settings * Tweak to progress meter based on device idiom * Update protos * Session replay redaction of messages * Serial fix for old devices, and a let statement * Mask text too * Fix typo * BLE poweredOff is now an auto-reconnectable error * Update logging * Fix for peerRemovedPairingInformation * Logging for BLE peripheral:didUpdateValueFor errors. * Fix for inconsistent swipe disconnect behavior * periperal:didUpdateValueFor error handling * Fix for BLEConnection continuation guarding * BLEConnection actor deadlock on disconnect * Heartbeat nonce * Fix for swipe disconnect and task cancellation * Fix for swipe actions not honoring .disabled() * Tell BLETransport when BLEConnection is cancelled * Update navigation logging * Logging updates * Bump version to 2.7.0 * Organize into folders and heartbeat stuff * Minor improvements to manual TCP connection * Auto-connect toggle * Possible BLE bug, still waiting to see in logs * Concurrency tweaks * Concurrency improvements * requestDeviceMetadata fix. fixes remote admin * Minor typo fixes * "All" button for log filters: category and level * More robust continuation handling for BLE * @FetchRequest based ChannelMessageList * Update info.plist and device hardware file * Move auto connect toggle to app settings and debug mode, tint properly with the accent color * Add label to auto connect toggle * Update log for node info received from ourselves over the mesh * Remove unused scrollViewProxy * Update Meshtastic/Views/Onboarding/DeviceOnboarding.swift Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update target for connect view * Properly Set datadog environment * Comment out ble manager * Adjust cyclomatic complexity thresholds in .swiftlint.yml * Linting fixes, delete ble manager * Make session replay debug only --------- Co-authored-by: jake-b <jake-b@users.noreply.github.com> Co-authored-by: jake <jake@jakes-Mac-mini.local> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
2025-08-27 08:09:02 -07:00
ContentUnavailableView("No files uploaded", systemImage: "doc.text")
2025-07-23 20:58:46 +00:00
} else {
ScrollView {
Transports Interface to Support TCP for all Platforms and Serial on Mac (#1341) * Initial implementation of transports * Initial LogRadio implementation * Fixes for Settings view (caused by debug commenting) * Refinement of the object and actor model * Connect view text and tab updates * Fix mac catalyst and tests * Warning and logging clean-up * In progress commit * Serial Transport and Reconnect draft work * Serial transport and reconnection draft work * Quick fix for BLE - still more work to do * interim commit * More in progress changes * Minor improvements * Pretty good initial implementation * Bump version beyond the app store * Fix for disconnection swipeAction * Tweaks to TCPConnection implementation * Retry for NONCE_ONLY_DB * Revert json string change * Simplified some of the API + "Anti-discovery" * Tweaks for devices leaving the discovery process * Bump version * iOS26 Tweaks * Tweaks and bug fixes * Add link with slash sf symbol * update symbol image on connect view * BLE disconnect handling * Log privacy attributes * Onboarding and minor fixes. * change database to nodes, add emoji to tcp logs * Error handling improvements * More logging emojis * Suppressed unnecessary errors on disconnect * Heartbeat emoji * Add bluetooth symbol * add privacy attributes to [TCP] logs, add custom bluetooth logo * Improve routing logs * Emoji for connect logs * Heartbeat emoji * Add CBCentralManagerScanOptionAllowDuplicatesKey options to central for bluetooth * fix nav errors by switching from observableobject to state * Update connection indicator icon * fix for BLE disconnects * Connection process fixes * More fixes/tweaks to connection process * Strict concurrency * Fix some warnings, remove wifi warning * delete stale keys * interim commit * Update privacy for log, fix wrong space * fix a couple of linting items * Switch to targeted * interim commit * BLE Signal strenth on connect view * Remove BLE RSSI from long press menu * Modem lights * minor spacing tweak * Additional BLE logging and a scanning fix. * Discovery and BLE RSSI improvements * Background suspension * Update isConnected to enable UI during db load * update protobufs * Replace config if statements with switches, Fix unknown module config logging, make dark mode modem circle stroke color white so they are visible * Additional logging cleanup * hast * Set unmessagable to true if the longname has the unmessagable emoji * Connect error handling improvements * Admin popup list icon and activity lights updates * Revert use of .toolbar back to .navigationBarItems * More public logging * Better BLE error handling * Node DB progress meter * minor tweak to activity light interaction timing * Fix comment linting, remove stale keys * Remove stale keys * Easy linting fixes * Two more simple linting fixes * clean up meshtasticapp * More public logging * Replay config * Logging * Fix for unselected node on Settings * Tweak to progress meter based on device idiom * Update protos * Session replay redaction of messages * Serial fix for old devices, and a let statement * Mask text too * Fix typo * BLE poweredOff is now an auto-reconnectable error * Update logging * Fix for peerRemovedPairingInformation * Logging for BLE peripheral:didUpdateValueFor errors. * Fix for inconsistent swipe disconnect behavior * periperal:didUpdateValueFor error handling * Fix for BLEConnection continuation guarding * BLEConnection actor deadlock on disconnect * Heartbeat nonce * Fix for swipe disconnect and task cancellation * Fix for swipe actions not honoring .disabled() * Tell BLETransport when BLEConnection is cancelled * Update navigation logging * Logging updates * Bump version to 2.7.0 * Organize into folders and heartbeat stuff * Minor improvements to manual TCP connection * Auto-connect toggle * Possible BLE bug, still waiting to see in logs * Concurrency tweaks * Concurrency improvements * requestDeviceMetadata fix. fixes remote admin * Minor typo fixes * "All" button for log filters: category and level * More robust continuation handling for BLE * @FetchRequest based ChannelMessageList * Update info.plist and device hardware file * Move auto connect toggle to app settings and debug mode, tint properly with the accent color * Add label to auto connect toggle * Update log for node info received from ourselves over the mesh * Remove unused scrollViewProxy * Update Meshtastic/Views/Onboarding/DeviceOnboarding.swift Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update target for connect view * Properly Set datadog environment * Comment out ble manager * Adjust cyclomatic complexity thresholds in .swiftlint.yml * Linting fixes, delete ble manager * Make session replay debug only --------- Co-authored-by: jake-b <jake-b@users.noreply.github.com> Co-authored-by: jake <jake@jakes-Mac-mini.local> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
2025-08-27 08:09:02 -07:00
LazyVStack {
ForEach(Array(uploadedFiles.enumerated()), id: \.offset) { index, file in
MapDataFileRow(file: file, showDivider: index < uploadedFiles.count - 1) {
2025-07-23 20:58:46 +00:00
deleteFile(file)
}
}
}
.padding(.horizontal)
}
}
}
}
.fileImporter(
isPresented: $isShowingFilePicker,
allowedContentTypes: [
UTType.json,
UTType(filenameExtension: "geojson") ?? UTType.json
],
allowsMultipleSelection: false
) { result in
handleFileSelection(result)
}
.alert("Upload Error", isPresented: $showError) {
Button("Ok") { }
2025-07-23 20:58:46 +00:00
} message: {
Text(errorMessage)
}
.alert("Upload Success", isPresented: $showSuccess) {
Button("Ok") { }
2025-07-23 20:58:46 +00:00
} message: {
Text(successMessage)
}
.onAppear {
// Initialize map data manager if needed
mapDataManager.initialize()
}
}
2025-07-23 20:58:46 +00:00
// MARK: - File Handling
2025-07-23 20:58:46 +00:00
private func handleFileSelection(_ result: Result<[URL], Error>) {
do {
guard let selectedFile = try result.get().first else { return }
2025-07-23 20:58:46 +00:00
// Start processing
isProcessing = true
processingProgress = 0.0
2025-07-23 20:58:46 +00:00
// Process file asynchronously
Task {
do {
// Simulate progress
await simulateProgress()
2025-07-23 20:58:46 +00:00
let metadata = try await mapDataManager.processUploadedFile(from: selectedFile)
2025-07-23 20:58:46 +00:00
await MainActor.run {
isProcessing = false
processingProgress = 1.0
successMessage = String(localized: "Successfully uploaded '\(metadata.originalName)' with \(metadata.overlayCount) overlays")
2025-07-23 20:58:46 +00:00
showSuccess = true
}
} catch {
await MainActor.run {
isProcessing = false
processingProgress = 0.0
2025-07-23 20:58:46 +00:00
errorMessage = error.localizedDescription
showError = true
}
}
}
} catch {
errorMessage = "Failed to access file: \(error.localizedDescription)".localized
2025-07-23 20:58:46 +00:00
showError = true
}
}
2025-07-23 20:58:46 +00:00
private func simulateProgress() async {
for i in 1...10 {
await MainActor.run {
processingProgress = Double(i) / 10.0
}
try? await Task.sleep(nanoseconds: 200_000_000) // 0.2 seconds
}
}
2025-07-23 20:58:46 +00:00
private func deleteFile(_ file: MapDataMetadata) {
Task {
do {
try await mapDataManager.deleteFile(file)
} catch {
await MainActor.run {
errorMessage = "Failed to delete file: \(error.localizedDescription)".localized
2025-07-23 20:58:46 +00:00
showError = true
}
}
}
}
2025-07-21 21:42:36 +00:00
}
// MARK: - Supporting Views
struct MapDataFileRow: View {
2025-07-23 20:58:46 +00:00
let file: MapDataMetadata
let showDivider: Bool
2025-07-23 20:58:46 +00:00
let onDelete: () -> Void
2025-07-23 20:58:46 +00:00
var body: some View {
HStack {
VStack {
2025-07-23 20:58:46 +00:00
HStack {
Text(file.originalName)
.font(.headline)
.lineLimit(1)
2025-07-23 20:58:46 +00:00
Spacer()
Text(file.fileSizeString)
.font(.caption)
.foregroundColor(.secondary)
Button(action: onDelete) {
Image(systemName: "trash")
.foregroundColor(.red)
}
.buttonStyle(.bordered)
.buttonBorderShape(.capsule)
.controlSize(.small)
2025-07-23 20:58:46 +00:00
}
HStack {
Text(file.format.uppercased())
.font(.caption2)
.fixedSize()
2025-07-23 20:58:46 +00:00
.padding(.horizontal, 8)
.padding(.vertical, 2)
.background(Color.secondary.opacity(0.2))
.cornerRadius(4)
Text("\(file.overlayCount) features")
.font(.caption2)
2025-07-23 20:58:46 +00:00
.foregroundColor(.secondary)
Spacer()
Text(file.uploadDate.formatted())
.font(.caption2)
2025-07-23 20:58:46 +00:00
.foregroundColor(.secondary)
}
}
}
if showDivider {
Divider()
}
2025-07-23 20:58:46 +00:00
}
2025-07-21 21:42:36 +00:00
}
#Preview {
2025-07-23 20:58:46 +00:00
NavigationView {
MapDataFiles()
}
2025-07-23 20:26:50 +00:00
}