Fossil SCM
Do not show a hex dump by default when viewing a binary artifact. Instead, just say that the artifact contains binary data and give a "Hex" submenu to view the hex if that is what the user wants. Ticket [a470443b64412d2856].
Commit
dbb02ff1f945f6cba7e7af71ce896cbe37842b9c
Parent
4c95b7b95065a9c…
1 file changed
+2
-4
+2
-4
| --- src/info.c | ||
| +++ src/info.c | ||
| @@ -1158,24 +1158,22 @@ | ||
| 1158 | 1158 | }else if( renderAsHtml ){ |
| 1159 | 1159 | @ <div> |
| 1160 | 1160 | cgi_append_content(blob_buffer(&content), blob_size(&content)); |
| 1161 | 1161 | @ </div> |
| 1162 | 1162 | }else{ |
| 1163 | + style_submenu_element("Hex","Hex", "%s/hexdump?name=%s", g.zTop, zUuid); | |
| 1163 | 1164 | zMime = mimetype_from_content(&content); |
| 1164 | 1165 | @ <blockquote> |
| 1165 | 1166 | if( zMime==0 ){ |
| 1166 | 1167 | @ <pre> |
| 1167 | 1168 | @ %h(blob_str(&content)) |
| 1168 | 1169 | @ </pre> |
| 1169 | - style_submenu_element("Hex","Hex", "%s/hexdump?name=%s", g.zTop, zUuid); | |
| 1170 | 1170 | }else if( strncmp(zMime, "image/", 6)==0 ){ |
| 1171 | 1171 | @ <img src="%s(g.zBaseURL)/raw?name=%s(zUuid)&m=%s(zMime)"></img> |
| 1172 | 1172 | style_submenu_element("Hex","Hex", "%s/hexdump?name=%s", g.zTop, zUuid); |
| 1173 | 1173 | }else{ |
| 1174 | - @ <pre> | |
| 1175 | - hexdump(&content); | |
| 1176 | - @ </pre> | |
| 1174 | + @ <i>(file is %d(blob_size(&content)) bytes of binary data)</i> | |
| 1177 | 1175 | } |
| 1178 | 1176 | @ </blockquote> |
| 1179 | 1177 | } |
| 1180 | 1178 | style_footer(); |
| 1181 | 1179 | } |
| 1182 | 1180 |
| --- src/info.c | |
| +++ src/info.c | |
| @@ -1158,24 +1158,22 @@ | |
| 1158 | }else if( renderAsHtml ){ |
| 1159 | @ <div> |
| 1160 | cgi_append_content(blob_buffer(&content), blob_size(&content)); |
| 1161 | @ </div> |
| 1162 | }else{ |
| 1163 | zMime = mimetype_from_content(&content); |
| 1164 | @ <blockquote> |
| 1165 | if( zMime==0 ){ |
| 1166 | @ <pre> |
| 1167 | @ %h(blob_str(&content)) |
| 1168 | @ </pre> |
| 1169 | style_submenu_element("Hex","Hex", "%s/hexdump?name=%s", g.zTop, zUuid); |
| 1170 | }else if( strncmp(zMime, "image/", 6)==0 ){ |
| 1171 | @ <img src="%s(g.zBaseURL)/raw?name=%s(zUuid)&m=%s(zMime)"></img> |
| 1172 | style_submenu_element("Hex","Hex", "%s/hexdump?name=%s", g.zTop, zUuid); |
| 1173 | }else{ |
| 1174 | @ <pre> |
| 1175 | hexdump(&content); |
| 1176 | @ </pre> |
| 1177 | } |
| 1178 | @ </blockquote> |
| 1179 | } |
| 1180 | style_footer(); |
| 1181 | } |
| 1182 |
| --- src/info.c | |
| +++ src/info.c | |
| @@ -1158,24 +1158,22 @@ | |
| 1158 | }else if( renderAsHtml ){ |
| 1159 | @ <div> |
| 1160 | cgi_append_content(blob_buffer(&content), blob_size(&content)); |
| 1161 | @ </div> |
| 1162 | }else{ |
| 1163 | style_submenu_element("Hex","Hex", "%s/hexdump?name=%s", g.zTop, zUuid); |
| 1164 | zMime = mimetype_from_content(&content); |
| 1165 | @ <blockquote> |
| 1166 | if( zMime==0 ){ |
| 1167 | @ <pre> |
| 1168 | @ %h(blob_str(&content)) |
| 1169 | @ </pre> |
| 1170 | }else if( strncmp(zMime, "image/", 6)==0 ){ |
| 1171 | @ <img src="%s(g.zBaseURL)/raw?name=%s(zUuid)&m=%s(zMime)"></img> |
| 1172 | style_submenu_element("Hex","Hex", "%s/hexdump?name=%s", g.zTop, zUuid); |
| 1173 | }else{ |
| 1174 | @ <i>(file is %d(blob_size(&content)) bytes of binary data)</i> |
| 1175 | } |
| 1176 | @ </blockquote> |
| 1177 | } |
| 1178 | style_footer(); |
| 1179 | } |
| 1180 |