Merge pull request #19 from calebsmithdev/issue-16

Notifications are now triggered after all files are processed

Author: calebsmithdev

src-tauri/src/thing_api.rs

@@ -1,6 +1,4 @@
 use std::collections::HashMap;
-
-use tauri_plugin_notification::NotificationExt;
 use tauri_plugin_store::StoreExt;
 
 /// Sends a POST request to the WoWthing API with the provided form data and returns the response.
@@ -33,21 +31,9 @@ pub async fn submit_addon_data(app: tauri::AppHandle, contents: &str) -> Result<
     match response.status() {
         reqwest::StatusCode::OK => match response.text().await {
             Ok(text) => {
-                app.notification()
-                    .builder()
-                    .title("Wowthing Sync")
-                    .body("Upload was completed succesfully")
-                    .show()
-                    .unwrap();
                 Ok(format!("Sync completed: {:?}", text))
             }
             Err(_) => {
-                app.notification()
-                    .builder()
-                    .title("Wowthing Sync")
-                    .body("An error occurred while uploading. Please try again later.")
-                    .show()
-                    .unwrap();
                 Err(format!("There was an issue reading the response."))
             }
         },

src/composables/useFileUpload.ts

@@ -16,6 +16,7 @@ export const useFileUpload = () => {
   const lastUpdatedFromNow = ref('');
   const lastUpdated = useState(LAST_UPDATED, () => dayjs());
   const watchingFiles = useState('watching-files', () => ([]));
+  const notifications = useNotifications();
   // const { addLog } = useLogs();
 
   const startFileWatchingProcess = async () => {
@@ -103,48 +104,52 @@ export const useFileUpload = () => {
 
   const handleUpload = async (force = false) => {
     const lastStartedDate = await getStorageItem<string>(LAST_STARTED_DATE);
-    if(!force && lastStartedDate && dayjs().diff(dayjs(lastStartedDate), 'seconds') < 15) {
+    if (!force && lastStartedDate && dayjs().diff(dayjs(lastStartedDate), 'seconds') < 15) {
       return;
     }
     isProcessing.value = true;
-    await saveStorageItem<string>(LAST_STARTED_DATE, dayjs().format())
+    await saveStorageItem<string>(LAST_STARTED_DATE, dayjs().format());
     const files = await getAllFiles();
     const dedupedFiles = removeDuplicateFiles(files);
-    const apiKey = await getStorageItem<string>(API_KEY)
+
     for (const file of dedupedFiles) {
       // addLog({
       //   date: new Date(),
       //   title: 'Attempting to upload...',
       //   note: `File path: ${file.path}`
-      // })
+      // });
       const contents = await readBigFile(file, { baseDir: BaseDirectory.Home });
 
       try {
-        const message = await invoke('submit_addon_data', {contents})
+        const message = await invoke('submit_addon_data', { contents });
 
         // addLog({
         //   date: new Date(),
         //   title: 'Uploaded file!',
         //   note: `File path: ${file.path}; Return: ${message}`
-        // })
+        // });
         console.log(`File: ${file}; Return: ${message}`);
       } catch (error) {
         // addLog({
         //   date: new Date(),
         //   title: 'File failed to upload!',
         //   note: `File path: ${file.path}; Return: ${error}`
-        // })
+        // });
         console.log(`File: ${file}; Return: ${error}`);
+        await notifications.send({ title: 'Wowthing Sync', body: 'An error occurred while uploading. Please try again later.' });
+        isProcessing.value = false;
+        return; // Stop the rest of the loop from working
       }
     }
 
     await handleLastUpdated();
+    await notifications.send({ title: 'Wowthing Sync', body: 'Upload was completed successfully' });
     isProcessing.value = false;
-  }
+  };
 
   const removeDuplicateFiles = (arr) => {
     var unique = arr.reduce(function (files, file) {
-      if(!files.find(m => m.path == file.path)) {
+      if(!files.find(m => m == file)) {
         files.push(file);
       }
       return files;

src/composables/useNotifications.ts

@@ -0,0 +1,20 @@
+import { isPermissionGranted, requestPermission, sendNotification } from "@tauri-apps/plugin-notification";
+
+export const useNotifications = () => {
+  const send = async (options) => {
+    let permissionGranted = await isPermissionGranted();
+
+    if (!permissionGranted) {
+      const permission = await requestPermission();
+      permissionGranted = permission === 'granted';
+    }
+
+    if (permissionGranted) {
+      sendNotification(options);
+    }
+  };
+
+  return {
+    send
+  }
+}