Skip to content

Commit 068b53b

Browse files
committed
fix(shared): preview files with generic MIME aliases
1 parent 701e13c commit 068b53b

2 files changed

Lines changed: 22 additions & 4 deletions

File tree

‎packages/shared/src/filePreview.test.ts‎

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,16 @@ describe("workspace file previews", () => {
2424
["db", "sqlite", "application/vnd.sqlite3"],
2525
])("recognizes binary preview %s", (extension, kind, mimeType) => {
2626
const name = `files#draft/sample.${extension.toUpperCase()}`;
27-
expect(filePreviewKind({ name, mimeType: "application/octet-stream" })).toBe(kind);
27+
for (const genericMime of [
28+
"",
29+
"application/octet-stream",
30+
"binary/octet-stream",
31+
"application/unknown",
32+
" APPLICATION/UNKNOWN ; charset=utf-8",
33+
"text/plain",
34+
]) {
35+
expect(filePreviewKind({ name, mimeType: genericMime })).toBe(kind);
36+
}
2837
expect(filePreviewKind({ name: "download", mimeType })).toBe(kind);
2938
expect(isWorkspacePreviewEntryPath(name)).toBe(true);
3039
expect(isWorkspacePreviewEntryPath(`${name}?download=1`)).toBe(false);
@@ -79,7 +88,16 @@ describe("workspace file previews", () => {
7988
["analysis.ipynb", "ipynb", "application/x-ipynb+json"],
8089
])("recognizes Office assets at literal path %s", (name, kind, mimeType) => {
8190
expect(officePreviewKind({ name })).toBe(kind);
82-
expect(filePreviewKind({ name, mimeType: "application/octet-stream" })).toBe(kind);
91+
for (const genericMime of [
92+
"",
93+
"application/octet-stream",
94+
"binary/octet-stream",
95+
"application/unknown",
96+
" APPLICATION/UNKNOWN ; charset=utf-8",
97+
"text/plain",
98+
]) {
99+
expect(filePreviewKind({ name, mimeType: genericMime })).toBe(kind);
100+
}
83101
expect(isWorkspacePreviewEntryPath(name)).toBe(true);
84102
expect(hostPreviewMimeTypeFromExtension(`.${kind}`)).toBe(mimeType);
85103
expect(filePreviewKind({ name: "download", mimeType })).toBe(kind);

‎packages/shared/src/filePreview.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ export function binaryPreviewKind(file: {
126126
].includes(mime)
127127
)
128128
return "archive";
129-
if (mime && mime !== "application/octet-stream" && mime !== "text/plain") return null;
129+
if (mime && !GENERIC_MIME_TYPES.has(mime) && mime !== "text/plain") return null;
130130
const extension = file.name.slice(file.name.lastIndexOf(".")).toLowerCase();
131131
const inferred = BINARY_MIME_TYPES.get(extension);
132132
return inferred === "application/vnd.sqlite3" ? "sqlite" : inferred ? "archive" : null;
@@ -158,7 +158,7 @@ export function officePreviewKind(file: {
158158
if (mime === OFFICE_MIME_TYPES[kind]) return kind;
159159
if (
160160
(!mime ||
161-
mime === "application/octet-stream" ||
161+
GENERIC_MIME_TYPES.has(mime) ||
162162
mime === "text/plain" ||
163163
(kind === "ipynb" && mime === "application/json")) &&
164164
file.name.toLowerCase().endsWith(`.${kind}`)

0 commit comments

Comments
 (0)