Skip to content
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

Jump to bottom

Make PageHtml generic over PageContent type #1123

Merged
merged 2 commits into from
Dec 30, 2022
Merged

Make PageHtml generic over PageContent type #1123

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
0a6f2fd
Make PageHtml generic over PageContent type
casey Dec 30, 2022
e543a12
Merge branch 'master' into page-html-generic
casey Dec 30, 2022
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
18 changes: 9 additions & 9 deletions src/subcommand/server.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@ impl Server {
Extension(chain): Extension<Chain>,
Extension(index): Extension<Arc<Index>>,
Path(DeserializeFromStr(sat)): Path<DeserializeFromStr<Sat>>,
) -> ServerResult<PageHtml> {
) -> ServerResult<PageHtml<SatHtml>> {
let satpoint = index.rare_sat_satpoint(sat).map_err(|err| {
ServerError::Internal(anyhow!(
"failed to satpoint for sat {sat} from index: {err}"
Expand Down Expand Up @@ -348,7 +348,7 @@ impl Server {
Extension(chain): Extension<Chain>,
Extension(index): Extension<Arc<Index>>,
Path(outpoint): Path<OutPoint>,
) -> ServerResult<PageHtml> {
) -> ServerResult<PageHtml<OutputHtml>> {
let output = index
.get_transaction(outpoint.txid)
.map_err(ServerError::Internal)?
Expand Down Expand Up @@ -388,7 +388,7 @@ impl Server {
DeserializeFromStr<Sat>,
DeserializeFromStr<Sat>,
)>,
) -> ServerResult<PageHtml> {
) -> ServerResult<PageHtml<RangeHtml>> {
match start.cmp(&end) {
Ordering::Equal => Err(ServerError::BadRequest("empty range".to_string())),
Ordering::Greater => Err(ServerError::BadRequest(
Expand Down Expand Up @@ -417,7 +417,7 @@ impl Server {
async fn home(
Extension(chain): Extension<Chain>,
Extension(index): Extension<Arc<Index>>,
) -> ServerResult<PageHtml> {
) -> ServerResult<PageHtml<HomeHtml>> {
Ok(
HomeHtml::new(
index
Expand All @@ -442,7 +442,7 @@ impl Server {
Extension(chain): Extension<Chain>,
Extension(index): Extension<Arc<Index>>,
Path(DeserializeFromStr(query)): Path<DeserializeFromStr<BlockQuery>>,
) -> ServerResult<PageHtml> {
) -> ServerResult<PageHtml<BlockHtml>> {
let (block, height) = match query {
BlockQuery::Height(height) => {
let block = index
Expand Down Expand Up @@ -491,7 +491,7 @@ impl Server {
Extension(index): Extension<Arc<Index>>,
Extension(chain): Extension<Chain>,
Path(txid): Path<Txid>,
) -> ServerResult<PageHtml> {
) -> ServerResult<PageHtml<TransactionHtml>> {
let inscription = index
.get_inscription_by_inscription_id(txid)
.map_err(|err| {
Expand Down Expand Up @@ -618,7 +618,7 @@ impl Server {
Extension(chain): Extension<Chain>,
Extension(index): Extension<Arc<Index>>,
Path(path): Path<(u64, usize, usize)>,
) -> Result<PageHtml, ServerError> {
) -> Result<PageHtml<InputHtml>, ServerError> {
let not_found =
|| ServerError::NotFound(format!("input /{}/{}/{} unknown", path.0, path.1, path.2));

Expand Down Expand Up @@ -696,7 +696,7 @@ impl Server {
Extension(chain): Extension<Chain>,
Extension(index): Extension<Arc<Index>>,
Path(inscription_id): Path<InscriptionId>,
) -> ServerResult<PageHtml> {
) -> ServerResult<PageHtml<InscriptionHtml>> {
let (inscription, satpoint) = index
.get_inscription_by_inscription_id(inscription_id)
.map_err(|err| {
Expand Down Expand Up @@ -731,7 +731,7 @@ impl Server {
async fn inscriptions(
Extension(chain): Extension<Chain>,
Extension(index): Extension<Arc<Index>>,
) -> ServerResult<PageHtml> {
) -> ServerResult<PageHtml<InscriptionsHtml>> {
Ok(
InscriptionsHtml {
inscriptions: index
Expand Down
19 changes: 9 additions & 10 deletions src/templates.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,20 +20,19 @@ mod sat;
mod transaction;

#[derive(Boilerplate)]
pub(crate) struct PageHtml {
pub(crate) struct PageHtml<T: PageContent> {
chain: Chain,
content: Box<dyn PageContent>,
content: T,
has_satoshi_index: bool,
}

impl PageHtml {
pub(crate) fn new<T: PageContent + 'static>(
content: T,
chain: Chain,
has_satoshi_index: bool,
) -> Self {
impl<T> PageHtml<T>
where
T: PageContent,
{
pub(crate) fn new(content: T, chain: Chain, has_satoshi_index: bool) -> Self {
Self {
content: Box::new(content),
content,
has_satoshi_index,
chain,
}
Expand All @@ -43,7 +42,7 @@ impl PageHtml {
pub(crate) trait PageContent: Display + 'static {
fn title(&self) -> String;

fn page(self, chain: Chain, has_satoshi_index: bool) -> PageHtml
fn page(self, chain: Chain, has_satoshi_index: bool) -> PageHtml<Self>
where
Self: Sized,
{
Expand Down