mirror of
https://github.com/passepartoutvpn/passepartout-apple.git
synced 2025-01-25 01:53:00 +00:00
fae0200995
Exclude endpoints from OpenVPN modules and providers with the generic Blacklist<T> observable. Eventually, rebuild the Profile in PacketTunnelProvider (via DefaultTunnelProcessor) with the applied exclusions from preferences. Revisit approach to preferences: - Module preferences - Tied to the module and therefore to the parent profile - Load/save in ProfileEditor on request (rather than on ProfileEditor.load) - Provider preferences - Shared globally across profiles - Load/save in module view if needed For more consistency with Core Data: - Revert to observables for both module and provider preferences - Treat excluded endpoints as relationships rather than a serialized Array - Add/remove single relationships over bulk delete + re-add - Do not map the relationships, Blacklist only needs exists/add/remove: - isExcludedEndpoint - addExcludedEndpoint - removeExcludedEndpoint Some clean-up: - Move the importer logic to OpenVPNView.ImportModifier - Move the preview data to OpenVPN.Configuration.Builder.forPreviews - Drop objectWillChange.send() on .repository didSet to avoid potential recursion during SwiftUI updates Closes #971
45 lines
1.6 KiB
Swift
45 lines
1.6 KiB
Swift
//
|
|
// ProfileEditor+UI.swift
|
|
// Passepartout
|
|
//
|
|
// Created by Davide De Rosa on 6/28/24.
|
|
// Copyright (c) 2024 Davide De Rosa. All rights reserved.
|
|
//
|
|
// https://github.com/passepartoutvpn
|
|
//
|
|
// This file is part of Passepartout.
|
|
//
|
|
// Passepartout is free software: you can redistribute it and/or modify
|
|
// it under the terms of the GNU General Public License as published by
|
|
// the Free Software Foundation, either version 3 of the License, or
|
|
// (at your option) any later version.
|
|
//
|
|
// Passepartout is distributed in the hope that it will be useful,
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
// GNU General Public License for more details.
|
|
//
|
|
// You should have received a copy of the GNU General Public License
|
|
// along with Passepartout. If not, see <http://www.gnu.org/licenses/>.
|
|
//
|
|
|
|
import CommonLibrary
|
|
import PassepartoutKit
|
|
import SwiftUI
|
|
|
|
extension ProfileEditor {
|
|
public subscript<T>(module: T) -> Binding<T> where T: ModuleBuilder {
|
|
Binding { [weak self] in
|
|
guard let foundModule = self?.module(withId: module.id) else {
|
|
fatalError("Module not found in editor: \(module.id)")
|
|
}
|
|
guard let matchingModule = foundModule as? T else {
|
|
fatalError("Type mismatch when binding to editor module: \(type(of: foundModule)) != \(type(of: module))")
|
|
}
|
|
return matchingModule
|
|
} set: { [weak self] in
|
|
self?.saveModule($0, activating: false)
|
|
}
|
|
}
|
|
}
|