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

Release #139

Merged
merged 7 commits into from
Sep 30, 2023
Merged

Release #139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8dec30f
fix: file already exists error caused by having duplicate article titles
sywhb Sep 27, 2023
e18d5bc
remove rupin from codeowners
sywhb Sep 28, 2023
3c10e1a
fix: search content was returned if we are syncing a pdf
sywhb Sep 28, 2023
dbe46a8
fix: ribbon icon stroke color does not match the theme color
sywhb Sep 28, 2023
aaef8f1
Merge pull request #138 from omnivore-app/fix/ribbon-icon
sywhb Sep 29, 2023
ac9128c
Merge pull request #137 from omnivore-app/fix/pdf
sywhb Sep 29, 2023
8d5c841
Merge pull request #134 from omnivore-app/fix/file-exists-error
sywhb Sep 29, 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
2 changes: 2 additions & 0 deletions src/api.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ export interface Article {
readingProgressPercent: number;
isArchived: boolean;
archivedAt?: string;
contentReader?: string;
}

export interface Label {
Expand Down Expand Up @@ -122,6 +123,7 @@ export const loadArticles = async (
isArchived
readingProgressPercent
archivedAt
contentReader
highlights {
id
quote
Expand Down
18 changes: 12 additions & 6 deletions src/main.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,11 +89,7 @@ export default class OmnivorePlugin extends Plugin {
// add icon
addIcon(
iconId,
`<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="100%" height="100%" viewBox="0 0 21 21" version="1.1">
<g id="surface1">
<path style=" stroke:none;fill-rule:evenodd;fill:rgb(63.137255%,62.352941%,61.176471%);fill-opacity:1;" d="M 9.839844 0.0234375 C 15.9375 -0.382812 21.058594 4.171875 21.140625 10.269531 C 21.140625 10.921875 20.976562 11.734375 20.816406 12.464844 C 20.410156 14.253906 18.785156 15.472656 16.992188 15.472656 L 16.914062 15.472656 C 14.71875 15.472656 13.253906 13.601562 13.253906 11.566406 L 13.253906 9.292969 L 11.953125 11.242188 L 11.871094 11.324219 C 11.140625 11.972656 10.082031 11.972656 9.351562 11.324219 L 9.1875 11.242188 L 7.808594 9.210938 L 7.808594 14.496094 L 5.9375 14.496094 L 5.9375 8.15625 C 5.9375 6.855469 7.484375 6.042969 8.539062 7.015625 L 8.621094 7.097656 L 10.488281 9.859375 L 12.441406 7.179688 L 12.519531 7.097656 C 13.496094 6.285156 15.121094 6.933594 15.121094 8.316406 L 15.121094 11.570312 C 15.121094 12.789062 15.851562 13.601562 16.910156 13.601562 L 16.992188 13.601562 C 17.964844 13.601562 18.777344 12.953125 19.023438 12.058594 C 19.183594 11.328125 19.265625 10.757812 19.265625 10.269531 C 19.265625 5.308594 15.039062 1.570312 10 1.898438 C 5.6875 2.140625 2.195312 5.636719 1.871094 9.863281 C 1.542969 14.90625 5.53125 19.132812 10.488281 19.132812 L 10.488281 21 C 4.390625 21 -0.410156 15.878906 -0.00390625 9.78125 C 0.40625 4.578125 4.554688 0.351562 9.839844 0.0234375 Z M 9.839844 0.0234375 "/>
</g>
</svg>`
`<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><path fill="currentColor" d="M15.9 7.801c0 .507-.123 1.12-.248 1.656v.004l-.001.003a2.87 2.87 0 0 1-2.793 2.186h-.036c-1.625 0-2.649-1.334-2.649-2.828v-2.14l-1.21 1.794-.067.055a1.404 1.404 0 0 1-1.793 0l-.065-.053-1.248-1.82v4.414H4.6V6.268c0-.91 1.078-1.439 1.794-.802l.055.048 1.46 2.13a.21.21 0 0 0 .179 0l1.43-2.119.065-.054c.68-.567 1.78-.138 1.78.815v2.536c0 .971.619 1.638 1.46 1.638h.035c.78 0 1.45-.527 1.636-1.277.125-.534.216-1.026.216-1.378-.017-3.835-3.262-6.762-7.188-6.498-3.311.23-5.986 2.905-6.216 6.216A6.705 6.705 0 0 0 8 14.693v1.19a7.895 7.895 0 0 1-7.882-8.44C.39 3.536 3.536.39 7.44.118 12.017-.19 15.88 3.242 15.9 7.8z"/></svg>`
);

// This creates an icon in the left ribbon.
Expand Down Expand Up @@ -363,7 +359,17 @@ export default class OmnivorePlugin extends Plugin {
continue;
}
// file doesn't exist, so we need to create it
await this.app.vault.create(normalizedPath, content);
try {
await this.app.vault.create(normalizedPath, content);
} catch (error) {
if (error.toString().includes("File already exists")) {
new Notice(
`Skipping file creation: ${normalizedPath}. Please check if you have duplicated article titles and delete the file if needed.`
);
} else {
throw error;
}
}
}
}

Expand Down
4 changes: 2 additions & 2 deletions src/settings/template.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ export type ArticleView =
labels?: LabelView[];
dateSaved: string;
highlights: HighlightView[];
content: string;
content?: string;
datePublished?: string;
fileAttachment?: string;
description?: string;
Expand Down Expand Up @@ -219,7 +219,7 @@ export const renderArticleContnet = async (
labels: renderLabels(article.labels),
dateSaved,
highlights,
content: article.content,
content: article.contentReader === 'WEB' ? article.content : undefined,
datePublished,
fileAttachment,
description: article.description,
Expand Down
Loading