Skip to content

Git fetch improvement #1511

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

Merged
Wouter01 merged 2 commits into from
Dec 16, 2023
Merged

Git fetch improvement #1511

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
c46dd94
fix: multiple git fetch
Wouter01 Dec 15, 2023
c3f15e8
fix: remove unnecessary task, try
Wouter01 Dec 15, 2023
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
34 changes: 6 additions & 28 deletions CodeEdit/Features/Git/SourceControlManager.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,6 @@ final class SourceControlManager: ObservableObject {
let editorManager: EditorManager
weak var fileManager: CEWorkspaceFileManager?

// Timer for periodic fetch
private var fetchTimer: Timer?

/// A list of changed files
@Published var changedFiles: [CEWorkspaceFile] = []

Expand Down Expand Up @@ -116,27 +113,10 @@ final class SourceControlManager: ObservableObject {
fileManager.notifyObservers(updatedItems: updatedStatusFor)
}

/// Start periodic fetch with a specified interval
func startPeriodicFetch(interval: TimeInterval) {
fetchTimer?.invalidate() // Invalidate any existing timer
fetch()
fetchTimer = Timer.scheduledTimer(withTimeInterval: interval, repeats: true) { [weak self] _ in
self?.fetch()
}
}

/// Fetch from remote
func fetch() {
Task {
try await gitClient.fetchFromRemote()
await self.refreshNumberOfUnsyncedCommits()
}
}

/// Stops the periodic fetch
func stopPeriodicFetch() {
fetchTimer?.invalidate()
fetchTimer = nil
func fetch() async throws {
try await gitClient.fetchFromRemote()
await self.refreshNumberOfUnsyncedCommits()
}

/// Refresh current branch
Expand Down Expand Up @@ -314,11 +294,9 @@ final class SourceControlManager: ObservableObject {

/// Validate repository
func validate() async throws {
Task {
let isGitRepository = try await gitClient.validate()
await MainActor.run {
self.isGitRepository = isGitRepository
}
let isGitRepository = await gitClient.validate()
await MainActor.run {
self.isGitRepository = isGitRepository
}
}

Expand Down
14 changes: 9 additions & 5 deletions ...Edit/Features/NavigatorArea/SourceControlNavigator/Views/SourceControlNavigatorView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,15 @@ struct SourceControlNavigatorView: View {
VStack(spacing: 0) {
SourcControlNavigatorTabs()
.environmentObject(sourceControlManager)
.onAppear {
sourceControlManager.startPeriodicFetch(interval: 10)
}
.onDisappear {
sourceControlManager.stopPeriodicFetch()
.task {
do {
while true {
try await sourceControlManager.fetch()
try await Task.sleep(for: .seconds(10))
}
} catch {
// TODO: if source fetching fails, display message
}
}
}
.safeAreaInset(edge: .bottom, spacing: 0) {
Expand Down