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

Add journal storage loader #732

Merged
merged 16 commits into from
Jan 16, 2024
Merged

Add journal storage loader #732

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
72b6742
Rename sqlite3's `loadStorage` to `loadSQLite3Storage`
gen740 Nov 17, 2023
585c5b8
Call `loadJournalStorage` if file extension is `.log`
gen740 Nov 17, 2023
9930e1f
Add JournalOperation enum
gen740 Nov 17, 2023
ceebd1b
Add create study and delete study
gen740 Dec 6, 2023
5af337a
Parse trial params
gen740 Dec 8, 2023
9ebfa72
Add applyCreateTrial
gen740 Dec 8, 2023
85d2b30
Add set trial param operation
gen740 Dec 11, 2023
c51bb82
Support journal storage loader
gen740 Dec 15, 2023
78f1f3b
Merge branch 'main' into add_journal_storage_loader
gen740 Dec 15, 2023
932b8cf
Fix eslint error
gen740 Dec 17, 2023
38092c9
Delete unnecessary console.log
gen740 Dec 19, 2023
a8cddd5
Detect file format by reading header of arrayBuffer
gen740 Dec 22, 2023
cb48e38
Merge branch 'main' into add_journal_storage_loader
gen740 Dec 22, 2023
5831157
Format code
gen740 Dec 22, 2023
dcc0c89
Add loadJournalStorage to vscode_entry.tsx
gen740 Dec 22, 2023
48629d3
Lint
gen740 Dec 22, 2023
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
13 changes: 10 additions & 3 deletions standalone_app/src/components/StorageLoader.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ import React, {
useRef,
useState,
} from "react"
import { loadStorage } from "../sqlite3"
import { loadSQLite3Storage } from "../sqlite3"
import { loadJournalStorage } from "../journalStorage"
import { useSetRecoilState } from "recoil"
import { studiesState } from "../state"
import {
Expand All @@ -30,7 +31,13 @@ export const StorageLoader: FC = () => {
r.addEventListener("load", () => {
const arrayBuffer = r.result as ArrayBuffer | null
if (arrayBuffer !== null) {
loadStorage(arrayBuffer, setStudies)
const header = new Uint8Array(arrayBuffer, 0, 16)
const headerString = new TextDecoder().decode(header)
if (headerString === "SQLite format 3\u0000") {
loadSQLite3Storage(arrayBuffer, setStudies)
} else {
loadJournalStorage(arrayBuffer, setStudies)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[question] Do you have any way to check that the file is compatible with JournalStorage? If yes, we can add "else if" to check it.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unfortunately, there is no "header" or special "flag" in the JournalStorage log. The only requirement for JournalStorage is a JSON line file. We can detect the format by parsing the first line of the log, but I believe this should be handled in the JournalStorage class.

}
}
})
r.readAsArrayBuffer(file)
Expand Down Expand Up @@ -108,7 +115,7 @@ export const StorageLoader: FC = () => {
<Typography
sx={{ textAlign: "center", color: theme.palette.grey.A400 }}
>
Drag your SQLite3 file here or click to browse.
Drag your SQLite3/JournalStorage file here or click to browse.
</Typography>
</CardContent>
</CardActionArea>
Expand Down
Loading
Loading