Phase out openItem in IPC

also fix the issue with directories being opened with notepad after setting notepad as default app for files without extensions.
HeyPuter · Apr 25, 2024 · f5f35f2 · f5f35f2
1 parent ccf1afc
commit f5f35f2
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 47 deletions.
diff --git a/src/IPC.js b/src/IPC.js
@@ -569,52 +569,6 @@ window.addEventListener('message', async (event) => {
         window.watchItems[event.data.item_uid].push(event.data.appInstanceID);
     }
     //--------------------------------------------------------
-    // openItem
-    //--------------------------------------------------------
-    else if(event.data.msg === 'openItem'){
-        // check if readURL returns 200
-        $.ajax({
-            url: event.data.metadataURL + '&return_suggested_apps=true&return_path=true',
-            type: 'GET',
-            headers: {
-                "Authorization": "Bearer "+auth_token
-            },
-            success: async function(metadata){
-                $.ajax({
-                    url: api_origin + "/open_item",
-                    type: 'POST',
-                    contentType: "application/json",
-                    data: JSON.stringify({
-                        uid: metadata.uid ?? undefined,
-                        path: metadata.path ?? undefined,
-                    }),
-                    headers: {
-                        "Authorization": "Bearer "+auth_token
-                    },
-                    statusCode: {
-                        401: function () {
-                            logout();
-                        },
-                    },
-                    success: function(open_item_meta){
-                        setTimeout(function(){
-                            launch_app({ 
-                                name: metadata.name, 
-                                file_path: metadata.path,
-                                app_obj: open_item_meta.suggested_apps[0],
-                                window_title: metadata.name,
-                                file_uid: metadata.uid,
-                                file_signature: open_item_meta.signature,
-                            });
-                        // todo: this is done because sometimes other windows such as openFileDialog
-                        // bring focus to their apps and steal the focus from the newly-opened app
-                        }, 800);
-                    },
-                });            
-            }
-        })
-    }
-    //--------------------------------------------------------
     // launchApp
     //--------------------------------------------------------
     else if(event.data.msg === 'launchApp'){

diff --git a/src/helpers.js b/src/helpers.js
@@ -1947,7 +1947,7 @@ window.open_item = async function(options){
     //----------------------------------------------------------------
     // Does the user have a preference for this file type?
     //----------------------------------------------------------------
-    else if(user_preferences[`default_apps${path.extname(item_path).toLowerCase()}`]) {
+    else if(!is_dir && user_preferences[`default_apps${path.extname(item_path).toLowerCase()}`]) {
         launch_app({
             name: user_preferences[`default_apps${path.extname(item_path).toLowerCase()}`],
             file_path: item_path,