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

Jump to bottom

refactor: Move common code into ReconnectCore #134

Merged
merged 2 commits into from
Jul 19, 2024
Merged

refactor: Move common code into ReconnectCore #134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d49186c
refactor: Move common code into ReconnectCore
jbmorley Jul 19, 2024
ae972a3
Move a few more files
jbmorley Jul 19, 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
12 changes: 0 additions & 12 deletions Reconnect.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
D8631DB52C374F8700344DC3 /* TransfersView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8631DB42C374F8700344DC3 /* TransfersView.swift */; };
D8631DB72C37573200344DC3 /* rfsv.errs.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8631DB62C37573200344DC3 /* rfsv.errs.swift */; };
D8631DB92C375F2400344DC3 /* WindowsPathTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8631DB82C375F2400344DC3 /* WindowsPathTests.swift */; };
D8631DBB2C37657100344DC3 /* Array.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8631DBA2C37657100344DC3 /* Array.swift */; };
D86924C82C30964400A8492C /* DockIconManaager.swift in Sources */ = {isa = PBXBuildFile; fileRef = D86924C72C30964400A8492C /* DockIconManaager.swift */; };
D87AAC8A2C27EB070091F442 /* FileServer.swift in Sources */ = {isa = PBXBuildFile; fileRef = D87AAC892C27EB070091F442 /* FileServer.swift */; };
D886DA742C28CDAD00E84BDA /* BrowserView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D886DA732C28CDAD00E84BDA /* BrowserView.swift */; };
Expand All @@ -46,13 +45,11 @@
D8C0807A2C1D7D8D003128AB /* ReconnectError.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8C080792C1D7D8D003128AB /* ReconnectError.swift */; };
D8C409CA2C3D0B7600C9E857 /* Graphics.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8C409C92C3D0B7600C9E857 /* Graphics.swift */; };
D8CBAC652C4A02580035FC3D /* ReconnectCore in Frameworks */ = {isa = PBXBuildFile; productRef = D8CBAC642C4A02580035FC3D /* ReconnectCore */; };
D8D3E79D2C25407E003E696D /* URL.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8D3E79C2C25407E003E696D /* URL.swift */; };
D8D3E79F2C2540D9003E696D /* Interact in Frameworks */ = {isa = PBXBuildFile; productRef = D8D3E79E2C2540D9003E696D /* Interact */; };
D8D3E7A12C25410E003E696D /* MainMenu.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8D3E7A02C25410E003E696D /* MainMenu.swift */; };
D8DF2C112C3CE8AC006E56BA /* OpoLua in Frameworks */ = {isa = PBXBuildFile; productRef = D8DF2C102C3CE8AC006E56BA /* OpoLua */; };
D8E31EB32C26E09500350082 /* Diligence in Frameworks */ = {isa = PBXBuildFile; productRef = D8E31EB22C26E09500350082 /* Diligence */; };
D8E31EB52C26E10900350082 /* Licensable.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8E31EB42C26E10900350082 /* Licensable.swift */; };
D8E31EB72C26E13E00350082 /* String.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8E31EB62C26E13E00350082 /* String.swift */; };
D8E31EBA2C26E1E400350082 /* reconnect-license in Resources */ = {isa = PBXBuildFile; fileRef = D8E31EB92C26E1E400350082 /* reconnect-license */; };
D8F0E8F62C3778E80047B1BC /* UInt32.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8F0E8F52C3778E80047B1BC /* UInt32.swift */; };
D8FD72732C3D192F0038DB17 /* sparkle-license in Resources */ = {isa = PBXBuildFile; fileRef = D8FD72722C3D192F0038DB17 /* sparkle-license */; };
Expand Down Expand Up @@ -106,7 +103,6 @@
D8631DB42C374F8700344DC3 /* TransfersView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TransfersView.swift; sourceTree = "<group>"; };
D8631DB62C37573200344DC3 /* rfsv.errs.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = rfsv.errs.swift; sourceTree = "<group>"; };
D8631DB82C375F2400344DC3 /* WindowsPathTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WindowsPathTests.swift; sourceTree = "<group>"; };
D8631DBA2C37657100344DC3 /* Array.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Array.swift; sourceTree = "<group>"; };
D86924C72C30964400A8492C /* DockIconManaager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DockIconManaager.swift; sourceTree = "<group>"; };
D876E60C2C22BAA9004A6881 /* libSystem.B.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libSystem.B.tbd; path = usr/lib/libSystem.B.tbd; sourceTree = SDKROOT; };
D876E60D2C22BAB9004A6881 /* libSystem.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libSystem.tbd; path = usr/lib/libSystem.tbd; sourceTree = SDKROOT; };
Expand All @@ -120,10 +116,8 @@
D8C080792C1D7D8D003128AB /* ReconnectError.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReconnectError.swift; sourceTree = "<group>"; };
D8C409C92C3D0B7600C9E857 /* Graphics.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Graphics.swift; sourceTree = "<group>"; };
D8CBAC632C4A022C0035FC3D /* ReconnectCore */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = ReconnectCore; sourceTree = "<group>"; };
D8D3E79C2C25407E003E696D /* URL.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = URL.swift; sourceTree = "<group>"; };
D8D3E7A02C25410E003E696D /* MainMenu.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainMenu.swift; sourceTree = "<group>"; };
D8E31EB42C26E10900350082 /* Licensable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Licensable.swift; sourceTree = "<group>"; };
D8E31EB62C26E13E00350082 /* String.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = String.swift; sourceTree = "<group>"; };
D8E31EB92C26E1E400350082 /* reconnect-license */ = {isa = PBXFileReference; lastKnownFileType = text; path = "reconnect-license"; sourceTree = "<group>"; };
D8F0E8F52C3778E80047B1BC /* UInt32.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UInt32.swift; sourceTree = "<group>"; };
D8FD72722C3D192F0038DB17 /* sparkle-license */ = {isa = PBXFileReference; lastKnownFileType = text; path = "sparkle-license"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -284,14 +278,11 @@
D849653D2C1D07AD00405656 /* Extensions */ = {
isa = PBXGroup;
children = (
D8631DBA2C37657100344DC3 /* Array.swift */,
D83A786B2C3C85FE000E8192 /* DirectoryEntry.swift */,
D843514F2C2B636C009055C1 /* DriveInfo.swift */,
D8E31EB42C26E10900350082 /* Licensable.swift */,
D8631DB62C37573200344DC3 /* rfsv.errs.swift */,
D8E31EB62C26E13E00350082 /* String.swift */,
D8F0E8F52C3778E80047B1BC /* UInt32.swift */,
D8D3E79C2C25407E003E696D /* URL.swift */,
);
path = Extensions;
sourceTree = "<group>";
Expand Down Expand Up @@ -471,13 +462,11 @@
D8AD8B522C2378780063A613 /* Server.swift in Sources */,
D83658BB2C29A09300B45693 /* HistoryItemView.swift in Sources */,
D8F0E8F62C3778E80047B1BC /* UInt32.swift in Sources */,
D8D3E79D2C25407E003E696D /* URL.swift in Sources */,
D8C0807A2C1D7D8D003128AB /* ReconnectError.swift in Sources */,
D8E31EB52C26E10900350082 /* Licensable.swift in Sources */,
D886DA742C28CDAD00E84BDA /* BrowserView.swift in Sources */,
D88FA1502C2CE29900805DBD /* ContentView.swift in Sources */,
D83A786E2C3C87F5000E8192 /* FileType.swift in Sources */,
D8631DBB2C37657100344DC3 /* Array.swift in Sources */,
D83B4DE12C2F99C3003C3DC1 /* CheckForUpdatesViewModel.swift in Sources */,
D8FFE85F2C49F2FB001F7D8A /* TransfersWindow.swift in Sources */,
D83658B92C298C4F00B45693 /* NavigationStack.swift in Sources */,
Expand All @@ -490,7 +479,6 @@
D89B5E8E2C2AA8680014A5B6 /* Sidebar.swift in Sources */,
D886DA762C29343900E84BDA /* BrowserModel.swift in Sources */,
D83B4DDF2C2F9995003C3DC1 /* CheckForUpdatesView.swift in Sources */,
D8E31EB72C26E13E00350082 /* String.swift in Sources */,
D8C409CA2C3D0B7600C9E857 /* Graphics.swift in Sources */,
D8D3E7A12C25410E003E696D /* MainMenu.swift in Sources */,
D8631DB12C374B0A00344DC3 /* Transfer.swift in Sources */,
Expand Down
2 changes: 2 additions & 0 deletions Reconnect/ReconnectApp.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ import Diligence
import Interact
import Sparkle

import ReconnectCore

@main @MainActor
struct ReconnectApp: App {

Expand Down
2 changes: 2 additions & 0 deletions Reconnect/Views/MainMenu.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ import SwiftUI

import Interact

import ReconnectCore

struct MainMenu: View {

@Environment(\.openURL) private var openURL
Expand Down
2 changes: 1 addition & 1 deletion Reconnect/Extensions/Array.swift → ...rces/ReconnectCore/Extensions/Array.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

import Foundation

extension Array {
public extension Array {

func appending(_ element: Element) -> [Element] {
return self + [element]
Expand Down
2 changes: 1 addition & 1 deletion Reconnect/Extensions/String.swift → ...ces/ReconnectCore/Extensions/String.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

import Foundation

extension String {
public extension String {

static let windowsPathSeparator = "\\"

Expand Down
10 changes: 5 additions & 5 deletions Reconnect/Extensions/URL.swift → ...ources/ReconnectCore/Extensions/URL.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ import Foundation

extension URL {

static let about = URL(string: "x-reconnect://about")!
static let browser = URL(string: "x-reconnect://browser")!
static let install = URL(string: "x-reconnect://install/")!
static let transfers = URL(string: "x-reconnect://transfers")!
public static let about = URL(string: "x-reconnect://about")!
public static let browser = URL(string: "x-reconnect://browser")!
public static let install = URL(string: "x-reconnect://install/")!
public static let transfers = URL(string: "x-reconnect://transfers")!

func appendingPathComponents(_ pathComponents: [String]) -> URL {
public func appendingPathComponents(_ pathComponents: [String]) -> URL {
return pathComponents.reduce(self) { url, pathComponent in
return url.appendingPathComponent(pathComponent)
}
Expand Down
17 changes: 0 additions & 17 deletions ReconnectCore/Sources/ReconnectCore/ReconnectCore.swift
View file
Open in desktop

This file was deleted.