Skip to content

Commit f04bf18

Browse files
committed
feat: import now performs all needed actions
1 parent c4faec4 commit f04bf18

File tree

2 files changed

+21
-21
lines changed

2 files changed

+21
-21
lines changed

extensions/ente-auth/src/import.tsx

+19-18
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,32 @@
1-
import { showToast, Toast } from "@raycast/api";
2-
import { EXPORT_FILE_PATH } from "./constants/ente";
1+
import { getPreferenceValues, showToast, Toast } from "@raycast/api";
2+
import { DEFAULT_EXPORT_DIR_PATH, EXPORT_FILE_PATH } from "./constants/ente";
3+
import { checkEnteBinary, createEntePath, deleteEnteExport, exportEnteAuthSecrets } from "./helpers/ente";
34
import { getSecrets, parseSecrets, storeSecrets } from "./helpers/secrets";
45

56
export default async function Command() {
6-
const toast = await showToast({
7-
style: Toast.Style.Animated,
8-
title: "Importing secrets",
9-
});
7+
const toast = await showToast({ style: Toast.Style.Animated, title: "Importing secrets" });
8+
9+
if (!checkEnteBinary()) {
10+
showToast(Toast.Style.Failure, "Ente binary not found");
11+
}
1012

1113
try {
14+
createEntePath(DEFAULT_EXPORT_DIR_PATH());
15+
exportEnteAuthSecrets();
16+
1217
const secrets = parseSecrets(getSecrets(EXPORT_FILE_PATH));
1318
await storeSecrets(secrets);
1419

15-
if (secrets.length > 0) {
16-
toast.style = Toast.Style.Success;
17-
toast.title = " ";
18-
toast.message = `${secrets.length} secrets imported!`;
19-
} else {
20-
toast.style = Toast.Style.Failure;
21-
toast.title = "No secrets found";
22-
toast.message = "Please check your export path";
23-
}
20+
toast.style = secrets.length > 0 ? Toast.Style.Success : Toast.Style.Failure;
21+
toast.title = secrets.length > 0 ? `${secrets.length} secrets imported!` : "No secrets found";
22+
toast.message = secrets.length > 0 ? "" : "Please check your export path";
2423
} catch (error) {
2524
toast.style = Toast.Style.Failure;
2625
toast.title = "Error importing secrets";
27-
if (error instanceof Error) {
28-
toast.message = error.message;
29-
}
26+
toast.message = error instanceof Error ? error.message : "Unknown error";
3027
}
28+
29+
if (getPreferenceValues().deleteExport == true) {
30+
deleteEnteExport();
31+
};
3132
}

extensions/ente-auth/src/index.tsx

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
import { Action, ActionPanel, Icon, List, getPreferenceValues } from "@raycast/api";
2-
import { getProgressIcon, useFrecencySorting } from "@raycast/utils";
2+
import { getFavicon, getProgressIcon, useFrecencySorting } from "@raycast/utils";
33
import { useEffect, useState } from "react";
44
import { getJsonFormatFromStore } from "./helpers";
55
import { JsonFormat } from "./helpers/types";
6-
import { getIcon } from "./helpers/icons";
76

87
// Ente colors - purple #A400B6, orange #FF9800
98
const getProgressColor = (remainingTime: number) => {
@@ -76,7 +75,7 @@ export default function Command() {
7675
key={index}
7776
title={item.service_name}
7877
subtitle={item.username}
79-
icon={{ source: getIcon(item.service_name), fallback: "icon.png" }}
78+
icon={item.notes && /^https?:\/\//.test(item.notes) ? getFavicon(item.notes) : Icon.Key}
8079
keywords={[item.service_name, item.username ?? "", ...item.tags]}
8180
detail={
8281
<>

0 commit comments

Comments
 (0)