adding needed changes (#18987)

* chore: change casing on cmd

* chore: update func names

* fix: resolve paths from preferences

* chore: log if folder exist

* chore: organize imports

* fix(bug): allow path to be resolved during runtime

* fix: adjust stripServiceName expression

* add dynamic icon support

* refactor: set unused tasks to diasbled by default

* feat: add new overwrite preference action

* refator: renamed primary action var

* feat: import now performs all needed actions

* style: memoize the dir path

* style: set title uppercase

* update changelog

* style: switched to showFailureToast

* style: add recursive to folder recreation

* style: add consistency with cli binary

* not part of this pr

* style: fix linting

* Update CHANGELOG.md and optimise images

---------

Co-authored-by: raycastbot <[email protected]>

Author: chkpwd

extensions/ente-auth/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Ente Auth Changelog
 
+## [Enhancements & Fixes] - 2025-05-08
+
+- Import command now performs all necessary setup actions automatically
+- Added a new "overwrite preference" action for finer control over import behavior
+- Introduced dynamic icon support for improved visual feedback
+- Set unused tasks to be disabled by default
+- Improved path resolution using preferences
+- Renamed primary action variable for clarity
+- Refactored command and function naming for consistency
+- Corrected `stripServiceName` logic to handle edge cases
+- Restructured imports and added logging when folders already exist
+
 ## [Bug fix] - 2024-11-14
 - Allow path to be resolved during runtime (e.g ~/Desktop/Ente)
 

extensions/ente-auth/package-lock.json

@@ -33,6 +33,7 @@
       "name": "export",
       "title": "Export Secrets",
       "description": "Export Ente Auth secrets to a JSON file",
+      "disabledByDefault": true,
       "mode": "view"
     },
     {
@@ -45,6 +46,7 @@
       "name": "delete",
       "title": "Delete Export",
       "description": "Delete Ente Auth Exported file",
+      "disabledByDefault": true,
       "mode": "no-view"
     }
   ],
@@ -66,7 +68,7 @@
       "placeholder": "Export Path"
     },
     {
-      "name": "action",
+      "name": "primaryAction",
       "type": "dropdown",
       "title": "Primary Action",
       "description": "Choose whether the primary action should copy or paste the output.",
@@ -82,15 +84,32 @@
       ],
       "default": "paste",
       "required": false
+    },
+    {
+      "name": "overwriteAction",
+      "type": "checkbox",
+      "title": "Options",
+      "label": "Overwrite Current Export",
+      "description": "Choose whether the export should overwrite on runs.",
+      "required": false
+    },
+    {
+      "name": "deleteExport",
+      "type": "checkbox",
+      "label": "Delete Export File After Import",
+      "description": "Choose whether the export should be deleted after import.",
+      "required": false
     }
   ],
   "dependencies": {
     "@raycast/api": "^1.81.2",
     "@raycast/utils": "^1.16.3",
+    "axios": "^1.7.8",
     "commander": "^9.0.0",
     "figlet": "^1.7.0",
     "fs-extra": "^11.2.0",
     "otpauth": "^9.3.2",
+    "simple-icons": "^13.18.0",
     "ts-node": "^10.0.0",
     "typescript": "^4.0.0",
     "url-parse": "^1.5.10"

extensions/ente-auth/package.json

@@ -2,14 +2,18 @@ import { getPreferenceValues } from "@raycast/api";
 import os from "os";
 import path from "path";
 
-export const DEFAULT_EXPORT_DIR_PATH = (): string => {
-  const exportPath = getPreferenceValues().exportPath || path.join(process.env.HOME || "", "Documents", "ente");
+let cachedExportDirPath: string;
 
-  if (exportPath.startsWith("~/")) {
-    return exportPath.replace("~", os.homedir());
+export const DEFAULT_EXPORT_DIR_PATH = (): string => {
+  if (cachedExportDirPath) {
+    return cachedExportDirPath;
   }
 
-  return exportPath;
+  const exportPath = getPreferenceValues().exportPath || path.join(os.homedir(), "Documents", "ente");
+
+  cachedExportDirPath = exportPath.startsWith("~/") ? exportPath.replace("~", os.homedir()) : exportPath;
+
+  return cachedExportDirPath;
 };
 
 export const EXPORT_FILE_PATH = `${DEFAULT_EXPORT_DIR_PATH()}/ente_auth.txt`;

extensions/ente-auth/src/constants/ente.ts

@@ -1,2 +1,2 @@
 export const LINE_BREAK = "\n\n";
-export const stripServiceName = (serviceName: string) => serviceName.replace(/-/g, "_").toLowerCase();
+export const stripServiceName = (serviceName: string) => serviceName.replace(/-| /g, "").toLowerCase();

extensions/ente-auth/src/constants/string.ts

@@ -1,4 +1,5 @@
-import { Detail, showToast, Toast } from "@raycast/api";
+import { Detail } from "@raycast/api";
+import { showFailureToast } from "@raycast/utils";
 import { showError } from "./components/showError";
 import { DEFAULT_EXPORT_DIR_PATH, EXPORT_FILE_PATH } from "./constants/ente";
 import { checkEnteBinary, createEntePath, exportEnteAuthSecrets } from "./helpers/ente";
@@ -14,14 +15,14 @@ export default function Command() {
   try {
     createEntePath(DEFAULT_EXPORT_DIR_PATH());
   } catch (error) {
-    showToast(Toast.Style.Failure, "Folder creation failed");
-    return <Detail markdown={`## Failed to create folder at \`${DEFAULT_EXPORT_DIR_PATH}\``} />;
+    showFailureToast(error, { title: "Folder creation failed" });
+    return <Detail markdown={`## Failed to create folder at \`${DEFAULT_EXPORT_DIR_PATH()}\``} />;
   }
 
   try {
     exportEnteAuthSecrets();
   } catch (error) {
-    showToast(Toast.Style.Failure, "Export failed");
+    showFailureToast(error, { title: "Export failed" });
   }
 
   const secrets = parseSecrets(getSecrets(EXPORT_FILE_PATH));

extensions/ente-auth/src/export.tsx

@@ -7,7 +7,7 @@ const DEFAULT_CLI_PATH = getPreferenceValues().cliPath || "/usr/local/bin/ente";
 
 export const createEntePath = (path: string): string => {
   if (!fse.existsSync(path)) {
-    fse.mkdirSync(path);
+    fse.mkdirSync(path, { recursive: true });
     console.log("Ente folder created at", path);
   } else {
     console.log("Ente folder already exists at", path);
@@ -30,7 +30,7 @@ export const exportEnteAuthSecrets = (): boolean => {
   if (!fse.existsSync(EXPORT_FILE_PATH)) {
     console.log("ente_auth.txt not found. Exporting...");
     try {
-      execSync("ente export");
+      execSync(`${DEFAULT_CLI_PATH} export`);
     } catch (error) {
       throw new Error("Export failed. Please check if the command is correct.");
     }

extensions/ente-auth/src/helpers/ente.ts

@@ -1,31 +1,32 @@
-import { showToast, Toast } from "@raycast/api";
-import { EXPORT_FILE_PATH } from "./constants/ente";
+import { getPreferenceValues, showToast, Toast } from "@raycast/api";
+import { DEFAULT_EXPORT_DIR_PATH, EXPORT_FILE_PATH } from "./constants/ente";
+import { checkEnteBinary, createEntePath, deleteEnteExport, exportEnteAuthSecrets } from "./helpers/ente";
 import { getSecrets, parseSecrets, storeSecrets } from "./helpers/secrets";
 
 export default async function Command() {
-  const toast = await showToast({
-    style: Toast.Style.Animated,
-    title: "Importing secrets",
-  });
+  const toast = await showToast({ style: Toast.Style.Animated, title: "Importing secrets" });
+
+  if (!checkEnteBinary()) {
+    showToast(Toast.Style.Failure, "Ente binary not found");
+  }
 
   try {
+    createEntePath(DEFAULT_EXPORT_DIR_PATH());
+    exportEnteAuthSecrets();
+
     const secrets = parseSecrets(getSecrets(EXPORT_FILE_PATH));
     await storeSecrets(secrets);
 
-    if (secrets.length > 0) {
-      toast.style = Toast.Style.Success;
-      toast.title = " ";
-      toast.message = `${secrets.length} secrets imported!`;
-    } else {
-      toast.style = Toast.Style.Failure;
-      toast.title = "No secrets found";
-      toast.message = "Please check your export path";
-    }
+    toast.style = secrets.length > 0 ? Toast.Style.Success : Toast.Style.Failure;
+    toast.title = secrets.length > 0 ? `${secrets.length} secrets imported!` : "No secrets found";
+    toast.message = secrets.length > 0 ? "" : "Please check your export path";
   } catch (error) {
     toast.style = Toast.Style.Failure;
     toast.title = "Error importing secrets";
-    if (error instanceof Error) {
-      toast.message = error.message;
-    }
+    toast.message = error instanceof Error ? error.message : "Unknown error";
+  }
+
+  if (getPreferenceValues().deleteExport == true) {
+    deleteEnteExport();
   }
 }