Skip to content

Update paths for CommentsAttributes and Magic to match their new location #73

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

Merged
whyitfor merged 1 commit into from
Oct 13, 2022
Merged

Update paths for CommentsAttributes and Magic to match their new location #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions frontend/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
"devDependencies": {
"@rollup/plugin-commonjs": "^17.0.0",
"@rollup/plugin-node-resolve": "^11.0.0",
"prettier": "^2.7.1",
"prettier-plugin-svelte": "^2.6.0",
"rollup": "^2.3.4",
"rollup-plugin-css-only": "^3.1.0",
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/AttributesView.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
for (const [attrType, attrs] of Object.entries(resource.get_attributes())) {
const skipped_attributes = [
// already shown in the resource tree
"ofrak_components.comments.CommentsAttributes",
"ofrak.core.comments.CommentsAttributes",
// verbose and unhelpful
"ofrak_components.entropy.entropy.DataSummary",
];
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/ResourceTreeToolbar.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,8 @@
}
const blob = new Blob([data], {
type:
rootResource.get_attributes()["ofrak_components.magic.Magic"]
?.mime || "",
rootResource.get_attributes()["ofrak.core.magic.Magic"]?.mime ||
"",
});
const blobUrl = URL.createObjectURL(blob);

Expand Down
6 changes: 2 additions & 4 deletions frontend/src/ofrak/resource.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -377,10 +377,8 @@ export class Resource {

async get_comments() {
let attributes = this.get_attributes();
if ("ofrak_components.comments.CommentsAttributes" in attributes) {
return attributes["ofrak_components.comments.CommentsAttributes"][
"comments"
];
if ("ofrak.core.comments.CommentsAttributes" in attributes) {
return attributes["ofrak.core.comments.CommentsAttributes"]["comments"];
} else {
return [];
}
Expand Down