diff options
Diffstat (limited to 'src/components/push.rs')
| -rw-r--r-- | src/components/push.rs | 558 |
1 files changed, 279 insertions, 279 deletions
diff --git a/src/components/push.rs b/src/components/push.rs index 12541d29..0dfe3a85 100644 --- a/src/components/push.rs +++ b/src/components/push.rs @@ -1,333 +1,333 @@ use crate::{ - components::{ - cred::CredComponent, visibility_blocking, CommandBlocking, - CommandInfo, Component, DrawableComponent, EventState, - }, - keys::SharedKeyConfig, - queue::{InternalEvent, Queue}, - strings, - ui::{self, style::SharedTheme}, + components::{ + cred::CredComponent, visibility_blocking, CommandBlocking, + CommandInfo, Component, DrawableComponent, EventState, + }, + keys::SharedKeyConfig, + queue::{InternalEvent, Queue}, + strings, + ui::{self, style::SharedTheme}, }; use anyhow::Result; use asyncgit::{ - sync::{ - cred::{ - extract_username_password, need_username_password, - BasicAuthCredential, - }, - get_branch_remote, get_default_remote, - }, - AsyncGitNotification, AsyncPush, PushRequest, RemoteProgress, - RemoteProgressState, CWD, + sync::{ + cred::{ + extract_username_password, need_username_password, + BasicAuthCredential, + }, + get_branch_remote, get_default_remote, + }, + AsyncGitNotification, AsyncPush, PushRequest, RemoteProgress, + RemoteProgressState, CWD, }; use crossbeam_channel::Sender; use crossterm::event::Event; use tui::{ - backend::Backend, - layout::Rect, - text::Span, - widgets::{Block, BorderType, Borders, Clear, Gauge}, - Frame, + backend::Backend, + layout::Rect, + text::Span, + widgets::{Block, BorderType, Borders, Clear, Gauge}, + Frame, }; /// #[derive(PartialEq, Eq)] enum PushComponentModifier { - None, - Force, - Delete, - ForceDelete, + None, + Force, + Delete, + ForceDelete, } impl PushComponentModifier { - pub(crate) fn force(&self) -> bool { - self == &Self::Force || self == &Self::ForceDelete - } - pub(crate) fn delete(&self) -> bool { - self == &Self::Delete || self == &Self::ForceDelete - } + pub(crate) fn force(&self) -> bool { + self == &Self::Force || self == &Self::ForceDelete + } + pub(crate) fn delete(&self) -> bool { + self == &Self::Delete || self == &Self::ForceDelete + } } /// pub struct PushComponent { - modifier: PushComponentModifier, - visible: bool, - git_push: AsyncPush, - progress: Option<RemoteProgress>, - pending: bool, - branch: String, - queue: Queue, - theme: SharedTheme, - key_config: SharedKeyConfig, - input_cred: CredComponent, + modifier: PushComponentModifier, + visible: bool, + git_push: AsyncPush, + progress: Option<RemoteProgress>, + pending: bool, + branch: String, + queue: Queue, + theme: SharedTheme, + key_config: SharedKeyConfig, + input_cred: CredComponent, } impl PushComponent { - /// - pub fn new( - queue: &Queue, - sender: &Sender<AsyncGitNotification>, - theme: SharedTheme, - key_config: SharedKeyConfig, - ) -> Self { - Self { - queue: queue.clone(), - modifier: PushComponentModifier::None, - pending: false, - visible: false, - branch: String::new(), - git_push: AsyncPush::new(sender), - progress: None, - input_cred: CredComponent::new( - theme.clone(), - key_config.clone(), - ), - theme, - key_config, - } - } + /// + pub fn new( + queue: &Queue, + sender: &Sender<AsyncGitNotification>, + theme: SharedTheme, + key_config: SharedKeyConfig, + ) -> Self { + Self { + queue: queue.clone(), + modifier: PushComponentModifier::None, + pending: false, + visible: false, + branch: String::new(), + git_push: AsyncPush::new(sender), + progress: None, + input_cred: CredComponent::new( + theme.clone(), + key_config.clone(), + ), + theme, + key_config, + } + } - /// - pub fn push( - &mut self, - branch: String, - force: bool, - delete: bool, - ) -> Result<()> { - self.branch = branch; - self.modifier = match (force, delete) { - (true, true) => PushComponentModifier::ForceDelete, - (false, true) => PushComponentModifier::Delete, - (true, false) => PushComponentModifier::Force, - (false, false) => PushComponentModifier::None, - }; + /// + pub fn push( + &mut self, + branch: String, + force: bool, + delete: bool, + ) -> Result<()> { + self.branch = branch; + self.modifier = match (force, delete) { + (true, true) => PushComponentModifier::ForceDelete, + (false, true) => PushComponentModifier::Delete, + (true, false) => PushComponentModifier::Force, + (false, false) => PushComponentModifier::None, + }; - self.show()?; + self.show()?; - if need_username_password()? { - let cred = - extract_username_password().unwrap_or_else(|_| { - BasicAuthCredential::new(None, None) - }); - if cred.is_complete() { - self.push_to_remote(Some(cred), force) - } else { - self.input_cred.set_cred(cred); - self.input_cred.show() - } - } else { - self.push_to_remote(None, force) - } - } + if need_username_password()? { + let cred = + extract_username_password().unwrap_or_else(|_| { + BasicAuthCredential::new(None, None) + }); + if cred.is_complete() { + self.push_to_remote(Some(cred), force) + } else { + self.input_cred.set_cred(cred); + self.input_cred.show() + } + } else { + self.push_to_remote(None, force) + } + } - fn push_to_remote( - &mut self, - cred: Option<BasicAuthCredential>, - force: bool, - ) -> Result<()> { - let remote = if let Ok(Some(remote)) = - get_branch_remote(CWD, &self.branch) - { - log::info!("push: branch '{}' has upstream for remote '{}' - using that",self.branch,remote); - remote - } else { - log::info!("push: branch '{}' has no upstream - looking up default remote",self.branch); - let remote = get_default_remote(CWD)?; - log::info!( - "push: branch '{}' to remote '{}'", - self.branch, - remote - ); - remote - }; + fn push_to_remote( + &mut self, + cred: Option<BasicAuthCredential>, + force: bool, + ) -> Result<()> { + let remote = if let Ok(Some(remote)) = + get_branch_remote(CWD, &self.branch) + { + log::info!("push: branch '{}' has upstream for remote '{}' - using that",self.branch,remote); + remote + } else { + log::info!("push: branch '{}' has no upstream - looking up default remote",self.branch); + let remote = get_default_remote(CWD)?; + log::info!( + "push: branch '{}' to remote '{}'", + self.branch, + remote + ); + remote + }; - self.pending = true; - self.progress = None; - self.git_push.request(PushRequest { - remote, - branch: self.branch.clone(), - force, - delete: self.modifier.delete(), - basic_credential: cred, - })?; - Ok(()) - } + self.pending = true; + self.progress = None; + self.git_push.request(PushRequest { + remote, + branch: self.branch.clone(), + force, + delete: self.modifier.delete(), + basic_credential: cred, + })?; + Ok(()) + } - /// - pub fn update_git( - &mut self, - ev: AsyncGitNotification, - ) -> Result<()> { - if self.is_visible() { - if let AsyncGitNotification::Push = ev { - self.update()?; - } - } + /// + pub fn update_git( + &mut self, + ev: AsyncGitNotification, + ) -> Result<()> { + if self.is_visible() { + if let AsyncGitNotification::Push = ev { + self.update()?; + } + } - Ok(()) - } + Ok(()) + } - /// - fn update(&mut self) -> Result<()> { - self.pending = self.git_push.is_pending()?; - self.progress = self.git_push.progress()?; + /// + fn update(&mut self) -> Result<()> { + self.pending = self.git_push.is_pending()?; + self.progress = self.git_push.progress()?; - if !self.pending { - if let Some(err) = self.git_push.last_result()? { - self.queue.push(InternalEvent::ShowErrorMsg( - format!("push failed:\n{}", err), - )); - } - self.hide(); - } + if !self.pending { + if let Some(err) = self.git_push.last_result()? { + self.queue.push(InternalEvent::ShowErrorMsg( + format!("push failed:\n{}", err), + )); + } + self.hide(); + } - Ok(()) - } + Ok(()) + } - /// - pub const fn any_work_pending(&self) -> bool { - self.pending - } + /// + pub const fn any_work_pending(&self) -> bool { + self.pending + } - /// - pub fn get_progress( - progress: &Option<RemoteProgress>, - ) -> (String, u8) { - progress.as_ref().map_or( - (strings::PUSH_POPUP_PROGRESS_NONE.into(), 0), - |progress| { - ( - Self::progress_state_name(&progress.state), - progress.get_progress_percent(), - ) - }, - ) - } + /// + pub fn get_progress( + progress: &Option<RemoteProgress>, + ) -> (String, u8) { + progress.as_ref().map_or( + (strings::PUSH_POPUP_PROGRESS_NONE.into(), 0), + |progress| { + ( + Self::progress_state_name(&progress.state), + progress.get_progress_percent(), + ) + }, + ) + } - fn progress_state_name(state: &RemoteProgressState) -> String { - match state { - RemoteProgressState::PackingAddingObject => { - strings::PUSH_POPUP_STATES_ADDING - } - RemoteProgressState::PackingDeltafiction => { - strings::PUSH_POPUP_STATES_DELTAS - } - RemoteProgressState::Pushing => { - strings::PUSH_POPUP_STATES_PUSHING - } - RemoteProgressState::Transfer => { - strings::PUSH_POPUP_STATES_TRANSFER - } - RemoteProgressState::Done => { - strings::PUSH_POPUP_STATES_DONE - } - } - .into() - } + fn progress_state_name(state: &RemoteProgressState) -> String { + match state { + RemoteProgressState::PackingAddingObject => { + strings::PUSH_POPUP_STATES_ADDING + } + RemoteProgressState::PackingDeltafiction => { + strings::PUSH_POPUP_STATES_DELTAS + } + RemoteProgressState::Pushing => { + strings::PUSH_POPUP_STATES_PUSHING + } + RemoteProgressState::Transfer => { + strings::PUSH_POPUP_STATES_TRANSFER + } + RemoteProgressState::Done => { + strings::PUSH_POPUP_STATES_DONE + } + } + .into() + } } impl DrawableComponent for PushComponent { - fn draw<B: Backend>( - &self, - f: &mut Frame<B>, - rect: Rect, - ) -> Result<()> { - if self.visible { - let (state, progress) = - Self::get_progress(&self.progress); + fn draw<B: Backend>( + &self, + f: &mut Frame<B>, + rect: Rect, + ) -> Result<()> { + if self.visible { + let (state, progress) = + Self::get_progress(&self.progress); - let area = ui::centered_rect_absolute(30, 3, f.size()); + let area = ui::centered_rect_absolute(30, 3, f.size()); - f.render_widget(Clear, area); - f.render_widget( - Gauge::default() - .label(state.as_str()) - .block( - Block::default() - .title(Span::styled( - if self.modifier.force() { - strings::FORCE_PUSH_POPUP_MSG - } else { - strings::PUSH_POPUP_MSG - }, - self.theme.title(true), - )) - .borders(Borders::ALL) - .border_type(BorderType::Thick) - .border_style(self.theme.block(true)), - ) - .gauge_style(self.theme.push_gauge()) - .percent(u16::from(progress)), - area, - ); - self.input_cred.draw(f, rect)?; - } + f.render_widget(Clear, area); + f.render_widget( + Gauge::default() + .label(state.as_str()) + .block( + Block::default() + .title(Span::styled( + if self.modifier.force() { + strings::FORCE_PUSH_POPUP_MSG + } else { + strings::PUSH_POPUP_MSG + }, + self.theme.title(true), + )) + .borders(Borders::ALL) + .border_type(BorderType::Thick) + .border_style(self.theme.block(true)), + ) + .gauge_style(self.theme.push_gauge()) + .percent(u16::from(progress)), + area, + ); + self.input_cred.draw(f, rect)?; + } - Ok(()) - } + Ok(()) + } } impl Component for PushComponent { - fn commands( - &self, - out: &mut Vec<CommandInfo>, - force_all: bool, - ) -> CommandBlocking { - if self.is_visible() || force_all { - if !force_all { - out.clear(); - } + fn commands( + &self, + out: &mut Vec<CommandInfo>, + force_all: bool, + ) -> CommandBlocking { + if self.is_visible() || force_all { + if !force_all { + out.clear(); + } - if self.input_cred.is_visible() { - return self.input_cred.commands(out, force_all); - } - out.push(CommandInfo::new( - strings::commands::close_msg(&self.key_config), - !self.pending, - self.visible, - )); - } + if self.input_cred.is_visible() { + return self.input_cred.commands(out, force_all); + } + out.push(CommandInfo::new( + strings::commands::close_msg(&self.key_config), + !self.pending, + self.visible, + )); + } - visibility_blocking(self) - } + visibility_blocking(self) + } - fn event(&mut self, ev: Event) -> Result<EventState> { - if self.visible { - if let Event::Key(e) = ev { - if self.input_cred.is_visible() { - self.input_cred.event(ev)?; + fn event(&mut self, ev: Event) -> Result<EventState> { + if self.visible { + if let Event::Key(e) = ev { + if self.input_cred.is_visible() { + self.input_cred.event(ev)?; - if self.input_cred.get_cred().is_complete() - || !self.input_cred.is_visible() - { - self.push_to_remote( - Some(self.input_cred.get_cred().clone()), - self.modifier.force(), - )?; - self.input_cred.hide(); - } - } else if e == self.key_config.exit_popup - && !self.pending - { - self.hide(); - } - } - return Ok(EventState::Consumed); - } - Ok(EventState::NotConsumed) - } + if self.input_cred.get_cred().is_complete() + || !self.input_cred.is_visible() + { + self.push_to_remote( + Some(self.input_cred.get_cred().clone()), + self.modifier.force(), + )?; + self.input_cred.hide(); + } + } else if e == self.key_config.exit_popup + && !self.pending + { + self.hide(); + } + } + return Ok(EventState::Consumed); + } + Ok(EventState::NotConsumed) + } - fn is_visible(&self) -> bool { - self.visible - } + fn is_visible(&self) -> bool { + self.visible + } - fn hide(&mut self) { - self.visible = false; - } + fn hide(&mut self) { + self.visible = false; + } - fn show(&mut self) -> Result<()> { - self.visible = true; + fn show(&mut self) -> Result<()> { + self.visible = true; - Ok(()) - } + Ok(()) + } } |