Skip to content

Commit

Permalink
fix(attach): Do not use seach api for selecting, use normal `select_o…
Browse files Browse the repository at this point in the history
…ne` (#72)
  • Loading branch information
fioncat authored Dec 21, 2023
1 parent 9161b54 commit 6e43112
Showing 1 changed file with 13 additions and 13 deletions.
26 changes: 13 additions & 13 deletions src/repo/database.rs
Original file line number Diff line number Diff line change
Expand Up @@ -993,18 +993,6 @@ impl<'a, T: TerminalHelper, P: ProviderBuilder> Selector<'_, T, P> {
///
/// See also: [`Selector::must_one`]
pub fn one(&self) -> Result<(Rc<Repo>, bool)> {
if self.opts.force_remote {
if self.head.is_empty() {
bail!("internal error, when select one from provider, the head cannot be empty");
}
let remote_cfg = self.db.cfg.must_get_remote(self.head)?;
let remote = Remote {
name: self.head.to_string(),
cfg: remote_cfg.clone(),
};
return self.one_from_provider(&remote);
}

if self.head.is_empty() {
let repo = match self.opts.mode {
SelectMode::Fuzzy => self.db.must_get_latest(""),
Expand Down Expand Up @@ -1233,7 +1221,19 @@ impl<'a, T: TerminalHelper, P: ProviderBuilder> Selector<'_, T, P> {
&remote,
self.opts.force_no_cache,
)?;
let api_repos = provider.list_repos(owner)?;
let mut api_repos = provider.list_repos(owner)?;

if self.opts.force_remote {
// force remote, don't show exists repos
let owner_repos = self.db.list_by_owner(remote_name, owner, &None);
let repos_set: HashSet<&str> =
owner_repos.iter().map(|repo| repo.name.as_str()).collect();
api_repos = api_repos
.into_iter()
.filter(|name| !repos_set.contains(name.as_str()))
.collect();
}

let idx = self.opts.terminal_helper.search(&api_repos)?;
let name = &api_repos[idx];
return self.get_or_create_repo(remote_name, owner, name);
Expand Down

0 comments on commit 6e43112

Please sign in to comment.