fixbug

angelbests · Nov 19, 2024 · ade1462 · ade1462
1 parent b7bfd81
commit ade1462
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 6 deletions.
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
@@ -15,7 +15,7 @@ crate-type = ["lib", "cdylib", "staticlib"]
 tauri-build = { version = "2.0.1", features = [] }
 # "devtools"
 [dependencies]
-tauri = { version = "2.0.2", features = ["protocol-asset", "tray-icon", "image-png", "image-ico"] }
+tauri = { version = "2.0.2", features = ["protocol-asset", "tray-icon", "image-png", "image-ico", "devtools"] }
 tauri-plugin-shell = "2.0.1"
 tauri-plugin-process = "2.0.1"
 tauri-plugin-fs = "2.0.1"

diff --git a/src/functions/peIcon.ts b/src/functions/peIcon.ts
@@ -17,7 +17,12 @@ export const setIcon =async function(){
         if(ext == 'lnk'){
             if(lnks[i].iconLocationPeFile == ""){
                 // 无图标路径
-                ext = await extname(lnks[i].targetPath);
+                try{
+                    ext = await extname(lnks[i].targetPath);
+                }catch(error){
+                    console.log(error,1,lnks[i])
+                    continue;
+                }
                 if(ext == "exe" || ext == "dll" || ext == "ocx" || ext == 'cpl' ){
                     let icodir = await getIcon(await resolve(lnks[i].targetPath),path)
                     if(icodir){
@@ -55,7 +60,12 @@ export const setIcon =async function(){
                                     lnks[i].icoPath = icodir + res[Number(lnks[i].iconLocation)].name
                                 }else if(Number(lnks[i].iconLocation)<0){
                                     let name = await basename(pePath)
-                                    name = name.replace("."+await extname(name),"")
+                                    try {
+                                        name = name.replace("."+await extname(name),"")
+                                    } catch (error) {
+                                        console.log(error,2,lnks[i])
+                                        continue;
+                                    }
                                     lnks[i].icoPath = icodir + name + "_" + Math.abs(Number(lnks[i].iconLocation)) + '.ico'
                                 }else{
                                     // 非数字结果
@@ -68,7 +78,12 @@ export const setIcon =async function(){
                 }else{
                     try {
                         // 有图标路径
-                        ext = await extname(await basename(lnks[i].iconLocationPeFile))
+                        try {
+                            ext = await extname(await basename(lnks[i].iconLocationPeFile))
+                        } catch (error) {
+                            console.log(error,3,lnks[i])
+                            continue;
+                        }
                         if(ext =='ico' || ext == 'png'){
                             // 图标路径指向ico路径
                             if(await exists(lnks[i].iconLocationPeFile)){
@@ -93,7 +108,12 @@ export const setIcon =async function(){
                                     lnks[i].icoPath = icodir + res[Number(lnks[i].iconLocation)].name
                                 }else if(Number(lnks[i].iconLocation)<0){
                                     let name = await basename(lnks[i].iconLocationPeFile)
-                                    name = name.replace("."+await extname(name),"")
+                                    try {
+                                        name = name.replace("."+await extname(name),"")
+                                    } catch (error) {
+                                        console.log(error,4,lnks[i])
+                                        continue;
+                                    }
                                     lnks[i].icoPath = icodir + name + "_" + Math.abs(Number(lnks[i].iconLocation)) + '.ico'
                                 }else{
                                     // 非数字结果
@@ -113,7 +133,7 @@ export const setIcon =async function(){
         }else if(ext == 'url'){
             // url快捷方式
             let urlico = await getUrlInfo(lnks[i].lnkPath)
-            if(urlico){
+            if(await exists(urlico)){
                 let icoPath = await resolve(path,"other") + '\\'+uuid()+'.ico'
                 let res = await readFile(urlico);
                 await writeFile(icoPath,res)