Fixed error handling

FaultierSP · Aug 30, 2024 · a9a590e · a9a590e
1 parent 466521e
commit a9a590e
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 9 deletions.
diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
@@ -7,7 +7,7 @@
   },
   "package": {
     "productName": "civitaiapiclient",
-    "version": "0.0.4"
+    "version": "0.0.5"
   },
   "tauri": {
     "allowlist": {

diff --git a/src/components/Images.jsx b/src/components/Images.jsx
@@ -204,30 +204,33 @@ const Images = (props) => {
             }            
         }
 
-        console.log(api_config);
-        console.log(data);
-
         fetch('https://civitai.com'+api_prefix+'images',{
             method:'GET',
             query:data,
             responseType:ResponseType.JSON,
             headers:api_config
         })
             .then((response) => {
+                if (response.data.items.length==0) {
+                    props.showErrorMessage("No images found.");
+                    return;
+                }
+
                 if (response.data.metadata.nextPage) {
                     setLoadMoreAPIURL(response.data.metadata.nextPage);
                     setLoadMoreButtonDisabled(false);
                 }
                 else {
                     setLoadMoreButtonDisabled(true);
                 }
+
                 setImagesTableData(response.data.items);
                 setDownloadButtonDisabled(true);
                 //setSelectedRowKeys([]);
             })
             .catch((error) => {
                 if(typeof error!=undefined) {
-                    props.showErrorMessage(error.response.data.error);
+                    //props.showErrorMessage(error);
                 }
             })
             .finally(()=>{

diff --git a/src/components/SearchCreatorsOfImages.jsx b/src/components/SearchCreatorsOfImages.jsx
@@ -23,8 +23,6 @@ const SearchCreatorsOfImages = (props) => {
     };
 
     function getFirstBatchOfImages() {
-        //console.clear();
-
         setAwaitingAPIResponse(true);
         setResultVisible(false);
 
@@ -43,6 +41,27 @@ const SearchCreatorsOfImages = (props) => {
             headers: api_config,
         })
         .then((response) => {
+            if(response.status !== 200) {
+                if (typeof response.data.error === 'object') {
+                    let error_message = "";
+
+                    Object.entries(response.data.error.issues).forEach(([key, value]) => {
+                        error_message += value.message + "\n";
+                    });
+
+                    setResultTitle(error_message);
+                } else {
+                    setResultTitle(response.data.error);
+                }
+
+                setResultSubTitle(null);
+                setResultStatus("warning");
+                setResultButtons(null);
+                setResultVisible(true);
+
+                return;
+            }
+
             if(response.data.items.length == 0 ) {
                 setResultTitle("Couldn't find any images by this creator.");
                 setResultSubTitle(null);
@@ -72,12 +91,12 @@ const SearchCreatorsOfImages = (props) => {
         .catch((error) => {
             setResultTitle(error.message);
 
-            if(error.response.data.error) {
+            /*if(error.response && error.response.data && error.response.data.error) {
                 setResultSubTitle(error.response.data.error);
             }
             else {
                 setResultSubTitle(null);
-            }
+            }*/
 
             setResultStatus("error");
             setResultButtons(null);