Display content type and size /inscription (ordinals#975)

popcnt1 · Dec 16, 2022 · 46b3eb6 · 46b3eb6
1 parent c7a9c28
commit 46b3eb6
Show file tree

Hide file tree

Showing 5 changed files with 71 additions and 3 deletions.
diff --git a/src/inscription.rs b/src/inscription.rs
@@ -93,13 +93,21 @@ impl Inscription {
   pub(crate) fn content(&self) -> Option<Content> {
     let content = self.content.as_ref()?;
 
-    match self.content_type.as_ref()?.as_slice() {
-      b"text/plain;charset=utf-8" => Some(Content::Text(str::from_utf8(content).ok()?)),
-      b"image/png" => Some(Content::Png(content)),
+    match self.content_type()? {
+      "text/plain;charset=utf-8" => Some(Content::Text(str::from_utf8(content).ok()?)),
+      "image/png" => Some(Content::Png(content)),
       _ => None,
     }
   }
 
+  pub(crate) fn content_type(&self) -> Option<&str> {
+    str::from_utf8(self.content_type.as_ref()?).ok()
+  }
+
+  pub(crate) fn content_size(&self) -> Option<usize> {
+    Some(self.content.as_ref()?.len())
+  }
+
   pub(crate) fn content_html(&self) -> Trusted<ContentHtml> {
     Trusted(ContentHtml(self.content()))
   }

diff --git a/src/subcommand/server/templates/inscription.rs b/src/subcommand/server/templates/inscription.rs
@@ -32,6 +32,10 @@ mod tests {
       "
         <h1>Inscription ec90757eb3b164aa43fc548faa2fa0c52025494f2c15d5ddf11260b4034ac6dc</h1>
         <dl>
+          <dt>content size</dt>
+          <dd>10 bytes</dd>
+          <dt>content type</dt>
+          <dd>text/plain;charset=utf-8</dd>
           <dt>location</dt>
           <dd>1111111111111111111111111111111111111111111111111111111111111111:1:0</dd>
         </dl>
@@ -53,6 +57,10 @@ mod tests {
       "
         <h1>Inscription ec90757eb3b164aa43fc548faa2fa0c52025494f2c15d5ddf11260b4034ac6dc</h1>
         <dl>
+          <dt>content size</dt>
+          <dd>100 bytes</dd>
+          <dt>content type</dt>
+          <dd>image/png</dd>
           <dt>location</dt>
           <dd>1111111111111111111111111111111111111111111111111111111111111111:1:0</dd>
         </dl>
@@ -61,4 +69,28 @@ mod tests {
       .unindent()
     );
   }
+
+  #[test]
+  fn empty_inscription() {
+    pretty_assert_eq!(
+      InscriptionHtml {
+        inscription_id: InscriptionId::from_str(
+          "ec90757eb3b164aa43fc548faa2fa0c52025494f2c15d5ddf11260b4034ac6dc"
+        )
+        .unwrap(),
+        inscription: Inscription::new(None, None),
+        satpoint: satpoint(1, 0),
+      }
+      .to_string(),
+      "
+        <h1>Inscription ec90757eb3b164aa43fc548faa2fa0c52025494f2c15d5ddf11260b4034ac6dc</h1>
+        <dl>
+          <dt>location</dt>
+          <dd>1111111111111111111111111111111111111111111111111111111111111111:1:0</dd>
+        </dl>
+        UNKNOWN
+      "
+      .unindent()
+    );
+  }
 }
diff --git a/templates/inscription.html b/templates/inscription.html
@@ -1,5 +1,13 @@
 <h1>Inscription {{ self.inscription_id }}</h1>
 <dl>
+%% if let Some(content_size) = self.inscription.content_size() {
+  <dt>content size</dt>
+  <dd>{{ content_size }} bytes</dd>
+%% }
+%% if let Some(content_type) = self.inscription.content_type() {
+  <dt>content type</dt>
+  <dd>{{ content_type }}</dd>
+%% }
   <dt>location</dt>
   <dd>{{ self.satpoint }}</dd>
 </dl>

diff --git a/tests/server.rs b/tests/server.rs
@@ -56,6 +56,10 @@ fn inscription_page() {
     &format!(
       ".*<h1>Inscription {reveal_tx}</h1>
 <dl>
+  <dt>content size</dt>
+  <dd>10 bytes</dd>
+  <dt>content type</dt>
+  <dd>text/plain;charset=utf-8</dd>
   <dt>location</dt>
   <dd>{reveal_tx}:0:0</dd>
 </dl>
@@ -116,6 +120,10 @@ fn inscription_page_after_send() {
     &format!(
       ".*<h1>Inscription {reveal_txid}</h1>
 <dl>
+  <dt>content size</dt>
+  <dd>10 bytes</dd>
+  <dt>content type</dt>
+  <dd>text/plain;charset=utf-8</dd>
   <dt>location</dt>
   <dd>{reveal_txid}:0:0</dd>
 </dl>
@@ -139,6 +147,10 @@ HELLOWORLD.*",
     &format!(
       ".*<h1>Inscription {reveal_txid}</h1>
 <dl>
+  <dt>content size</dt>
+  <dd>10 bytes</dd>
+  <dt>content type</dt>
+  <dd>text/plain;charset=utf-8</dd>
   <dt>location</dt>
   <dd>{}:0:0</dd>
 </dl>

diff --git a/tests/wallet.rs b/tests/wallet.rs
@@ -91,6 +91,10 @@ fn send_works_on_signet() {
     &format!(
       ".*<h1>Inscription {reveal_txid}</h1>
 <dl>
+  <dt>content size</dt>
+  <dd>520 bytes</dd>
+  <dt>content type</dt>
+  <dd>image/png</dd>
   <dt>location</dt>
   <dd>{send_txid}:0:0</dd>
 </dl>
@@ -148,6 +152,10 @@ fn send_inscribed_sat() {
     &format!(
       ".*<h1>Inscription {reveal_txid}</h1>
 <dl>
+  <dt>content size</dt>
+  <dd>520 bytes</dd>
+  <dt>content type</dt>
+  <dd>image/png</dd>
   <dt>location</dt>
   <dd>{send_txid}:0:0</dd>
 </dl>