- Remove isProjectInstallation var.

boscojwho · Aug 25, 2024 · c1d0ee9 · c1d0ee9
1 parent 1fe7262
commit c1d0ee9
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 18 deletions.
diff --git a/PyTerm/ContentView.swift b/PyTerm/ContentView.swift
@@ -48,7 +48,6 @@ struct ContentView: View {
                     if let selectedPip = contentSelectionPreferences.selectedPip {
                         PipView(
                             pipInstallation: selectedPip,
-                            isProjectInstallation: hasVenv(),
                             selectedPackage: $contentSelection.selectedPackage
                         )
                         .id(selectedPip)
@@ -90,7 +89,6 @@ struct ContentView: View {
                 if let selectedPackage = contentSelectionPreferences.selectedPackage {
                     PipPackageView(
                         pipInstallation: selectedPip,
-                        isProjectInstallation: hasVenv(),
                         package: selectedPackage
                     )
                     .id(selectedPackage)
@@ -159,13 +157,6 @@ struct ContentView: View {
             return true
         }
     }
-
-    private func hasVenv() -> Bool {
-        guard let selectedPip = contentSelectionPreferences.selectedPip else { return false }
-        return VenvFinder(projectUrl: selectedPip)
-            .findVenv()
-            .isEmpty == false
-    }
 }
 
 #Preview {

diff --git a/PyTerm/PipClient.swift b/PyTerm/PipClient.swift
@@ -30,17 +30,14 @@ extension PipListResponse {
 @Observable
 final class PipClient {
     let installationPath: URL
-    let isProjectInstallation: Bool
     let pipExecutable: String?
     private var shellClient: ShellClient
     init(
         installationPath: URL,
-        isProjectInstallation: Bool,
         pipExecutable: String?,
         shellClient: ShellClient
     ) {
         self.installationPath = installationPath
-        self.isProjectInstallation = isProjectInstallation
         self.pipExecutable = pipExecutable
         self.shellClient = shellClient
     }

diff --git a/PyTerm/PipPackageView.swift b/PyTerm/PipPackageView.swift
@@ -172,14 +172,12 @@ struct PipPackageView: View {
     @State private var pipClient: PipClient
     init(
         pipInstallation: URL,
-        isProjectInstallation: Bool,
         package: PipListResponse
     ) {
         self.package = package
         _pipClient = .init(
             wrappedValue: .init(
                 installationPath: pipInstallation,
-                isProjectInstallation: isProjectInstallation, 
                 pipExecutable: pipInstallation.lastPathComponent,
                 shellClient: .init(currentDirectoryPath: pipInstallation.deletingLastPathComponent().path())
             )
@@ -236,7 +234,6 @@ struct PipPackageView: View {
 #Preview {
     PipPackageView(
         pipInstallation: .init(filePath: "/usr/bin/pip"),
-        isProjectInstallation: false,
         package: .mock()
     )
 }
diff --git a/PyTerm/PipView.swift b/PyTerm/PipView.swift
@@ -13,14 +13,12 @@ struct PipView: View {
     @Binding var selectedPackage: PipListResponse?
     init(
         pipInstallation: URL,
-        isProjectInstallation: Bool,
         selectedPackage: Binding<PipListResponse?>
     ) {
         self.pipInstallation = pipInstallation
         _pipClient = .init(
             wrappedValue: .init(
                 installationPath: pipInstallation,
-                isProjectInstallation: isProjectInstallation,
                 pipExecutable: pipInstallation.lastPathComponent,
                 shellClient: .init(currentDirectoryPath: pipInstallation.deletingLastPathComponent().path())
             )
@@ -99,7 +97,6 @@ struct PipView: View {
 #Preview {
     PipView(
         pipInstallation: .init(filePath: "/usr/bin/pip"),
-        isProjectInstallation: false,
         selectedPackage: .constant(nil)
     )
 }