Skip to content

ChooseProjectButton: prevent duplicate projects in dropdown #1624

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.

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

Draft
wants to merge 3 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions src/FolderManager/Item.vala
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,10 @@ namespace Scratch.FolderManager {
file.rename (new_name);
}

public bool equal (Item b) {
return path == b.path;
}

public void trash () {
file.trash ();
}
Expand Down
13 changes: 12 additions & 1 deletion src/Services/GitManager.vala
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,19 @@ namespace Scratch.Services {
}

public MonitoredRepository? add_project (FolderManager.ProjectFolderItem root_folder) {
var root_path = root_folder.file.file.get_path ();
var root_path = root_folder.path;
MonitoredRepository? monitored_repo = null;
uint position;
if (project_liststore.find_with_equal_func (
root_folder,
(a, b) => { return ((FolderManager.Item) a).equal ((FolderManager.Item) b); },
out position
)) {

var repo = project_gitrepo_map.@get (root_path);
return repo;
}

try {
var git_repo = Ggit.Repository.open (root_folder.file.file);
if (!project_gitrepo_map.has_key (root_path)) {
Expand Down
9 changes: 9 additions & 0 deletions src/Widgets/ChooseProjectButton.vala
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,16 @@ public class Code.ChooseProjectButton : Gtk.MenuButton {

popover = project_popover;

// Initialise with any pre-existing projects (needed for second and subsequent window)
var git_manager = Scratch.Services.GitManager.get_instance ();
var src = git_manager.project_liststore;
for (int index = 0; index < src.n_items; index++) {
var item = src.get_object (index);
if (item is Scratch.FolderManager.ProjectFolderItem) {
var row = create_project_row ((Scratch.FolderManager.ProjectFolderItem)item);
project_listbox.insert (row, index);
}
}

git_manager.project_liststore.items_changed.connect ((src, pos, n_removed, n_added) => {
var rows = project_listbox.get_children ();
Expand Down