From dba75b31f5225b029bd1305ecf26b5ceeb6d5dee Mon Sep 17 00:00:00 2001 From: Erik Kundt Date: Tue, 11 Jun 2024 15:07:02 +0200 Subject: [PATCH] lib: Move all Radicle-dependent code to bin/ --- CHANGELOG.md | 6 ++++++ bin/commands/inbox/select.rs | 2 +- bin/commands/inbox/select/ui.rs | 2 +- bin/commands/issue/select.rs | 2 +- bin/commands/issue/select/ui.rs | 2 +- bin/commands/patch/select.rs | 2 +- bin/commands/patch/select/ui.rs | 2 +- {src => bin}/git.rs | 0 bin/main.rs | 2 ++ bin/ui.rs | 2 ++ {src => bin}/ui/format.rs | 0 {src => bin}/ui/items.rs | 16 ++++++++-------- src/lib.rs | 1 - src/ui.rs | 2 -- src/ui/widget/list.rs | 8 ++++++-- 15 files changed, 30 insertions(+), 19 deletions(-) rename {src => bin}/git.rs (100%) create mode 100644 bin/ui.rs rename {src => bin}/ui/format.rs (100%) rename {src => bin}/ui/items.rs (99%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4b6886e8..e65055a9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## Unreleased + +### Changed + +- Move all Radicle-dependent code to `bin/` + ## [0.3.1] - 2024-06-11 ### Added diff --git a/bin/commands/inbox/select.rs b/bin/commands/inbox/select.rs index 3bec7cc0..bcc187f0 100644 --- a/bin/commands/inbox/select.rs +++ b/bin/commands/inbox/select.rs @@ -24,7 +24,6 @@ use radicle_tui as tui; use tui::store; use tui::store::StateValue; -use tui::ui::items::{Filter, NotificationItem, NotificationItemFilter}; use tui::ui::span; use tui::ui::widget::container::{Column, Container, Footer, FooterProps, Header, HeaderProps}; use tui::ui::widget::text::{TextArea, TextAreaProps}; @@ -33,6 +32,7 @@ use tui::ui::widget::{ToWidget, Widget}; use tui::{BoxedAny, Channel, Exit, PageStack}; use crate::cob::inbox; +use crate::ui::items::{Filter, NotificationItem, NotificationItemFilter}; use self::ui::Browser; use self::ui::BrowserProps; diff --git a/bin/commands/inbox/select/ui.rs b/bin/commands/inbox/select/ui.rs index 2248546a..ba4c205c 100644 --- a/bin/commands/inbox/select/ui.rs +++ b/bin/commands/inbox/select/ui.rs @@ -12,7 +12,6 @@ use ratatui::text::{Line, Text}; use radicle_tui as tui; -use tui::ui::items::{NotificationItem, NotificationItemFilter, NotificationState}; use tui::ui::span; use tui::ui::widget::container::{ Column, Container, ContainerProps, Footer, FooterProps, Header, HeaderProps, @@ -26,6 +25,7 @@ use tui::ui::widget::{RenderProps, ToWidget, View}; use tui::{BoxedAny, Selection}; use crate::tui_inbox::common::{InboxOperation, Mode, RepositoryMode, SelectionMode}; +use crate::ui::items::{NotificationItem, NotificationItemFilter, NotificationState}; use super::{Message, State}; diff --git a/bin/commands/issue/select.rs b/bin/commands/issue/select.rs index fafa282f..9d534db6 100644 --- a/bin/commands/issue/select.rs +++ b/bin/commands/issue/select.rs @@ -19,7 +19,6 @@ use radicle_tui as tui; use tui::store; use tui::store::StateValue; -use tui::ui::items::{Filter, IssueItem, IssueItemFilter}; use tui::ui::span; use tui::ui::widget::container::{Column, Container, Footer, FooterProps, Header, HeaderProps}; use tui::ui::widget::text::{TextArea, TextAreaProps}; @@ -29,6 +28,7 @@ use tui::ui::widget::{ToWidget, Widget}; use tui::{BoxedAny, Channel, Exit, PageStack}; use crate::cob::issue; +use crate::ui::items::{Filter, IssueItem, IssueItemFilter}; use self::ui::{Browser, BrowserProps}; diff --git a/bin/commands/issue/select/ui.rs b/bin/commands/issue/select/ui.rs index 2428c29d..7024fd79 100644 --- a/bin/commands/issue/select/ui.rs +++ b/bin/commands/issue/select/ui.rs @@ -14,7 +14,6 @@ use ratatui::text::{Line, Text}; use radicle_tui as tui; -use tui::ui::items::{IssueItem, IssueItemFilter}; use tui::ui::span; use tui::ui::widget; use tui::ui::widget::container::{ @@ -30,6 +29,7 @@ use tui::{BoxedAny, Selection}; use crate::tui_issue::common::IssueOperation; use crate::tui_issue::common::Mode; +use crate::ui::items::{IssueItem, IssueItemFilter}; use super::{Message, State}; diff --git a/bin/commands/patch/select.rs b/bin/commands/patch/select.rs index 7f0138fa..6fb76fc0 100644 --- a/bin/commands/patch/select.rs +++ b/bin/commands/patch/select.rs @@ -17,7 +17,6 @@ use ratatui::text::{Line, Span, Text}; use termion::event::Key; use tui::store; -use tui::ui::items::{Filter, PatchItem, PatchItemFilter}; use tui::ui::span; use tui::ui::widget::container::{Column, Container, Footer, FooterProps, Header, HeaderProps}; use tui::ui::widget::text::{TextArea, TextAreaProps}; @@ -31,6 +30,7 @@ use self::ui::{Browser, BrowserProps}; use super::common::Mode; use crate::cob::patch; +use crate::ui::items::{Filter, PatchItem, PatchItemFilter}; type Selection = tui::Selection; diff --git a/bin/commands/patch/select/ui.rs b/bin/commands/patch/select/ui.rs index cf8ee534..e86eb120 100644 --- a/bin/commands/patch/select/ui.rs +++ b/bin/commands/patch/select/ui.rs @@ -16,7 +16,6 @@ use radicle::patch::Status; use radicle_tui as tui; -use tui::ui::items::{PatchItem, PatchItemFilter}; use tui::ui::span; use tui::ui::widget; use tui::ui::widget::container::{ @@ -32,6 +31,7 @@ use tui::{BoxedAny, Selection}; use crate::tui_patch::common::Mode; use crate::tui_patch::common::PatchOperation; +use crate::ui::items::{PatchItem, PatchItemFilter}; use super::{Message, State}; diff --git a/src/git.rs b/bin/git.rs similarity index 100% rename from src/git.rs rename to bin/git.rs diff --git a/bin/main.rs b/bin/main.rs index c32d2d36..c729e7ae 100644 --- a/bin/main.rs +++ b/bin/main.rs @@ -1,5 +1,7 @@ mod cob; mod commands; +mod git; +mod ui; use std::ffi::OsString; use std::io; diff --git a/bin/ui.rs b/bin/ui.rs new file mode 100644 index 00000000..5a00379a --- /dev/null +++ b/bin/ui.rs @@ -0,0 +1,2 @@ +pub mod format; +pub mod items; diff --git a/src/ui/format.rs b/bin/ui/format.rs similarity index 100% rename from src/ui/format.rs rename to bin/ui/format.rs diff --git a/src/ui/items.rs b/bin/ui/items.rs similarity index 99% rename from src/ui/items.rs rename to bin/ui/items.rs index 95c396fe..40c56caf 100644 --- a/src/ui/items.rs +++ b/bin/ui/items.rs @@ -8,7 +8,8 @@ use nom::{IResult, Parser}; use radicle::cob::{Label, ObjectId, Timestamp, TypedId}; use radicle::git::Oid; use radicle::identity::{Did, Identity}; -use radicle::issue::{self, CloseReason, Issue, IssueId, Issues}; +use radicle::issue; +use radicle::issue::{CloseReason, Issue, IssueId, Issues}; use radicle::node::notifications::{Notification, NotificationId, NotificationKind}; use radicle::node::{Alias, AliasStore, NodeId}; use radicle::patch; @@ -20,14 +21,13 @@ use radicle::Profile; use ratatui::style::{Style, Stylize}; use ratatui::widgets::Cell; -use super::super::git; -use super::theme::style; -use super::{format, span}; +use radicle_tui as tui; +use tui::ui::widget::list::ToRow; -/// Needs to be implemented for items that are supposed to be rendered in tables. -pub trait ToRow { - fn to_row(&self) -> [Cell; W]; -} +use super::super::git; +use super::format; +use tui::ui::span; +use tui::ui::theme::style; pub trait Filter { fn matches(&self, item: &T) -> bool; diff --git a/src/lib.rs b/src/lib.rs index 85ea5360..d0d28ee2 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,5 +1,4 @@ pub mod event; -pub mod git; pub mod log; pub mod store; pub mod task; diff --git a/src/ui.rs b/src/ui.rs index 22ae8c94..930589e8 100644 --- a/src/ui.rs +++ b/src/ui.rs @@ -1,6 +1,4 @@ pub mod ext; -pub mod format; -pub mod items; pub mod layout; pub mod span; pub mod theme; diff --git a/src/ui/widget/list.rs b/src/ui/widget/list.rs index be8915be..bfb74822 100644 --- a/src/ui/widget/list.rs +++ b/src/ui/widget/list.rs @@ -1,7 +1,7 @@ use std::cmp; use std::marker::PhantomData; -use ratatui::widgets::Row; +use ratatui::widgets::{Cell, Row}; use ratatui::Frame; use termion::event::Key; @@ -10,13 +10,17 @@ use ratatui::style::Stylize; use ratatui::text::Text; use ratatui::widgets::TableState; -use crate::ui::items::ToRow; use crate::ui::theme::style; use crate::ui::{layout, span}; use super::{container::Column, RenderProps, View}; use super::{ViewProps, ViewState}; +/// Needs to be implemented for items that are supposed to be rendered in tables. +pub trait ToRow { + fn to_row(&self) -> [Cell; W]; +} + #[derive(Clone, Debug)] pub struct TableProps<'a, R, const W: usize> where