Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Software catalog version 2 #381

Draft
wants to merge 21 commits into
base: main
Choose a base branch
from
+5,469 −532
Draft

Software catalog version 2 #381

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
c522bb2
Integrated VirtualCatalog library
insidegui Jul 31, 2024
16b0bd1
Add vctool to VirtualCatalog package with command to add a group to t…
insidegui Jul 31, 2024
93dceb1
Updated software catalog with new format and images
insidegui Jul 31, 2024
9b2b01b
Unified v2 catalog format between Mac and Linux
insidegui Aug 1, 2024
ffc83d5
Updated Linux catalog
insidegui Aug 1, 2024
fe6a0b2
Lowered blurhash component count
insidegui Aug 1, 2024
d52ce1f
Using SoftwareCatalog in restore image picker, bridging to legacy for…
insidegui Aug 1, 2024
8ea2422
Fixed a bunch of Swift 6 warnings
insidegui Aug 1, 2024
a90fe17
Bundling software catalog in VirtualCore as fallback when remote cata…
insidegui Aug 1, 2024
bc46358
Install wizard tweaks in preparation for new UI
insidegui Aug 1, 2024
cfcb9ff
WIP: Catalog group picker
insidegui Aug 1, 2024
31feee7
Integrating new catalog into picker UI and view model, abstracted cat…
insidegui Aug 2, 2024
d008e36
WIP: Restore image browser
insidegui Aug 2, 2024
8ca3d0a
[vctool] Implemented commands for adding restore images, inspecting I…
insidegui Aug 2, 2024
361fcdd
Including download size in restore image catalog
insidegui Aug 2, 2024
343d97d
WIP: Restore image selection UI
insidegui Aug 2, 2024
22420c6
Merge branch 'main' into catalogv2
insidegui Aug 29, 2024
23c6775
vctool flag to migrate from live v1 catalog from the API
insidegui Aug 30, 2024
547a1bf
Updated v2 catalog
insidegui Aug 30, 2024
3188bc5
Using better keyboard navigation trick for macOS 14+
insidegui Aug 30, 2024
9ee31e2
UI/navigation tweaks
insidegui Aug 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion DeepLinkSecurity/Source/DeepLinkSentinel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,4 +165,4 @@ public final class DeepLinkSentinel: ObservableObject {
}
}

extension NSAppleEventDescriptor: @unchecked Sendable { }
extension NSAppleEventDescriptor: @retroactive @unchecked Sendable { }
2 changes: 1 addition & 1 deletion DeepLinkSecurity/Source/Storage/UserDefaultsDeepLinkManagementStore.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,4 +130,4 @@ public final actor UserDefaultsDeepLinkManagementStore: DeepLinkManagementStore
private let decoder = PropertyListDecoder()
}

extension UserDefaults: @unchecked Sendable { }
extension UserDefaults: @retroactive @unchecked Sendable { }
129 changes: 89 additions & 40 deletions VirtualBuddy.xcodeproj/project.pbxproj
View file
Open in desktop

Large diffs are not rendered by default.

20 changes: 19 additions & 1 deletion VirtualBuddy.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,15 @@
{
"originHash" : "5aabd6ca94084da6e618f041d74475ec3f152216f0ee77b4939a37c8bef3ee17",
"originHash" : "08db29b76b086e0931e501a8d9732d93a9891fc3899951f73ffc336cda29f234",
"pins" : [
{
"identity" : "libfragmentzip",
"kind" : "remoteSourceControl",
"location" : "https://github.com/insidegui/libfragmentzip",
"state" : {
"revision" : "9f72ba6706fe4a16413d463a79eae52c374f3c29",
"version" : "1.0.0"
}
},
{
"identity" : "sparkle",
"kind" : "remoteSourceControl",
Expand All @@ -10,6 +19,15 @@
"version" : "2.6.3"
}
},
{
"identity" : "swift-argument-parser",
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-argument-parser",
"state" : {
"revision" : "41982a3656a71c768319979febd796c6fd111d5c",
"version" : "1.5.0"
}
},
{
"identity" : "swiftui-introspect",
"kind" : "remoteSourceControl",
Expand Down
2 changes: 1 addition & 1 deletion VirtualBuddy.xcodeproj/xcshareddata/xcschemes/DeepLinkSecurity.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1530"
LastUpgradeVersion = "1600"
version = "1.7">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 1 addition & 1 deletion VirtualBuddy.xcodeproj/xcshareddata/xcschemes/VirtualBuddy (Dev Release).xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1530"
LastUpgradeVersion = "1600"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 1 addition & 1 deletion VirtualBuddy.xcodeproj/xcshareddata/xcschemes/VirtualBuddy (Managed - Beta).xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1530"
LastUpgradeVersion = "1600"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
6 changes: 5 additions & 1 deletion VirtualBuddy.xcodeproj/xcshareddata/xcschemes/VirtualBuddy (Managed).xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1530"
LastUpgradeVersion = "1600"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down Expand Up @@ -63,6 +63,10 @@
argument = "-WHDisablePayloadPropagation YES"
isEnabled = "NO">
</CommandLineArgument>
<CommandLineArgument
argument = "-VBForceBuiltInSoftwareCatalog YES"
isEnabled = "NO">
</CommandLineArgument>
<CommandLineArgument
argument = "-WHVerbosePacketLogging YES"
isEnabled = "YES">
Expand Down
2 changes: 1 addition & 1 deletion VirtualBuddy.xcodeproj/xcshareddata/xcschemes/VirtualBuddy.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1530"
LastUpgradeVersion = "1600"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 1 addition & 1 deletion VirtualBuddy.xcodeproj/xcshareddata/xcschemes/VirtualBuddyGuest.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1530"
LastUpgradeVersion = "1600"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 1 addition & 1 deletion VirtualBuddy.xcodeproj/xcshareddata/xcschemes/VirtualCore.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1530"
LastUpgradeVersion = "1600"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 1 addition & 1 deletion VirtualBuddy.xcodeproj/xcshareddata/xcschemes/VirtualUI.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1530"
LastUpgradeVersion = "1600"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 1 addition & 1 deletion VirtualBuddy.xcodeproj/xcshareddata/xcschemes/VirtualWormhole.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1530"
LastUpgradeVersion = "1600"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
4 changes: 4 additions & 0 deletions VirtualBuddy/Bootstrap/VirtualBuddyApp.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,5 +63,9 @@ struct VirtualBuddyApp: App {
.environmentObject(settingsContainer)
.frame(minWidth: 420, maxWidth: .infinity, minHeight: 370, maxHeight: .infinity)
}

WindowGroup(id: .vb_setupWindowID, for: URL.self) { urlBinding in
VMInstallationWizard(library: library, restoringAt: urlBinding.wrappedValue)
}
}
}
8 changes: 8 additions & 0 deletions VirtualCatalog/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
.DS_Store
/.build
/Packages
xcuserdata/
DerivedData/
.swiftpm/configuration/registries.json
.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
.netrc
67 changes: 67 additions & 0 deletions VirtualCatalog/.swiftpm/xcode/xcshareddata/xcschemes/VirtualCatalog.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1600"
version = "1.7">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES"
buildArchitectures = "Automatic">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "VirtualCatalog"
BuildableName = "VirtualCatalog"
BlueprintName = "VirtualCatalog"
ReferencedContainer = "container:">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"
shouldAutocreateTestPlan = "YES">
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "VirtualCatalog"
BuildableName = "VirtualCatalog"
BlueprintName = "VirtualCatalog"
ReferencedContainer = "container:">
</BuildableReference>
</MacroExpansion>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
Loading