-
-
Notifications
You must be signed in to change notification settings - Fork 3.3k
impr: support more filetypes for text import (@fehmer) #8322
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.
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
Draft
fehmer
wants to merge
2
commits into
master
Choose a base branch
from
feature/text-import2
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+365
−115
Draft
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,55 @@ | ||
| let officeparser: typeof import("officeparser") | null = null; | ||
|
|
||
| async function loadOfficeparser(): Promise<typeof import("officeparser")> { | ||
| officeparser ??= await import("officeparser"); | ||
| return officeparser; | ||
| } | ||
|
|
||
| type SupportedFileType = "docx" | "odt" | "pdf" | "rtf" | "md" | "epub"; | ||
|
|
||
| const EXTENSION_MAP: Record<string, SupportedFileType> = { | ||
| docx: "docx", | ||
| doc: "docx", | ||
| odt: "odt", | ||
| pdf: "pdf", | ||
| rtf: "rtf", | ||
| md: "md", | ||
| epub: "epub", | ||
| }; | ||
|
|
||
| const MIME_TYPE_MAP: Record<string, SupportedFileType> = { | ||
| "application/vnd.openxmlformats-officedocument.wordprocessingml.document": | ||
| "docx", | ||
| "application/vnd.oasis.opendocument.text": "odt", | ||
| "application/pdf": "pdf", | ||
| "application/rtf": "rtf", | ||
| "text/markdown": "md", | ||
| "text/x-markdown": "md", | ||
| "application/epub+zip": "epub", | ||
| }; | ||
|
|
||
| function detectFiletype( | ||
| filename: string, | ||
| filetype: string, | ||
| ): SupportedFileType | null { | ||
| const ext = filename.split(".").pop()?.toLowerCase() ?? ""; | ||
| if (EXTENSION_MAP[ext]) return EXTENSION_MAP[ext]; | ||
| if (MIME_TYPE_MAP[filetype]) return MIME_TYPE_MAP[filetype]; | ||
| return null; | ||
| } | ||
|
|
||
| export async function convertToText( | ||
| file: File, | ||
| filename: string, | ||
| filetype: string, | ||
| ): Promise<string> { | ||
| const { parseOffice } = await loadOfficeparser(); | ||
| const buffer = await file.arrayBuffer(); | ||
| const fileType = detectFiletype(filename, filetype); | ||
| const ast = await parseOffice(buffer, { fileType }); | ||
| const { value } = await ast.to("text", { | ||
| includeImages: false, | ||
| textConfig: { preserveLayout: false, renderNotes: false }, | ||
| }); | ||
| return value; | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -25,7 +25,6 @@ import { VitePWA } from "vite-plugin-pwa"; | |
| import { sentryVitePlugin } from "@sentry/vite-plugin"; | ||
| import { KnownFontName } from "@monkeytype/schemas/fonts"; | ||
| import solidPlugin from "vite-plugin-solid"; | ||
| import devtools from "solid-devtools/vite"; | ||
| import tailwindcss from "@tailwindcss/vite"; | ||
|
|
||
| function getFontsConfig(): string { | ||
|
|
@@ -103,9 +102,6 @@ function getPlugins({ | |
| tailwindcss(), | ||
|
|
||
| solidPlugin(), | ||
| devtools({ | ||
|
Member
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. devtools breaks officeparser on load, figure out why |
||
| autoname: true, | ||
| }), | ||
| ]; | ||
|
|
||
| const devPlugins: PluginOption[] = [ | ||
|
|
@@ -267,6 +263,10 @@ function getBuildOptions({ | |
| name: "monkeytype-utils", | ||
| test: /src\/ts\/utils\//, | ||
| }, | ||
| { | ||
| name: "vendor-officeparser", | ||
| test: /node_modules\/officeparser/, | ||
| }, | ||
| { | ||
| name: "vendor", | ||
| test: /node_modules\//, | ||
|
|
@@ -368,7 +368,7 @@ export default defineConfig(({ mode }): UserConfig => { | |
| root: "src", | ||
| publicDir: "../static", | ||
| optimizeDeps: { | ||
| exclude: ["@fortawesome/fontawesome-free"], | ||
| exclude: ["@fortawesome/fontawesome-free", "officeparser"], | ||
| }, | ||
| }; | ||
| }); | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
adds a cool 840kb zipped :(