Update custom-folder extension (raycast#17785)

* Update custom-folder extension

* Update custom-folder extension

* Update CHANGELOG.md and optimise images

---------

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

Author: ridemountainpig

extensions/custom-folder/CHANGELOG.md

@@ -1,23 +1,32 @@
 # Custom folder Changelog
 
+## [Enhancement] - 2025-03-12
+
+- Added the ability to retrieve the selected folder when Finder is the frontmost application.
+
 ## [Feat Custom icon from custom image] - 2025-03-11
+
 - Added a new command to change the folder icon to a custom image.
 - Added a new command to reset the folder icon to the default.
 
-
 ## [Feat Create custom icons from emojis] - 2024-11-16
+
 - Added the ability to create custom icons from emojis.
 - Renamed `Output path` to `Download path`.
 
 ## [Fix First icon swap] - 2024-08-28
+
 - Fixed the issue with the first icon swap.
 - Now handles spaces in paths.
 
 ## [Feat Easily apply the custom icon] - 2024-08-25
+
 - Added the ability to easily apply the new custom icon to a target folder.
 
-## [Feat Image shades ] - 2024-08-05
+## [Feat Image shades] - 2024-08-05
+
 - Added optional toggle - shading effect on the image, switching between a filled mask and shaded tones.
 
 ## [Initial Version] - 2023-12-16
-- Custom folder extension
+
+- Custom folder extension

extensions/custom-folder/src/replaceFolderIcon.tsx

@@ -1,11 +1,40 @@
-import { ActionPanel, Form, Action, showToast, Toast, popToRoot, closeMainWindow } from "@raycast/api";
+import {
+  ActionPanel,
+  Form,
+  Action,
+  showToast,
+  Toast,
+  popToRoot,
+  closeMainWindow,
+  getSelectedFinderItems,
+} from "@raycast/api";
+import { useEffect, useState } from "react";
 import fs from "fs";
 import path from "path";
 import { replaceFolderIcon } from "./utils/replaceFolderIcon";
 
 export default function Command() {
+  const [selectedFolder, setSelectedFolder] = useState<string>("");
+  const [isLoading, setIsLoading] = useState<boolean>(true);
+  useEffect(() => {
+    async function getSelectedFolder() {
+      try {
+        const items = await getSelectedFinderItems();
+        if (items.length === 1 && items[0].path && fs.lstatSync(items[0].path).isDirectory()) {
+          setSelectedFolder(items[0].path);
+        }
+      } catch (error) {
+        return;
+      } finally {
+        setIsLoading(false);
+      }
+    }
+    getSelectedFolder();
+  }, []);
+
   return (
     <Form
+      isLoading={isLoading}
       actions={
         <ActionPanel>
           <Action.SubmitForm
@@ -30,12 +59,12 @@ export default function Command() {
               if (values.image.length === 0) {
                 showToast({
                   style: Toast.Style.Failure,
-                  title: "Please select an image file.",
+                  title: "Please select a PNG image file.",
                 });
                 return;
               }
               const file = values.image[0];
-              const allowedExtensions = [".png", ".jpg", ".jpeg"];
+              const allowedExtensions = [".png"];
 
               if (!fs.existsSync(file) || fs.lstatSync(file).isDirectory()) {
                 showToast({
@@ -49,7 +78,7 @@ export default function Command() {
               if (!allowedExtensions.includes(fileExtension)) {
                 showToast({
                   style: Toast.Style.Failure,
-                  title: "Images must be in one of the following formats: .png, .jpg, .jpeg",
+                  title: "Images must be in PNG format.",
                 });
                 return;
               }
@@ -69,6 +98,8 @@ export default function Command() {
       <Form.FilePicker
         id="folder"
         title="Select a Folder"
+        value={selectedFolder ? [selectedFolder] : []}
+        onChange={(values) => setSelectedFolder(values[0] || "")}
         allowMultipleSelection={false}
         canChooseDirectories
         canChooseFiles={false}
@@ -78,7 +109,7 @@ export default function Command() {
         allowMultipleSelection={false}
         canChooseDirectories={false}
         canChooseFiles
-        title="Select an Image"
+        title="Select a PNG Image"
       />
     </Form>
   );

extensions/custom-folder/src/resetFolderIcon.tsx

@@ -1,10 +1,39 @@
-import { ActionPanel, Form, Action, showToast, Toast, popToRoot, closeMainWindow } from "@raycast/api";
+import {
+  ActionPanel,
+  Form,
+  Action,
+  showToast,
+  Toast,
+  popToRoot,
+  closeMainWindow,
+  getSelectedFinderItems,
+} from "@raycast/api";
 import fs from "fs";
+import { useEffect, useState } from "react";
 import { resetFolderIcon } from "./utils/resetFolderIcon";
 
 export default function Command() {
+  const [selectedFolder, setSelectedFolder] = useState<string>("");
+  const [isLoading, setIsLoading] = useState<boolean>(true);
+  useEffect(() => {
+    async function getSelectedFolder() {
+      try {
+        const items = await getSelectedFinderItems();
+        if (items.length === 1 && items[0].path && fs.lstatSync(items[0].path).isDirectory()) {
+          setSelectedFolder(items[0].path);
+        }
+      } catch (error) {
+        return;
+      } finally {
+        setIsLoading(false);
+      }
+    }
+    getSelectedFolder();
+  }, []);
+
   return (
     <Form
+      isLoading={isLoading}
       actions={
         <ActionPanel>
           <Action.SubmitForm
@@ -41,6 +70,8 @@ export default function Command() {
       <Form.FilePicker
         id="folder"
         title="Select a Folder"
+        value={selectedFolder ? [selectedFolder] : []}
+        onChange={(values) => setSelectedFolder(values[0] || "")}
         allowMultipleSelection={false}
         canChooseDirectories
         canChooseFiles={false}